4100 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-0.99/demos/alert-aggregator/README b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/README
index 37a563e47c..37a563e47c 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/README
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/README
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/alert-aggregator.png b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/alert-aggregator.png
index ae429cca94..ae429cca94 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/alert-aggregator.png
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/alert-aggregator.png
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/alert-aggregator.svg b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/alert-aggregator.svg
index 6c44e716ff..6c44e716ff 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/alert-aggregator.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/alert-aggregator.svg
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/build-dojo.xml b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/build-dojo.xml
index 335a10817a..335a10817a 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/build-dojo.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/build-dojo.xml
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/build.xml b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/build.xml
index bec59de802..bec59de802 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/build.xml
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/pom.xml b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/pom.xml
index 01b1508c9d..01b1508c9d 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/pom.xml
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
index 808374030c..808374030c 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
index f6479f8633..f6479f8633 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
index 0781965614..0781965614 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
index d33e4b8d0f..d33e4b8d0f 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
index 6d534fd850..6d534fd850 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
index ca2fc95b4a..ca2fc95b4a 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
index 2962defb25..2962defb25 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java
index 75544294ce..75544294ce 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
index 2a5775e9a9..2a5775e9a9 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
index 9b73a27625..9b73a27625 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
index 10575bf0dc..10575bf0dc 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/resources/Alerts.wsdl b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/resources/Alerts.wsdl
index 79b025bc73..79b025bc73 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/resources/Alerts.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/resources/Alerts.wsdl
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/resources/Alerts.xsd b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/resources/Alerts.xsd
index f0ec561ad8..f0ec561ad8 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/resources/Alerts.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/resources/Alerts.xsd
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/resources/AlertsSources.wsdl b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/resources/AlertsSources.wsdl
index 987481bd14..987481bd14 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/resources/AlertsSources.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/resources/AlertsSources.wsdl
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/resources/alerts.composite b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/resources/alerts.composite
index c359b275be..c359b275be 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/resources/alerts.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/resources/alerts.composite
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/resources/sources.xml b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/resources/sources.xml
index 2168c10c9c..2168c10c9c 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/resources/sources.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/resources/sources.xml
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/AlertAggregator.html b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/AlertAggregator.html
index 018f4d5521..018f4d5521 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/AlertAggregator.html
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/AlertAggregator.html
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/META-INF/sca-contribution.xml
index 0bc67c4c98..0bc67c4c98 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml
index e098d53454..e098d53454 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/pop.png b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/pop.png
index 1cf1df24a7..1cf1df24a7 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/pop.png
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/pop.png
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/rss.png b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/rss.png
index b3c949d224..b3c949d224 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/rss.png
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/rss.png
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/service.smd b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/service.smd
index bc77e39bf9..bc77e39bf9 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/service.smd
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/service.smd
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/sources.smd b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/sources.smd
index b5f1824363..b5f1824363 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/sources.smd
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/sources.smd
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/style.css b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/style.css
index f5bbf23379..f5bbf23379 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/style.css
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/main/webapp/style.css
diff --git a/branches/sca-java-0.99/demos/alert-aggregator/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsTestCase.java b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsTestCase.java
index 9aedd2e1c7..9aedd2e1c7 100644
--- a/branches/sca-java-0.99/demos/alert-aggregator/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/alert-aggregator/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsTestCase.java
diff --git a/branches/sca-java-0.99/demos/bigbank-account/README b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/README
index 155c950f30..155c950f30 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/README
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/README
diff --git a/branches/sca-java-0.99/demos/bigbank-account/bigbank.png b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/bigbank.png
index 985cc6bd05..985cc6bd05 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/bigbank.png
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/bigbank.png
diff --git a/branches/sca-java-0.99/demos/bigbank-account/bigbank.svg b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/bigbank.svg
index 6698b8cc9b..6698b8cc9b 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/bigbank.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/bigbank.svg
diff --git a/branches/sca-java-0.99/demos/bigbank-account/build-dojo.xml b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/build-dojo.xml
index 920216a2b5..920216a2b5 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/build-dojo.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/build-dojo.xml
diff --git a/branches/sca-java-0.99/demos/bigbank-account/build.xml b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/build.xml
index e77283df6f..e77283df6f 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/build.xml
diff --git a/branches/sca-java-0.99/demos/bigbank-account/pom.xml b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/pom.xml
index 2e6cf990ca..2e6cf990ca 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/pom.xml
diff --git a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/account/AccountService.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/account/AccountService.java
index abe65cbbe0..abe65cbbe0 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/account/AccountService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/account/AccountService.java
diff --git a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/account/AccountServiceImpl.java
index 4f1afee204..4f1afee204 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/account/feed/AccountFeedImpl.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/account/feed/AccountFeedImpl.java
index c17e9ada20..c17e9ada20 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/account/feed/AccountFeedImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/account/feed/AccountFeedImpl.java
diff --git a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/accountdata/AccountDataService.java
index 02f4d0e7b6..02f4d0e7b6 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/accountdata/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/accountdata/AccountDataService.java
diff --git a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
index 2e1290aa5f..2e1290aa5f 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/accountdata/CheckingAccount.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/accountdata/CheckingAccount.java
index c53d8b4576..c53d8b4576 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/accountdata/CheckingAccount.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/accountdata/CheckingAccount.java
diff --git a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/accountdata/SavingsAccount.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/accountdata/SavingsAccount.java
index f4c7442f30..f4c7442f30 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/accountdata/SavingsAccount.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/accountdata/SavingsAccount.java
diff --git a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/accountdata/StockAccount.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/accountdata/StockAccount.java
index c28e0b59a7..c28e0b59a7 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/accountdata/StockAccount.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/accountdata/StockAccount.java
diff --git a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/client/BigBankClient.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/client/BigBankClient.java
index a7fa5ecc22..a7fa5ecc22 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/client/BigBankClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/client/BigBankClient.java
diff --git a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/demo/BigBankServer.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/demo/BigBankServer.java
index 89b6aeadc4..89b6aeadc4 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/demo/BigBankServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/bigbank/demo/BigBankServer.java
diff --git a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/stockquote/StockQuoteService.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/stockquote/StockQuoteService.java
index 1607344788..1607344788 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/src/main/java/stockquote/StockQuoteService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/java/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-0.99/demos/bigbank-account/src/main/resources/AccountData.composite b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/resources/AccountData.composite
index c254ca95a8..c254ca95a8 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/src/main/resources/AccountData.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/resources/AccountData.composite
diff --git a/branches/sca-java-0.99/demos/bigbank-account/src/main/resources/BigBank.composite b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/resources/BigBank.composite
index d7bf32c6ea..d7bf32c6ea 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/src/main/resources/BigBank.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/resources/BigBank.composite
diff --git a/branches/sca-java-0.99/demos/bigbank-account/src/main/resources/web/AccountJSON.html b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/resources/web/AccountJSON.html
index 8bf8dff70f..8bf8dff70f 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/src/main/resources/web/AccountJSON.html
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/resources/web/AccountJSON.html
diff --git a/branches/sca-java-0.99/demos/bigbank-account/src/main/resources/web/style.css b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/resources/web/style.css
index 1071583264..1071583264 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/src/main/resources/web/style.css
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/resources/web/style.css
diff --git a/branches/sca-java-0.99/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl
index ac4d987a57..ac4d987a57 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-java-0.99/demos/bigbank-account/src/test/java/test/BigBankTestCase.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/test/java/test/BigBankTestCase.java
index b9979d90e4..b9979d90e4 100644
--- a/branches/sca-java-0.99/demos/bigbank-account/src/test/java/test/BigBankTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-account/src/test/java/test/BigBankTestCase.java
diff --git a/branches/sca-java-0.99/demos/bigbank-calculator/build.xml b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/build.xml
index d9a6f97a1f..d9a6f97a1f 100644
--- a/branches/sca-java-0.99/demos/bigbank-calculator/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/build.xml
diff --git a/branches/sca-java-0.99/demos/bigbank-calculator/pom.xml b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/pom.xml
index d48c57d6cd..d48c57d6cd 100644
--- a/branches/sca-java-0.99/demos/bigbank-calculator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/pom.xml
diff --git a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/AddService.java
index 4eeb30a9c2..4eeb30a9c2 100644
--- a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index ed7bee0f4e..ed7bee0f4e 100644
--- a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/DivideService.java
index 131c5a8014..131c5a8014 100644
--- a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java
index a917896aeb..a917896aeb 100644
--- a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java
index e328f024ea..e328f024ea 100644
--- a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java
index b1861daafc..b1861daafc 100644
--- a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java
diff --git a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/resources/Calculator.composite
index 890221245b..890221245b 100644
--- a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
index 1d4d221364..1d4d221364 100644
--- a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
diff --git a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
index dd56af0ad8..dd56af0ad8 100644
--- a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
index 08fa310f46..08fa310f46 100644
--- a/branches/sca-java-0.99/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/branches/sca-java-0.99/demos/bigbank-stockquote/build.xml b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-stockquote/build.xml
index e5c2e58951..e5c2e58951 100644
--- a/branches/sca-java-0.99/demos/bigbank-stockquote/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-stockquote/build.xml
diff --git a/branches/sca-java-0.99/demos/bigbank-stockquote/pom.xml b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-stockquote/pom.xml
index 3ffc2f2b60..3ffc2f2b60 100644
--- a/branches/sca-java-0.99/demos/bigbank-stockquote/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-stockquote/pom.xml
diff --git a/branches/sca-java-0.99/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java
index 2a0801f9b8..2a0801f9b8 100644
--- a/branches/sca-java-0.99/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-java-0.99/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java
index 1607344788..1607344788 100644
--- a/branches/sca-java-0.99/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-0.99/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java
index 04ed762602..04ed762602 100644
--- a/branches/sca-java-0.99/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java
diff --git a/branches/sca-java-0.99/demos/bigbank-stockquote/src/main/resources/StockQuote.composite b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-stockquote/src/main/resources/StockQuote.composite
index b793985c44..b793985c44 100644
--- a/branches/sca-java-0.99/demos/bigbank-stockquote/src/main/resources/StockQuote.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/bigbank-stockquote/src/main/resources/StockQuote.composite
diff --git a/branches/sca-java-0.99/demos/mortgage-creditcheck/.ruleset b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/.ruleset
index 2a06794776..2a06794776 100644
--- a/branches/sca-java-0.99/demos/mortgage-creditcheck/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/.ruleset
diff --git a/branches/sca-java-0.99/demos/mortgage-creditcheck/build.xml b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/build.xml
index 59f1342276..59f1342276 100644
--- a/branches/sca-java-0.99/demos/mortgage-creditcheck/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/build.xml
diff --git a/branches/sca-java-0.99/demos/mortgage-creditcheck/pom.xml b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/pom.xml
index 7e3409728d..7e3409728d 100644
--- a/branches/sca-java-0.99/demos/mortgage-creditcheck/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/pom.xml
diff --git a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java
index ec95a60227..ec95a60227 100644
--- a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java
diff --git a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java
index f19e8a1250..f19e8a1250 100644
--- a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java
diff --git a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java
index 870ea1941d..870ea1941d 100644
--- a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java
diff --git a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite
index 739a455801..739a455801 100644
--- a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite
diff --git a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/resources/META-INF/NOTICE
index 11c564eb19..11c564eb19 100644
--- a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/resources/META-INF/README.txt
diff --git a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl
index 4ec90f3f2b..4ec90f3f2b 100644
--- a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl
diff --git a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/webapp/META-INF/tuscany/webapp.scdl b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/webapp/META-INF/tuscany/webapp.scdl
index 50688615a6..50688615a6 100644
--- a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/webapp/META-INF/tuscany/webapp.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/webapp/META-INF/tuscany/webapp.scdl
diff --git a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/default.scdl b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/default.scdl
index 5f01cb534e..5f01cb534e 100644
--- a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/default.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/default.scdl
diff --git a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml
index 22d4a55a4c..22d4a55a4c 100644
--- a/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/README b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/README
index bb43a4c866..bb43a4c866 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/README
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/README
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/build.xml b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/build.xml
index 9a0a83bf1d..9a0a83bf1d 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/build.xml
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/pom.xml b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/pom.xml
index f8c7949250..f8c7949250 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/pom.xml
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java
index c5787b7819..c5787b7819 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java
index dc803d9688..dc803d9688 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java
index 66a486d516..66a486d516 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java
index b5bafeb204..b5bafeb204 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java
index 8c642667f1..8c642667f1 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java
index dcdad18496..dcdad18496 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java
index 40bfdc4a1d..40bfdc4a1d 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java
index cacd8694de..cacd8694de 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java
index 015f1bae98..015f1bae98 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java
index d69f0a1163..d69f0a1163 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java
index 23c9589e85..23c9589e85 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java
index c2116366ec..c2116366ec 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/META-INF/NOTICE
index 11c564eb19..11c564eb19 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite
index fd71264fa7..fd71264fa7 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
index 6aec49ddaa..6aec49ddaa 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType
index bf7b10e0f7..bf7b10e0f7 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js
index b25af1d039..b25af1d039 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/credit_composite.jpg b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/credit_composite.jpg
index e28ed63cfb..e28ed63cfb 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/credit_composite.jpg
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/credit_composite.jpg
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/credit_composite.png b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/credit_composite.png
index 0bfce0078d..0bfce0078d 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/credit_composite.png
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/credit_composite.png
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/loan_approval.jpg b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/loan_approval.jpg
index 3f00557c7f..3f00557c7f 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/loan_approval.jpg
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/loan_approval.jpg
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/loan_approval.png b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/loan_approval.png
index 9d5f829fe5..9d5f829fe5 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/loan_approval.png
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/loan_approval.png
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly0.jpg b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly0.jpg
index 515b6ecde7..515b6ecde7 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly0.jpg
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly0.jpg
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly0.png b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly0.png
index 4b815a4b82..4b815a4b82 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly0.png
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly0.png
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly1.jpg b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly1.jpg
index 01a7c55a14..01a7c55a14 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly1.jpg
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly1.jpg
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly1.png b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly1.png
index 07422c4f45..07422c4f45 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly1.png
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly1.png
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly2.jpg b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly2.jpg
index 992c048684..992c048684 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly2.jpg
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly2.jpg
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly2.png b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly2.png
index 4667956ed0..4667956ed0 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly2.png
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_assembly2.png
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_composite.jpg b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_composite.jpg
index 5021f6a317..5021f6a317 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_composite.jpg
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_composite.jpg
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_composite.png b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_composite.png
index 1398c50ded..1398c50ded 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_composite.png
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_composite.png
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_diagrams.doc b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_diagrams.doc
index 00d45e1084..00d45e1084 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_diagrams.doc
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_diagrams.doc
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_package1.jpg b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_package1.jpg
index e91c5f1bbd..e91c5f1bbd 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_package1.jpg
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_package1.jpg
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_package1.png b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_package1.png
index db304a4c28..db304a4c28 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_package1.png
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_package1.png
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_package2.jpg b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_package2.jpg
index e8c2865e4a..e8c2865e4a 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_package2.jpg
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_package2.jpg
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_package2.png b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_package2.png
index 502e538e94..502e538e94 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_package2.png
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_package2.png
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_scenario.jpg b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_scenario.jpg
index fccf2e35c3..fccf2e35c3 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_scenario.jpg
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_scenario.jpg
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_scenario.png b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_scenario.png
index b8f42ad318..b8f42ad318 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_scenario.png
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/mortgage_scenario.png
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/readme.html b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/readme.html
index bee954a198..bee954a198 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/readme.html
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/doc/readme.html
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl
index 4ec90f3f2b..4ec90f3f2b 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl
diff --git a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java
index 285cc72515..285cc72515 100644
--- a/branches/sca-java-0.99/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java
diff --git a/branches/sca-java-0.99/demos/pom.xml b/sca-java-1.x/branches/sca-java-0.99/demos/pom.xml
index acc2c2fef8..acc2c2fef8 100644
--- a/branches/sca-java-0.99/demos/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/demos/pom.xml
diff --git a/branches/sca-java-0.99/distribution/bundle/pom.xml b/sca-java-1.x/branches/sca-java-0.99/distribution/bundle/pom.xml
index ea312e03c3..ea312e03c3 100644
--- a/branches/sca-java-0.99/distribution/bundle/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/distribution/bundle/pom.xml
diff --git a/branches/sca-java-0.99/distribution/manifest/pom.xml b/sca-java-1.x/branches/sca-java-0.99/distribution/manifest/pom.xml
index cf3affad3f..cf3affad3f 100644
--- a/branches/sca-java-0.99/distribution/manifest/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/distribution/manifest/pom.xml
diff --git a/branches/sca-java-0.99/distribution/pom.xml b/sca-java-1.x/branches/sca-java-0.99/distribution/pom.xml
index 51f10ac413..51f10ac413 100644
--- a/branches/sca-java-0.99/distribution/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/distribution/pom.xml
diff --git a/branches/sca-java-0.99/distribution/src/main/assembly/bin.xml b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/assembly/bin.xml
index 89b50a736f..89b50a736f 100644
--- a/branches/sca-java-0.99/distribution/src/main/assembly/bin.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/assembly/bin.xml
diff --git a/branches/sca-java-0.99/distribution/src/main/assembly/src.xml b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/assembly/src.xml
index 2e0dbc6c7e..2e0dbc6c7e 100644
--- a/branches/sca-java-0.99/distribution/src/main/assembly/src.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/assembly/src.xml
diff --git a/branches/sca-java-0.99/distribution/src/main/release/CHANGES b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/release/CHANGES
index a2206ff44e..a2206ff44e 100644
--- a/branches/sca-java-0.99/distribution/src/main/release/CHANGES
+++ b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/release/CHANGES
diff --git a/branches/sca-java-0.99/distribution/src/main/release/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-java-0.99/distribution/src/main/release/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/release/DISCLAIMER
diff --git a/branches/sca-java-0.99/distribution/src/main/release/README b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/release/README
index ff42150043..ff42150043 100644
--- a/branches/sca-java-0.99/distribution/src/main/release/README
+++ b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/release/README
diff --git a/branches/sca-java-0.99/distribution/src/main/release/RELEASE_NOTES b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/release/RELEASE_NOTES
index 3860a5448d..3860a5448d 100644
--- a/branches/sca-java-0.99/distribution/src/main/release/RELEASE_NOTES
+++ b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-java-0.99/distribution/src/main/release/bin/INSTALL b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/release/bin/INSTALL
index fbafb4f150..fbafb4f150 100644
--- a/branches/sca-java-0.99/distribution/src/main/release/bin/INSTALL
+++ b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/release/bin/INSTALL
diff --git a/branches/sca-java-0.99/distribution/src/main/release/bin/LICENSE b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/release/bin/LICENSE
index 885373d764..885373d764 100644
--- a/branches/sca-java-0.99/distribution/src/main/release/bin/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/release/bin/LICENSE
diff --git a/branches/sca-java-0.99/distribution/src/main/release/bin/NOTICE b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/release/bin/NOTICE
index 04b93f80d7..04b93f80d7 100644
--- a/branches/sca-java-0.99/distribution/src/main/release/bin/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/release/bin/NOTICE
diff --git a/branches/sca-java-0.99/distribution/src/main/release/src/BUILDING b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/release/src/BUILDING
index b7e3500f1f..b7e3500f1f 100644
--- a/branches/sca-java-0.99/distribution/src/main/release/src/BUILDING
+++ b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/release/src/BUILDING
diff --git a/branches/sca-java-0.99/distribution/src/main/release/src/LICENSE b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/release/src/LICENSE
index 1f6ff4894f..1f6ff4894f 100644
--- a/branches/sca-java-0.99/distribution/src/main/release/src/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/release/src/LICENSE
diff --git a/branches/sca-java-0.99/distribution/src/main/release/src/NOTICE b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/release/src/NOTICE
index 206e2e5a1d..206e2e5a1d 100644
--- a/branches/sca-java-0.99/distribution/src/main/release/src/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/release/src/NOTICE
diff --git a/branches/sca-java-0.99/distribution/src/main/xsl/srcbuild_paths.xsl b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/xsl/srcbuild_paths.xsl
index ab7a40b94a..ab7a40b94a 100644
--- a/branches/sca-java-0.99/distribution/src/main/xsl/srcbuild_paths.xsl
+++ b/sca-java-1.x/branches/sca-java-0.99/distribution/src/main/xsl/srcbuild_paths.xsl
diff --git a/branches/sca-java-0.99/distribution/webapp/pom.xml b/sca-java-1.x/branches/sca-java-0.99/distribution/webapp/pom.xml
index 0aa6763063..0aa6763063 100644
--- a/branches/sca-java-0.99/distribution/webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/distribution/webapp/pom.xml
diff --git a/branches/sca-java-0.99/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java b/sca-java-1.x/branches/sca-java-0.99/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java
index 402a118948..402a118948 100644
--- a/branches/sca-java-0.99/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java
+++ b/sca-java-1.x/branches/sca-java-0.99/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java
diff --git a/branches/sca-java-0.99/distribution/webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-0.99/distribution/webapp/src/main/webapp/WEB-INF/web.xml
index b52c43c506..b52c43c506 100644
--- a/branches/sca-java-0.99/distribution/webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/distribution/webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-0.99/distribution/webapp/src/main/webapp/sca-contributions/safeToDelete.tmp b/sca-java-1.x/branches/sca-java-0.99/distribution/webapp/src/main/webapp/sca-contributions/safeToDelete.tmp
index 4efe4b5db3..4efe4b5db3 100644
--- a/branches/sca-java-0.99/distribution/webapp/src/main/webapp/sca-contributions/safeToDelete.tmp
+++ b/sca-java-1.x/branches/sca-java-0.99/distribution/webapp/src/main/webapp/sca-contributions/safeToDelete.tmp
diff --git a/branches/sca-java-0.99/distribution/webapp/src/main/webapp/scaDomainInfo.jsp b/sca-java-1.x/branches/sca-java-0.99/distribution/webapp/src/main/webapp/scaDomainInfo.jsp
index 5a85060d4c..5a85060d4c 100644
--- a/branches/sca-java-0.99/distribution/webapp/src/main/webapp/scaDomainInfo.jsp
+++ b/sca-java-1.x/branches/sca-java-0.99/distribution/webapp/src/main/webapp/scaDomainInfo.jsp
diff --git a/branches/sca-java-0.99/itest/callablereferences/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/pom.xml
index da923d79ad..da923d79ad 100644
--- a/branches/sca-java-0.99/itest/callablereferences/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/pom.xml
diff --git a/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
index fa63d975a6..fa63d975a6 100644
--- a/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
diff --git a/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
index af3e624dc7..af3e624dc7 100644
--- a/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
index 72253ac801..72253ac801 100644
--- a/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
diff --git a/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
index 518e77d3a8..518e77d3a8 100644
--- a/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
index 0a1fbfc951..0a1fbfc951 100644
--- a/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
diff --git a/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
index cc8ec8f000..cc8ec8f000 100644
--- a/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
index 18375a7cf5..18375a7cf5 100644
--- a/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
diff --git a/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
index 1ab1973476..1ab1973476 100644
--- a/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/callablereferences/src/main/resources/CallableReferenceTest.composite b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
index 49b75f56e4..49b75f56e4 100644
--- a/branches/sca-java-0.99/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
diff --git a/branches/sca-java-0.99/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
index 3d21841edb..3d21841edb 100644
--- a/branches/sca-java-0.99/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
diff --git a/branches/sca-java-0.99/itest/callback-api/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/callback-api/pom.xml
index 3810d8fc86..3810d8fc86 100644
--- a/branches/sca-java-0.99/itest/callback-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-api/pom.xml
diff --git a/branches/sca-java-0.99/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
index e03bc1bda8..e03bc1bda8 100644
--- a/branches/sca-java-0.99/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
diff --git a/branches/sca-java-0.99/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
index 3e7c840e15..3e7c840e15 100644
--- a/branches/sca-java-0.99/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
diff --git a/branches/sca-java-0.99/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
index 1c32783271..1c32783271 100644
--- a/branches/sca-java-0.99/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
diff --git a/branches/sca-java-0.99/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
index 51d9f24723..51d9f24723 100644
--- a/branches/sca-java-0.99/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
diff --git a/branches/sca-java-0.99/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
index 9e06db42aa..9e06db42aa 100644
--- a/branches/sca-java-0.99/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/callback-api/src/main/resources/CallBackApiTest.composite b/sca-java-1.x/branches/sca-java-0.99/itest/callback-api/src/main/resources/CallBackApiTest.composite
index 946c4862ee..946c4862ee 100644
--- a/branches/sca-java-0.99/itest/callback-api/src/main/resources/CallBackApiTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-api/src/main/resources/CallBackApiTest.composite
diff --git a/branches/sca-java-0.99/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
index 6d6ca66ab8..6d6ca66ab8 100644
--- a/branches/sca-java-0.99/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
diff --git a/branches/sca-java-0.99/itest/callback-basic/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/callback-basic/pom.xml
index 5b4845c939..5b4845c939 100644
--- a/branches/sca-java-0.99/itest/callback-basic/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-basic/pom.xml
diff --git a/branches/sca-java-0.99/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
index 5e9d3d6821..5e9d3d6821 100644
--- a/branches/sca-java-0.99/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
diff --git a/branches/sca-java-0.99/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
index 9f4019f28c..9f4019f28c 100644
--- a/branches/sca-java-0.99/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
diff --git a/branches/sca-java-0.99/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
index 1bb2dc22b7..1bb2dc22b7 100644
--- a/branches/sca-java-0.99/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
diff --git a/branches/sca-java-0.99/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
index bd41fa7037..bd41fa7037 100644
--- a/branches/sca-java-0.99/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
diff --git a/branches/sca-java-0.99/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
index 4ca2dc9af9..4ca2dc9af9 100644
--- a/branches/sca-java-0.99/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/sca-java-1.x/branches/sca-java-0.99/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
index c506956088..c506956088 100644
--- a/branches/sca-java-0.99/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
diff --git a/branches/sca-java-0.99/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
index 177c4bcd18..177c4bcd18 100644
--- a/branches/sca-java-0.99/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
diff --git a/branches/sca-java-0.99/itest/callback-complex-type/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/callback-complex-type/pom.xml
index 5ae9e4cdca..5ae9e4cdca 100644
--- a/branches/sca-java-0.99/itest/callback-complex-type/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-complex-type/pom.xml
diff --git a/branches/sca-java-0.99/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
index 9fddb850ba..9fddb850ba 100644
--- a/branches/sca-java-0.99/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
diff --git a/branches/sca-java-0.99/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
index 739983c277..739983c277 100644
--- a/branches/sca-java-0.99/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
diff --git a/branches/sca-java-0.99/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
index 188b1f2c01..188b1f2c01 100644
--- a/branches/sca-java-0.99/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
diff --git a/branches/sca-java-0.99/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
index ffbf4f35fa..ffbf4f35fa 100644
--- a/branches/sca-java-0.99/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
diff --git a/branches/sca-java-0.99/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
index dc31ed156b..dc31ed156b 100644
--- a/branches/sca-java-0.99/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/sca-java-1.x/branches/sca-java-0.99/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
index 3f48f16389..3f48f16389 100644
--- a/branches/sca-java-0.99/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
diff --git a/branches/sca-java-0.99/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
index ff38134df5..ff38134df5 100644
--- a/branches/sca-java-0.99/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
diff --git a/branches/sca-java-0.99/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
index 33d1afaecd..33d1afaecd 100644
--- a/branches/sca-java-0.99/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
diff --git a/branches/sca-java-0.99/itest/callback-id/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/callback-id/pom.xml
index 2e8147f910..2e8147f910 100644
--- a/branches/sca-java-0.99/itest/callback-id/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-id/pom.xml
diff --git a/branches/sca-java-0.99/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
index b14560a8c3..b14560a8c3 100644
--- a/branches/sca-java-0.99/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
diff --git a/branches/sca-java-0.99/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
index a9e551f8b4..a9e551f8b4 100644
--- a/branches/sca-java-0.99/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
diff --git a/branches/sca-java-0.99/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
index fef0eb50b8..fef0eb50b8 100644
--- a/branches/sca-java-0.99/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
diff --git a/branches/sca-java-0.99/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
index 18c592a1c1..18c592a1c1 100644
--- a/branches/sca-java-0.99/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
diff --git a/branches/sca-java-0.99/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
index 8b0a4b69cf..8b0a4b69cf 100644
--- a/branches/sca-java-0.99/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/callback-id/src/main/resources/CallBackIdClient.composite b/sca-java-1.x/branches/sca-java-0.99/itest/callback-id/src/main/resources/CallBackIdClient.composite
index c9a6ba6258..c9a6ba6258 100644
--- a/branches/sca-java-0.99/itest/callback-id/src/main/resources/CallBackIdClient.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-id/src/main/resources/CallBackIdClient.composite
diff --git a/branches/sca-java-0.99/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
index 771fbb8ff7..771fbb8ff7 100644
--- a/branches/sca-java-0.99/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
diff --git a/branches/sca-java-0.99/itest/callback-multiple-wires/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/callback-multiple-wires/pom.xml
index b4e6039fc5..b4e6039fc5 100644
--- a/branches/sca-java-0.99/itest/callback-multiple-wires/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-multiple-wires/pom.xml
diff --git a/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
index 7c80d222fc..7c80d222fc 100644
--- a/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
diff --git a/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
index df91f3d268..df91f3d268 100644
--- a/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
diff --git a/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
index a0a9564002..a0a9564002 100644
--- a/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
diff --git a/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
index cfd601f546..cfd601f546 100644
--- a/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
diff --git a/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
index f198efae51..f198efae51 100644
--- a/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
diff --git a/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
index 08ab7ca56d..08ab7ca56d 100644
--- a/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite b/sca-java-1.x/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
index 3dae3ca3a8..3dae3ca3a8 100644
--- a/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
diff --git a/branches/sca-java-0.99/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
index 41ba766697..41ba766697 100644
--- a/branches/sca-java-0.99/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
diff --git a/branches/sca-java-0.99/itest/callback-set-callback/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/pom.xml
index dea34a149e..dea34a149e 100644
--- a/branches/sca-java-0.99/itest/callback-set-callback/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/pom.xml
diff --git a/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
index b352a2f1f7..b352a2f1f7 100644
--- a/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
diff --git a/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
index 48752f2ea1..48752f2ea1 100644
--- a/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
diff --git a/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
index ad0e0603a3..ad0e0603a3 100644
--- a/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
diff --git a/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
index 0a22b0e01f..0a22b0e01f 100644
--- a/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
diff --git a/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
index 94cb6aa73b..94cb6aa73b 100644
--- a/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
diff --git a/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
index ea2918bf6e..ea2918bf6e 100644
--- a/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
diff --git a/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
index afedcdf7f1..afedcdf7f1 100644
--- a/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
diff --git a/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
index 0fbeeb44ef..0fbeeb44ef 100644
--- a/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
index 3552ddecab..3552ddecab 100644
--- a/branches/sca-java-0.99/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
diff --git a/branches/sca-java-0.99/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
index 496ae0b1a5..496ae0b1a5 100644
--- a/branches/sca-java-0.99/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
diff --git a/branches/sca-java-0.99/itest/callback-set-conversation/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/pom.xml
index ad937ffc51..ad937ffc51 100644
--- a/branches/sca-java-0.99/itest/callback-set-conversation/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/pom.xml
diff --git a/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
index eb840a006d..eb840a006d 100644
--- a/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
diff --git a/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
index eb7adffc7c..eb7adffc7c 100644
--- a/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
diff --git a/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
index 013424bf5e..013424bf5e 100644
--- a/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
diff --git a/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
index ef9d858126..ef9d858126 100644
--- a/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
diff --git a/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
index 789e04e907..789e04e907 100644
--- a/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
diff --git a/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
index 643aa00a9d..643aa00a9d 100644
--- a/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
diff --git a/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
index 4b0dccefdc..4b0dccefdc 100644
--- a/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
diff --git a/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
index 5b685e695b..5b685e695b 100644
--- a/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
index ce73417f94..ce73417f94 100644
--- a/branches/sca-java-0.99/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
diff --git a/branches/sca-java-0.99/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCaseFIXME.java
index addbe3055b..addbe3055b 100644
--- a/branches/sca-java-0.99/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCaseFIXME.java
diff --git a/branches/sca-java-0.99/itest/component-type/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/pom.xml
index 2f4da627d0..2f4da627d0 100644
--- a/branches/sca-java-0.99/itest/component-type/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/pom.xml
diff --git a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/CalculatorClient.java
index 9d180bf52e..9d180bf52e 100644
--- a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
index 803f3104f7..803f3104f7 100644
--- a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/component-type/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/resources/Calculator.composite
index 2ecaf84a37..2ecaf84a37 100644
--- a/branches/sca-java-0.99/itest/component-type/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-0.99/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
index 00c48e5a35..00c48e5a35 100644
--- a/branches/sca-java-0.99/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
diff --git a/branches/sca-java-0.99/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
index 74bedc0a98..74bedc0a98 100644
--- a/branches/sca-java-0.99/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
diff --git a/branches/sca-java-0.99/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
index 289fcc3e11..289fcc3e11 100644
--- a/branches/sca-java-0.99/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
diff --git a/branches/sca-java-0.99/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
index 015d997f6a..015d997f6a 100644
--- a/branches/sca-java-0.99/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
diff --git a/branches/sca-java-0.99/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
index 6214955141..6214955141 100644
--- a/branches/sca-java-0.99/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
diff --git a/branches/sca-java-0.99/itest/component-type/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
index 08fc8e33bf..08fc8e33bf 100644
--- a/branches/sca-java-0.99/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/export-composite/.ruleset b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-composite/.ruleset
index ac8671859d..ac8671859d 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/export-composite/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-composite/.ruleset
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/export-composite/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-composite/pom.xml
index a86ff6fba6..a86ff6fba6 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/export-composite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-composite/pom.xml
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
index acf2ff1722..acf2ff1722 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
index 5369c18497..5369c18497 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
index 3c14560a56..3c14560a56 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
index 636b7111d9..636b7111d9 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
diff --git a/branches/sca-java-0.99/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-0.99/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
index e8c4eef771..e8c4eef771 100644
--- a/branches/sca-java-0.99/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-0.99/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/export-java/.ruleset b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-java/.ruleset
index ac8671859d..ac8671859d 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/export-java/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-java/.ruleset
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/export-java/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-java/pom.xml
index 9c8dd50a83..9c8dd50a83 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/export-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-java/pom.xml
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
index 3b54724b43..3b54724b43 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
index dc33dfa560..dc33dfa560 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/export-wsdl/.ruleset b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-wsdl/.ruleset
index ac8671859d..ac8671859d 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/export-wsdl/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-wsdl/.ruleset
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/export-wsdl/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-wsdl/pom.xml
index 38a0536515..38a0536515 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/export-wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-wsdl/pom.xml
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
index b7394ec14b..b7394ec14b 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
index 9b31363e1a..9b31363e1a 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
index d3c83b08c6..d3c83b08c6 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-composite/.ruleset b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-composite/.ruleset
index ac8671859d..ac8671859d 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-composite/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-composite/.ruleset
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-composite/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-composite/pom.xml
index ea5468b9c9..ea5468b9c9 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-composite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-composite/pom.xml
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
index 966f56d7d5..966f56d7d5 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
index 3d43290380..3d43290380 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
index 3b54724b43..3b54724b43 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
index 9f3f5be452..9f3f5be452 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
index 9b31363e1a..9b31363e1a 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
index d3c83b08c6..d3c83b08c6 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
index e2f852ff7e..e2f852ff7e 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
index d31b417e24..d31b417e24 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-java/.ruleset b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-java/.ruleset
index ac8671859d..ac8671859d 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-java/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-java/.ruleset
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-java/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-java/pom.xml
index b8f75c8346..b8f75c8346 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-java/pom.xml
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
index e5d14f51d4..e5d14f51d4 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
index 023b2b6aff..023b2b6aff 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-0.99/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-0.99/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 432ca868cf..432ca868cf 100644
--- a/branches/sca-java-0.99/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-0.99/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/.ruleset b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/.ruleset
index ac8671859d..ac8671859d 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/.ruleset
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/pom.xml
index 9c72a7554e..9c72a7554e 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/pom.xml
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
index 3d43290380..3d43290380 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
index 3b54724b43..3b54724b43 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
index d46fe0b57c..d46fe0b57c 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
index 5008a2ea5b..5008a2ea5b 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-0.99/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-0.99/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 9dea44386c..9dea44386c 100644
--- a/branches/sca-java-0.99/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-0.99/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/branches/sca-java-0.99/itest/contribution-import-export/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/pom.xml
index b24862cbf6..b24862cbf6 100644
--- a/branches/sca-java-0.99/itest/contribution-import-export/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution-import-export/pom.xml
diff --git a/branches/sca-java-0.99/itest/contribution/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/pom.xml
index 877566ba56..877566ba56 100644
--- a/branches/sca-java-0.99/itest/contribution/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/pom.xml
diff --git a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/AddService.java
index 6392676e76..6392676e76 100644
--- a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/CalculatorClient.java
index 40ca4d9b0f..40ca4d9b0f 100644
--- a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
index ae4ed12b7b..ae4ed12b7b 100644
--- a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/DivideService.java
index 3158458b5e..3158458b5e 100644
--- a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/MultiplyService.java
index 62db05175e..62db05175e 100644
--- a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/SubtractService.java
index 309f88f098..309f88f098 100644
--- a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/contribution/src/main/resources/ContributionTest.composite b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/resources/ContributionTest.composite
index d814e439e2..d814e439e2 100644
--- a/branches/sca-java-0.99/itest/contribution/src/main/resources/ContributionTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/resources/ContributionTest.composite
diff --git a/branches/sca-java-0.99/itest/contribution/src/main/resources/calculator/Calculator.composite b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/resources/calculator/Calculator.composite
index 657a2f95d8..657a2f95d8 100644
--- a/branches/sca-java-0.99/itest/contribution/src/main/resources/calculator/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/resources/calculator/Calculator.composite
diff --git a/branches/sca-java-0.99/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/resources/calculator/sca-contribution.xml
index e95796d83a..e95796d83a 100644
--- a/branches/sca-java-0.99/itest/contribution/src/main/resources/calculator/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/main/resources/calculator/sca-contribution.xml
diff --git a/branches/sca-java-0.99/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
index 946f505ead..946f505ead 100644
--- a/branches/sca-java-0.99/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
diff --git a/branches/sca-java-0.99/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-java-0.99/itest/contribution/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/test/resources/deployables/sample-calculator.jar
diff --git a/branches/sca-java-0.99/itest/contribution/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/test/resources/repository/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-java-0.99/itest/contribution/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/contribution/src/test/resources/repository/sample-calculator.jar
diff --git a/branches/sca-java-0.99/itest/conversations/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/pom.xml
index f6f172a0f3..f6f172a0f3 100644
--- a/branches/sca-java-0.99/itest/conversations/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/pom.xml
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
index 640ec22a4f..640ec22a4f 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
index dbe51bcbea..dbe51bcbea 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
index 8f008fa711..8f008fa711 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
index 546382cfd1..546382cfd1 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
index 9deef312ac..9deef312ac 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
index 1196b6ac0d..1196b6ac0d 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdService.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdService.java
index 11d5ea186b..11d5ea186b 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdService.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
index 1272c7ab7f..1272c7ab7f 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
index 4e2c721040..4e2c721040 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
index 1470c699c0..1470c699c0 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
index 8fe7c5b6ba..8fe7c5b6ba 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
index efcbdff06f..efcbdff06f 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
index dca0596b87..dca0596b87 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScope.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScope.java
index b1332833bb..b1332833bb 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScope.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScope.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherService.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherService.java
index 90c674c6ac..90c674c6ac 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherService.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherServiceImpl.java
index 027109787a..027109787a 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsCallback.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsCallback.java
index 18e935e089..18e935e089 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsCallback.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient.java
index ff677db74d..ff677db74d 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient2.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient2.java
index 389b1f4d93..389b1f4d93 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient2.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient2.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java
index 54a437e66a..54a437e66a 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleService.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleService.java
index 26dfcd9a38..26dfcd9a38 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleService.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java
index 7f38e356f6..7f38e356f6 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsService.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsService.java
index f878e22bf8..f878e22bf8 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsService.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsServiceImpl.java
index 45fc68308b..45fc68308b 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/resources/ConversationAge.composite b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/resources/ConversationAge.composite
index abd1c35ced..abd1c35ced 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/resources/ConversationAge.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/resources/ConversationAge.composite
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/resources/ConversationsTest.composite b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/resources/ConversationsTest.composite
index 93b44c260f..93b44c260f 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/resources/ConversationsTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/resources/ConversationsTest.composite
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/resources/conversationId.composite b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/resources/conversationId.composite
index e61eb08194..e61eb08194 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/resources/conversationId.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/resources/conversationId.composite
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/resources/conversational.composite b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/resources/conversational.composite
index 43259f67c3..43259f67c3 100644
--- a/branches/sca-java-0.99/itest/conversations/src/main/resources/conversational.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/main/resources/conversational.composite
diff --git a/branches/sca-java-0.99/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
index 1138d2e1f0..1138d2e1f0 100644
--- a/branches/sca-java-0.99/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
index d7c6a0ed41..d7c6a0ed41 100644
--- a/branches/sca-java-0.99/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
index 8480e04028..8480e04028 100644
--- a/branches/sca-java-0.99/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
index 245f0a5597..245f0a5597 100644
--- a/branches/sca-java-0.99/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
diff --git a/branches/sca-java-0.99/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTestCaseFIXME.java
index fdbb1f9dca..fdbb1f9dca 100644
--- a/branches/sca-java-0.99/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTestCaseFIXME.java
diff --git a/branches/sca-java-0.99/itest/databindings/common/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/pom.xml
index 0ed2f53002..0ed2f53002 100644
--- a/branches/sca-java-0.99/itest/databindings/common/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/pom.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
index 73dfebb73c..73dfebb73c 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
index b2346aa973..b2346aa973 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
index 88616cc997..88616cc997 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
index b0e298b823..b0e298b823 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
index ee73db6152..ee73db6152 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
index 57827d27b9..57827d27b9 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
index 1fd7509667..1fd7509667 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/generate.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/generate.xsd
index 1fabedf55f..1fabedf55f 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/generate.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/generate/generate.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/wsdl/Dummy.txt b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
index 8927d725b6..8927d725b6 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Annotation.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Annotation.xml
index f1f4346e58..f1f4346e58 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Annotation.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Annotation.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Annotation.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
index 1fae43eb09..1fae43eb09 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Attribute.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Attribute.xml
index c20c80b658..c20c80b658 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Attribute.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Attribute.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Attribute.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
index bd3db2e030..bd3db2e030 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
index 30e4979dca..30e4979dca 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
index e7738dcff7..e7738dcff7 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
index 9552421e2d..9552421e2d 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
index c7b9655749..c7b9655749 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
index 5e5e7fbd55..5e5e7fbd55 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
index 5c455c2ab5..5c455c2ab5 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
index 635e851632..635e851632 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
index 004dab4fbb..004dab4fbb 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
index 136092951b..136092951b 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
index 796f08e1cf..796f08e1cf 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
index 927b94885c..927b94885c 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
index 93f83cd0a1..93f83cd0a1 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
index ea7db70595..ea7db70595 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
index c64323e7e1..c64323e7e1 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
index 85c7d85fd4..85c7d85fd4 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
index 543f276c50..543f276c50 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
index fcd281539b..fcd281539b 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
index 1610c2b861..1610c2b861 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
index 36a0760a61..36a0760a61 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
index 999b72bb35..999b72bb35 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
index 5849165fe0..5849165fe0 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
index 71dad561ca..71dad561ca 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
index 8acf9376d7..8acf9376d7 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
index a49987c352..a49987c352 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
index a35b6e174a..a35b6e174a 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
index e1995890f9..e1995890f9 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
index 91cfce51b8..91cfce51b8 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
index a2f86ba8c5..a2f86ba8c5 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
index 907474cd1b..907474cd1b 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
index a2f6bcfa77..a2f6bcfa77 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
index c5820e1a2e..c5820e1a2e 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
index f4d596bfe3..f4d596bfe3 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
index 0debe2fec5..0debe2fec5 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
index b5bcfdcfd4..b5bcfdcfd4 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
index 7f001254cc..7f001254cc 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
index 8d4d106f59..8d4d106f59 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
index f875b9f94d..f875b9f94d 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
index 4c8a39b06c..4c8a39b06c 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
index 7d343d6dda..7d343d6dda 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
index bb12bc04a9..bb12bc04a9 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
index 7a81f3b0dd..7a81f3b0dd 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
index f0e1c21233..f0e1c21233 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
index d35568b3c9..d35568b3c9 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
index 92bd9a4b66..92bd9a4b66 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
index 52cdfa8c4e..52cdfa8c4e 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
index 78d001a585..78d001a585 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
index 2609a858f7..2609a858f7 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
index 38f6c55059..38f6c55059 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
index 7868a47ca3..7868a47ca3 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
index 0d65b124ff..0d65b124ff 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
index 3f5080d49f..3f5080d49f 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
index 340555dc5f..340555dc5f 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
index 0deb7af980..0deb7af980 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
index 8059fe6da0..8059fe6da0 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
index 06c92ce19b..06c92ce19b 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
index 7b1f02d1d4..7b1f02d1d4 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
index 9bc0cefd0f..9bc0cefd0f 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
index 0c207983bc..0c207983bc 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
index f91b602f99..f91b602f99 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
index b99bf01b73..b99bf01b73 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
index c99698e175..c99698e175 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
index b5b9b0d1eb..b5b9b0d1eb 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
index 80d22ce057..80d22ce057 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
index 4902935db5..4902935db5 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
index 664bf824b4..664bf824b4 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
index 5d3658d224..5d3658d224 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
index c5861fa92a..c5861fa92a 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
index 0aa4710057..0aa4710057 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
index 1f95950394..1f95950394 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
index 6ee9c435db..6ee9c435db 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
index 0297f1aeb4..0297f1aeb4 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
index 56d027bdbb..56d027bdbb 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
index 81ba1069bd..81ba1069bd 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
index 866ab73024..866ab73024 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
index 8bb3a08b94..8bb3a08b94 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
index c7c62f812b..c7c62f812b 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
index 8235718c5e..8235718c5e 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
index 36caba2f16..36caba2f16 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
index 599c428a44..599c428a44 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
index 389d5a99f0..389d5a99f0 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
index 919c4a20ee..919c4a20ee 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
index 59887078b5..59887078b5 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
index 79011f26ab..79011f26ab 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
index 5de7d64d7b..5de7d64d7b 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
index c40be9e18b..c40be9e18b 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
index d4a78787b8..d4a78787b8 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
index c30434de66..c30434de66 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
index 5381590cd1..5381590cd1 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
index 4cd6ea7e72..4cd6ea7e72 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
index e8faf6225b..e8faf6225b 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
index b4375467c4..b4375467c4 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
index a4f564d9b7..a4f564d9b7 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
index d30ab85530..d30ab85530 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
index 8abb34b5a5..8abb34b5a5 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
index 7fd9a061ae..7fd9a061ae 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
index 1615976813..1615976813 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
index cd567ba528..cd567ba528 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
index 0beaac571f..0beaac571f 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
index 025362defb..025362defb 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
index d6d951fe5d..d6d951fe5d 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
index 5736a8c121..5736a8c121 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
index 242be1d53b..242be1d53b 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
index d728115a77..d728115a77 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
index 108e3a8619..108e3a8619 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
index d4ffae5e17..d4ffae5e17 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
index 5ee5e0229e..5ee5e0229e 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
index 3d5aed5aa8..3d5aed5aa8 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
index e7b80ab11c..e7b80ab11c 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
index 2b4fe5594e..2b4fe5594e 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
index fc4deb63c2..fc4deb63c2 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
index 03570f41d9..03570f41d9 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
index c754502645..c754502645 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
index 4603793bfc..4603793bfc 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
index 4bcd2f8c46..4bcd2f8c46 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
index a6861f803a..a6861f803a 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
index 8bb251cab2..8bb251cab2 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
index 467ec007ed..467ec007ed 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
index 8d00646678..8d00646678 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
index 7deafd798a..7deafd798a 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
index 72ac75fee0..72ac75fee0 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
index f6208f81b3..f6208f81b3 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
index 1f26e13673..1f26e13673 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
index 97de7b98eb..97de7b98eb 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
index 67716553d8..67716553d8 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
index 5941348921..5941348921 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
index 24d5d09054..24d5d09054 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
index f684d06a4d..f684d06a4d 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
index de4a8a666d..de4a8a666d 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
index 242908bd27..242908bd27 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
index 4c00fbe295..4c00fbe295 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
index 925e8625d5..925e8625d5 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
index b12bec040b..b12bec040b 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
index c73708ce46..c73708ce46 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
index 795c3ea7d9..795c3ea7d9 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
index 3ebdc89ae0..3ebdc89ae0 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
index 21546d0f67..21546d0f67 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
index 89657e42ca..89657e42ca 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
index d01b4172e4..d01b4172e4 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
index 82fd1eedaf..82fd1eedaf 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
index e1dcf06194..e1dcf06194 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
index ebf03c9d5d..ebf03c9d5d 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
index 8b9ba5b4b8..8b9ba5b4b8 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
index 26466b1b39..26466b1b39 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
index ff418c56ab..ff418c56ab 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
index 27bb1ce9cc..27bb1ce9cc 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
index 2bf1df8c99..2bf1df8c99 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
index 9b5561ed43..9b5561ed43 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
index 0b4e7bdf45..0b4e7bdf45 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
index f1b7cd264c..f1b7cd264c 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
index a2c8456257..a2c8456257 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
index 1f60b0423f..1f60b0423f 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
index 21e55ab8c1..21e55ab8c1 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
index 30762f4912..30762f4912 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
index 5bf35d0d70..5bf35d0d70 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
index 2dd01e4090..2dd01e4090 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
index 6920cd8dd0..6920cd8dd0 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
index 6a526bdc47..6a526bdc47 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
index 1117a95eb8..1117a95eb8 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
index ab91458bff..ab91458bff 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
index 3e015843b5..3e015843b5 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
index b6d68fd08a..b6d68fd08a 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
index d4453a4477..d4453a4477 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
index 6de3adc937..6de3adc937 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
index 786ab226da..786ab226da 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
index 64093aa803..64093aa803 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
index 01f4c2b1ef..01f4c2b1ef 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
index 774646f682..774646f682 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
index 34da37564c..34da37564c 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
index a1fb3aa803..a1fb3aa803 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
index 8eb7a4fce4..8eb7a4fce4 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
index f68eb1939d..f68eb1939d 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
index b9f77e6658..b9f77e6658 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Import.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Import.xml
index fd28850050..fd28850050 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Import.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Import.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Import.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Import.xsd
index eae93fd44a..eae93fd44a 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Import.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Import.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
index a7e568decf..a7e568decf 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Include.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Include.xml
index d4b9e24fa6..d4b9e24fa6 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Include.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Include.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Include.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Include.xsd
index 34ff314a19..34ff314a19 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Include.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Include.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Interop.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Interop.xsd
index ae22ab2c44..ae22ab2c44 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Interop.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Interop.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Notation.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Notation.xml
index b75ac6500a..b75ac6500a 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Notation.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Notation.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Notation.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Notation.xsd
index 6ad019cb81..6ad019cb81 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Notation.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Notation.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Person.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Person.xsd
index 5f5021b15e..5f5021b15e 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Person.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/Person.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
index 6c5ad88ff4..6c5ad88ff4 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
index 6b7e39b334..6b7e39b334 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
index f9d4a24a49..f9d4a24a49 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
index f649e2ba83..f649e2ba83 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
index 410df4b7e4..410df4b7e4 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
index 36629e8295..36629e8295 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
index 7b74867c03..7b74867c03 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
index 7a08de84be..7a08de84be 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
index 708d526f44..708d526f44 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
index 681cf7d5af..681cf7d5af 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
index e404ac86b7..e404ac86b7 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
index af0431f048..af0431f048 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
index c86a0f6bcb..c86a0f6bcb 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
index 89b00a36cc..89b00a36cc 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
index 399b0d8175..399b0d8175 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
index fee04b9f24..fee04b9f24 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
index bc8cf35368..bc8cf35368 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
index 536aa822de..536aa822de 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
index da2929776e..da2929776e 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
index ace5427786..ace5427786 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/datagraph.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
index e6b9697a8d..e6b9697a8d 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
index 7387568942..7387568942 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
index c5aabc9cc8..c5aabc9cc8 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
diff --git a/branches/sca-java-0.99/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
index fa3f310d4d..fa3f310d4d 100644
--- a/branches/sca-java-0.99/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
diff --git a/branches/sca-java-0.99/itest/databindings/config.png b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/config.png
index 7912019e9d..7912019e9d 100644
--- a/branches/sca-java-0.99/itest/databindings/config.png
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/config.png
diff --git a/branches/sca-java-0.99/itest/databindings/config.svg b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/config.svg
index aaf027e2df..aaf027e2df 100644
--- a/branches/sca-java-0.99/itest/databindings/config.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/config.svg
diff --git a/branches/sca-java-0.99/itest/databindings/databinding.png b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/databinding.png
index 76a9c71b7d..76a9c71b7d 100644
--- a/branches/sca-java-0.99/itest/databindings/databinding.png
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/databinding.png
diff --git a/branches/sca-java-0.99/itest/databindings/databinding.svg b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/databinding.svg
index d6850ccf7d..d6850ccf7d 100644
--- a/branches/sca-java-0.99/itest/databindings/databinding.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/databinding.svg
diff --git a/branches/sca-java-0.99/itest/databindings/interop.png b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/interop.png
index 005e0f24ea..005e0f24ea 100644
--- a/branches/sca-java-0.99/itest/databindings/interop.png
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/interop.png
diff --git a/branches/sca-java-0.99/itest/databindings/interop.svg b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/interop.svg
index 03897c6d09..03897c6d09 100644
--- a/branches/sca-java-0.99/itest/databindings/interop.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/interop.svg
diff --git a/branches/sca-java-0.99/itest/databindings/interop/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/interop/pom.xml
index 2a2775b3a3..2a2775b3a3 100644
--- a/branches/sca-java-0.99/itest/databindings/interop/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/interop/pom.xml
diff --git a/branches/sca-java-0.99/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
index 7bdfc57924..7bdfc57924 100644
--- a/branches/sca-java-0.99/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
diff --git a/branches/sca-java-0.99/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
index 38bfccce0c..38bfccce0c 100644
--- a/branches/sca-java-0.99/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
diff --git a/branches/sca-java-0.99/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
index 6f02af4c9d..6f02af4c9d 100644
--- a/branches/sca-java-0.99/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
diff --git a/branches/sca-java-0.99/itest/databindings/interop/src/main/resources/generate/generate.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/interop/src/main/resources/generate/generate.xml
index 8453dd56b4..8453dd56b4 100644
--- a/branches/sca-java-0.99/itest/databindings/interop/src/main/resources/generate/generate.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/interop/src/main/resources/generate/generate.xml
diff --git a/branches/sca-java-0.99/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
index 36797fde57..36797fde57 100644
--- a/branches/sca-java-0.99/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
diff --git a/branches/sca-java-0.99/itest/databindings/jaxbgen/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/jaxbgen/pom.xml
index ae7bf23a73..ae7bf23a73 100644
--- a/branches/sca-java-0.99/itest/databindings/jaxbgen/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/jaxbgen/pom.xml
diff --git a/branches/sca-java-0.99/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
index 8381a164ea..8381a164ea 100644
--- a/branches/sca-java-0.99/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
diff --git a/branches/sca-java-0.99/itest/databindings/jaxbgen/src/main/resources/greeter.composite b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/jaxbgen/src/main/resources/greeter.composite
index ae0740e6fe..ae0740e6fe 100644
--- a/branches/sca-java-0.99/itest/databindings/jaxbgen/src/main/resources/greeter.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/jaxbgen/src/main/resources/greeter.composite
diff --git a/branches/sca-java-0.99/itest/databindings/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/pom.xml
index 6618abd13a..6618abd13a 100644
--- a/branches/sca-java-0.99/itest/databindings/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/pom.xml
diff --git a/branches/sca-java-0.99/itest/databindings/readme.html b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/readme.html
index 24a44e4ed7..24a44e4ed7 100644
--- a/branches/sca-java-0.99/itest/databindings/readme.html
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/readme.html
diff --git a/branches/sca-java-0.99/itest/databindings/sdogen/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/sdogen/pom.xml
index bf6a3a443c..bf6a3a443c 100644
--- a/branches/sca-java-0.99/itest/databindings/sdogen/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/sdogen/pom.xml
diff --git a/branches/sca-java-0.99/itest/databindings/sdogen/src/main/resources/generate/generate.xml b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/sdogen/src/main/resources/generate/generate.xml
index 5487b113e8..5487b113e8 100644
--- a/branches/sca-java-0.99/itest/databindings/sdogen/src/main/resources/generate/generate.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/sdogen/src/main/resources/generate/generate.xml
diff --git a/branches/sca-java-0.99/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
index 9494d70f96..9494d70f96 100644
--- a/branches/sca-java-0.99/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
diff --git a/branches/sca-java-0.99/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm
index fb1209a10a..fb1209a10a 100644
--- a/branches/sca-java-0.99/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/pom.xml
index a6a45d141d..a6a45d141d 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/pom.xml
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
index f5e36db7cd..f5e36db7cd 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
diff --git a/branches/sca-java-0.99/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-0.99/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
index 65751175fb..65751175fb 100644
--- a/branches/sca-java-0.99/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-0.99/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
diff --git a/branches/sca-java-0.99/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-0.99/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
index 5f65d293ea..5f65d293ea 100644
--- a/branches/sca-java-0.99/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-0.99/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
diff --git a/branches/sca-java-0.99/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-0.99/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
index 7d303887e7..7d303887e7 100644
--- a/branches/sca-java-0.99/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-0.99/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
diff --git a/branches/sca-java-0.99/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-0.99/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
index 1567aaba02..1567aaba02 100644
--- a/branches/sca-java-0.99/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-0.99/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
diff --git a/branches/sca-java-0.99/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-0.99/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
index 8b28a652b0..8b28a652b0 100644
--- a/branches/sca-java-0.99/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-0.99/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
diff --git a/branches/sca-java-0.99/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-0.99/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
index add0f6193b..add0f6193b 100644
--- a/branches/sca-java-0.99/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-0.99/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
index acecdff613..acecdff613 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
index 9fc0f33e4e..9fc0f33e4e 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
index d70cdad313..d70cdad313 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
index 40e87953b6..40e87953b6 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
index 9759647cfe..9759647cfe 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java
index 7418ad82c6..7418ad82c6 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/pom.xml
index 3040ba6a29..3040ba6a29 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/pom.xml
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
index f5e36db7cd..f5e36db7cd 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
index 65751175fb..65751175fb 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
index 5f65d293ea..5f65d293ea 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
index 7d303887e7..7d303887e7 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
index 1567aaba02..1567aaba02 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
index 8b28a652b0..8b28a652b0 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
index add0f6193b..add0f6193b 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
index 872fd721d1..872fd721d1 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
index 83526cb6a1..83526cb6a1 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
index d70cdad313..d70cdad313 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
index 33b830c856..33b830c856 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
index 9759647cfe..9759647cfe 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
diff --git a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java
index 0faee615aa..0faee615aa 100644
--- a/branches/sca-java-0.99/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java
diff --git a/branches/sca-java-0.99/itest/exceptions/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions/pom.xml
index c26acabe82..c26acabe82 100644
--- a/branches/sca-java-0.99/itest/exceptions/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions/pom.xml
diff --git a/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
index b95b0ccb31..b95b0ccb31 100644
--- a/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
diff --git a/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
index 0d14240513..0d14240513 100644
--- a/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
diff --git a/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
index 80073e7679..80073e7679 100644
--- a/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
diff --git a/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
index 453528444d..453528444d 100644
--- a/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
diff --git a/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
index 32a23c5e7d..32a23c5e7d 100644
--- a/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
diff --git a/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
index 067615eed8..067615eed8 100644
--- a/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
diff --git a/branches/sca-java-0.99/itest/exceptions/src/main/resources/ExceptionTest.composite b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions/src/main/resources/ExceptionTest.composite
index a725864d30..a725864d30 100644
--- a/branches/sca-java-0.99/itest/exceptions/src/main/resources/ExceptionTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions/src/main/resources/ExceptionTest.composite
diff --git a/branches/sca-java-0.99/itest/exceptions/src/main/resources/intracomposite.composite b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions/src/main/resources/intracomposite.composite
index efe1c5e207..efe1c5e207 100644
--- a/branches/sca-java-0.99/itest/exceptions/src/main/resources/intracomposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions/src/main/resources/intracomposite.composite
diff --git a/branches/sca-java-0.99/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
index 4f719a26c4..4f719a26c4 100644
--- a/branches/sca-java-0.99/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
diff --git a/branches/sca-java-0.99/itest/extended-api/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/extended-api/pom.xml
index 2f1d6e91d8..2f1d6e91d8 100644
--- a/branches/sca-java-0.99/itest/extended-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/extended-api/pom.xml
diff --git a/branches/sca-java-0.99/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java b/sca-java-1.x/branches/sca-java-0.99/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
index 869565af17..869565af17 100644
--- a/branches/sca-java-0.99/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
diff --git a/branches/sca-java-0.99/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java b/sca-java-1.x/branches/sca-java-0.99/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
index c54af93c05..c54af93c05 100644
--- a/branches/sca-java-0.99/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
diff --git a/branches/sca-java-0.99/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
index 523d238f2e..523d238f2e 100644
--- a/branches/sca-java-0.99/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
index ab4300a7dd..ab4300a7dd 100644
--- a/branches/sca-java-0.99/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/extended-api/src/main/resources/BasicService.composite b/sca-java-1.x/branches/sca-java-0.99/itest/extended-api/src/main/resources/BasicService.composite
index 128b33b16f..128b33b16f 100644
--- a/branches/sca-java-0.99/itest/extended-api/src/main/resources/BasicService.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/extended-api/src/main/resources/BasicService.composite
diff --git a/branches/sca-java-0.99/itest/extended-api/src/main/resources/MathService.composite b/sca-java-1.x/branches/sca-java-0.99/itest/extended-api/src/main/resources/MathService.composite
index 8e99d3da60..8e99d3da60 100644
--- a/branches/sca-java-0.99/itest/extended-api/src/main/resources/MathService.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/extended-api/src/main/resources/MathService.composite
diff --git a/branches/sca-java-0.99/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
index 526e079f03..526e079f03 100644
--- a/branches/sca-java-0.99/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingsclient/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsclient/pom.xml
index 396b677a1b..396b677a1b 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingsclient/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsclient/pom.xml
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java
index 44801846f6..44801846f6 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/main/resources/bindingsclient.composite b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/main/resources/bindingsclient.composite
index ca3ff6494e..ca3ff6494e 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/main/resources/bindingsclient.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/main/resources/bindingsclient.composite
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/main/resources/wsdl/testtool.wsdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/main/resources/wsdl/testtool.wsdl
index 7dc608f063..7dc608f063 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/main/resources/wsdl/testtool.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/main/resources/wsdl/testtool.wsdl
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/main/webapp/SCATestTool.jsp b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/main/webapp/SCATestTool.jsp
index eb219e4cef..eb219e4cef 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/main/webapp/SCATestTool.jsp
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/main/webapp/SCATestTool.jsp
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/main/webapp/WEB-INF/web.xml
index fd58cb8b0e..fd58cb8b0e 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTest.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTest.java
index 6cc72c99a2..6cc72c99a2 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTest.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTest.java
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java
index b5f076b7e8..b5f076b7e8 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTest.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTest.java
index 0f6cb912a7..0f6cb912a7 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTest.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTest.java
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/pom.xml
index 8e4f8cc4fb..8e4f8cc4fb 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/pom.xml
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelper.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelper.java
index efe30c4f4e..efe30c4f4e 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelper.java
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelperException.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelperException.java
index 074fba8057..074fba8057 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelperException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelperException.java
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java
index c55e22c905..c55e22c905 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServer.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServer.java
index 44e799a566..44e799a566 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServer.java
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java
index 67b7e8eb64..67b7e8eb64 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServiceImpl.java
index e207a23927..e207a23927 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java
index 0ceb553727..0ceb553727 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/resources/bindingscomposite-system.composite b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/resources/bindingscomposite-system.composite
index 0b894bf701..0b894bf701 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/resources/bindingscomposite-system.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/resources/bindingscomposite-system.composite
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite
index 9b2bb51b9c..9b2bb51b9c 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/resources/wsdl/testtool.wsdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/resources/wsdl/testtool.wsdl
index 870af6ac2e..870af6ac2e 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/resources/wsdl/testtool.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/resources/wsdl/testtool.wsdl
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/resources/wsdl/testutility.wsdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/resources/wsdl/testutility.wsdl
index 32d9050a61..32d9050a61 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/resources/wsdl/testutility.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/main/resources/wsdl/testutility.wsdl
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java
index 727eb2332f..727eb2332f 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingscomposite/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingsutility/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsutility/pom.xml
index 4bd098efcb..4bd098efcb 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingsutility/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsutility/pom.xml
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java
index 664fb06930..664fb06930 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServer.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServer.java
index cd967e275a..cd967e275a 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServer.java
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java
index 0ceb553727..0ceb553727 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServiceImpl.java
index e752e4d6e6..e752e4d6e6 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/resources/bindingsutility-system.composite b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/resources/bindingsutility-system.composite
index 7126b78572..7126b78572 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/resources/bindingsutility-system.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/resources/bindingsutility-system.composite
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/resources/bindingsutility.composite b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/resources/bindingsutility.composite
index 4d3d9bc523..4d3d9bc523 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/resources/bindingsutility.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/resources/bindingsutility.composite
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/resources/wsdl/testutility.wsdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/resources/wsdl/testutility.wsdl
index 32d9050a61..32d9050a61 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/resources/wsdl/testutility.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/main/resources/wsdl/testutility.wsdl
diff --git a/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTestCase.java
index 66246fc006..66246fc006 100644
--- a/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/bindingsutility/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTestCase.java
diff --git a/branches/sca-java-0.99/itest/old/bindings/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/pom.xml
index 895a924bf9..895a924bf9 100644
--- a/branches/sca-java-0.99/itest/old/bindings/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/bindings/pom.xml
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-client/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/pom.xml
index a333346545..a333346545 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-client/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/pom.xml
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
index 1b3a6a6c1d..1b3a6a6c1d 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/README.txt
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/sca/default.scdl
index d286a5137f..d286a5137f 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/binding.axis2.scdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/binding.axis2.scdl
index fb208f56ab..fb208f56ab 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/binding.axis2.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/binding.axis2.scdl
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.axiom.scdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.axiom.scdl
index 92a6be450f..92a6be450f 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.axiom.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.axiom.scdl
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.sdo.scdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.sdo.scdl
index 61753384b4..61753384b4 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.sdo.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.sdo.scdl
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/interface.wsdl.scdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/interface.wsdl.scdl
index 84538dab8b..84538dab8b 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/interface.wsdl.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/interface.wsdl.scdl
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/test-extensions.scdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/test-extensions.scdl
index bda64f749e..bda64f749e 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/test-extensions.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/test-extensions.scdl
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
index 89a8a2e3de..89a8a2e3de 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
index 6b74f04283..6b74f04283 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/pom.xml
index ab4c27ed68..ab4c27ed68 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/pom.xml
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
index ca3031c646..ca3031c646 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/README.txt
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/sca/default.scdl
index 0ed260399c..0ed260399c 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/binding.axis2.scdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/binding.axis2.scdl
index fb208f56ab..fb208f56ab 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/binding.axis2.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/binding.axis2.scdl
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.axiom.scdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.axiom.scdl
index 21df676937..21df676937 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.axiom.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.axiom.scdl
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.sdo.scdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.sdo.scdl
index 61753384b4..61753384b4 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.sdo.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.sdo.scdl
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/interface.wsdl.scdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/interface.wsdl.scdl
index 84538dab8b..84538dab8b 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/interface.wsdl.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/interface.wsdl.scdl
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/test-extensions.scdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/test-extensions.scdl
index 1e8c3b1589..1e8c3b1589 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/test-extensions.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/test-extensions.scdl
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
index e08039cedb..e08039cedb 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
index da70d5b3a6..da70d5b3a6 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-service/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-service/pom.xml
index 1683319ad8..1683319ad8 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-service/pom.xml
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
index c34941f43e..c34941f43e 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
index 820c26ca34..820c26ca34 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
index 3fbc73616e..3fbc73616e 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-service/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-service/src/main/webapp/WEB-INF/web.xml
index 8cf95fb789..8cf95fb789 100644
--- a/branches/sca-java-0.99/itest/old/interop-soap-service/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-service/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-0.99/itest/old/interop-soap-service/t.bat b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-service/t.bat
index 0f83dedc37..0f83dedc37 100755
--- a/branches/sca-java-0.99/itest/old/interop-soap-service/t.bat
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-soap-service/t.bat
diff --git a/branches/sca-java-0.99/itest/old/interop-xsq-client/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-xsq-client/pom.xml
index c31cce8fc3..c31cce8fc3 100644
--- a/branches/sca-java-0.99/itest/old/interop-xsq-client/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-xsq-client/pom.xml
diff --git a/branches/sca-java-0.99/itest/old/interop-xsq-client/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-xsq-client/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/sca-java-0.99/itest/old/interop-xsq-client/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-xsq-client/src/main/resources/META-INF/README.txt
diff --git a/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/java/interop/ClientTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/java/interop/ClientTestCase.java
index f2a7b198a1..f2a7b198a1 100644
--- a/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/java/interop/ClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/java/interop/ClientTestCase.java
diff --git a/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/sca/test.scdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/sca/test.scdl
index 22b3b90623..22b3b90623 100644
--- a/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/sca/test.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/sca/test.scdl
diff --git a/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/tuscany/binding.axis2.scdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/tuscany/binding.axis2.scdl
index fb208f56ab..fb208f56ab 100644
--- a/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/tuscany/binding.axis2.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/tuscany/binding.axis2.scdl
diff --git a/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/tuscany/databinding.axiom.scdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/tuscany/databinding.axiom.scdl
index e4fe956e61..e4fe956e61 100644
--- a/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/tuscany/databinding.axiom.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/tuscany/databinding.axiom.scdl
diff --git a/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/tuscany/databinding.sdo.scdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
index 61753384b4..61753384b4 100644
--- a/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
diff --git a/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/tuscany/interface.wsdl.scdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/tuscany/interface.wsdl.scdl
index 84538dab8b..84538dab8b 100644
--- a/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/tuscany/interface.wsdl.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/tuscany/interface.wsdl.scdl
diff --git a/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/tuscany/test-extensions.scdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/tuscany/test-extensions.scdl
index 355b663a1b..355b663a1b 100644
--- a/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/tuscany/test-extensions.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/META-INF/tuscany/test-extensions.scdl
diff --git a/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/wsdl/sq.wsdl b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/wsdl/sq.wsdl
index 0408a60297..0408a60297 100644
--- a/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/wsdl/sq.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/interop-xsq-client/src/test/resources/wsdl/sq.wsdl
diff --git a/branches/sca-java-0.99/itest/old/spec-api/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/pom.xml
index a082488bbd..a082488bbd 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/pom.xml
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/BasicService.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/BasicService.java
index ba9dd59c46..ba9dd59c46 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/BasicService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/BasicService.java
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MathService.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MathService.java
index 0f46725adf..0f46725adf 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MathService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MathService.java
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyListService.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyListService.java
index 7fe9fa4909..7fe9fa4909 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyListService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyListService.java
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyListServiceByYear.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyListServiceByYear.java
index a381fc62dc..a381fc62dc 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyListServiceByYear.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyListServiceByYear.java
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyService.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyService.java
index fbb2161df3..fbb2161df3 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyService.java
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyServiceByDate.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyServiceByDate.java
index 98490c4e3d..98490c4e3d 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyServiceByDate.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyServiceByDate.java
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyTotalService.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyTotalService.java
index 6a4cfc1f79..6a4cfc1f79 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyTotalService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyTotalService.java
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/SCAComponentService.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/SCAComponentService.java
index c2d107ef28..c2d107ef28 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/SCAComponentService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/SCAComponentService.java
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/BasicServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/BasicServiceImpl.java
index 083307234a..083307234a 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/BasicServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/BasicServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MathServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MathServiceImpl.java
index d3dc1585fc..d3dc1585fc 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MathServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MathServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyListServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyListServiceImpl.java
index 5170c32cd2..5170c32cd2 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyListServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyListServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyServiceImpl.java
index b81c2c2120..b81c2c2120 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyTotalServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyTotalServiceImpl.java
index 11767522d6..11767522d6 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyTotalServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyTotalServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/BasicService.composite b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/BasicService.composite
index d650c8ab42..d650c8ab42 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/BasicService.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/BasicService.composite
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/CompositeTest.composite b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/CompositeTest.composite
index 7a5f05b552..7a5f05b552 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/CompositeTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/CompositeTest.composite
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/MathService.composite b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/MathService.composite
index 59f8fa6981..59f8fa6981 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/MathService.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/MathService.composite
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myListService.composite b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myListService.composite
index 1f0cd97fb4..1f0cd97fb4 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myListService.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myListService.composite
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myServiceInComposite.composite b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myServiceInComposite.composite
index 518cb295f9..518cb295f9 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myServiceInComposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myServiceInComposite.composite
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myServiceInRecursive.composite b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myServiceInRecursive.composite
index f9f7615ec5..f9f7615ec5 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myServiceInRecursive.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myServiceInRecursive.composite
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/mySimpleService.composite b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/mySimpleService.composite
index b1ecaced45..b1ecaced45 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/mySimpleService.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/mySimpleService.composite
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/mySimpleServiceInRecursive.composite b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/mySimpleServiceInRecursive.composite
index 662d67612d..662d67612d 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/mySimpleServiceInRecursive.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/mySimpleServiceInRecursive.composite
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/mySimpleServiceInRecursive2.composite b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/mySimpleServiceInRecursive2.composite
index e059c5b46f..e059c5b46f 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/mySimpleServiceInRecursive2.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/mySimpleServiceInRecursive2.composite
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myTotalService.composite b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myTotalService.composite
index f9076f6811..f9076f6811 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myTotalService.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myTotalService.composite
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myTotalServiceInComposite.composite b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myTotalServiceInComposite.composite
index af41baf277..af41baf277 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myTotalServiceInComposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myTotalServiceInComposite.composite
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite
index e802b469d0..e802b469d0 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myTotalServiceInRecursive.composite b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myTotalServiceInRecursive.composite
index a69c4cedd4..a69c4cedd4 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myTotalServiceInRecursive.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myTotalServiceInRecursive.composite
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite
index 26033aad9f..26033aad9f 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myservice.composite b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myservice.composite
index 4b5972bcc1..4b5972bcc1 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myservice.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/main/resources/myservice.composite
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentContextTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentContextTestCase.java
index 3f64202f13..3f64202f13 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentContextTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentContextTestCase.java
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTestCaseFIXME.java
index 6a96326fbf..6a96326fbf 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTestCaseFIXME.java
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTestCase.java
index b5c6a0d7b5..b5c6a0d7b5 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTestCase.java
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTestCase.java
index d136530412..d136530412 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTestCase.java
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTestCaseFIXME.java
index 5e54b5dcfa..5e54b5dcfa 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTestCaseFIXME.java
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTestCase.java
index c29e9e72b3..c29e9e72b3 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTestCase.java
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTestCase.java
index eb846ddb71..eb846ddb71 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTestCase.java
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTestCase.java
index 60ee8b2011..60ee8b2011 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTestCase.java
diff --git a/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTestCase.java
index d9c2a73f7e..d9c2a73f7e 100644
--- a/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/old/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTestCase.java
diff --git a/branches/sca-java-0.99/itest/operation-overloading/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/operation-overloading/pom.xml
index a5717c1dad..a5717c1dad 100644
--- a/branches/sca-java-0.99/itest/operation-overloading/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/operation-overloading/pom.xml
diff --git a/branches/sca-java-0.99/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java b/sca-java-1.x/branches/sca-java-0.99/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
index f630f9904f..f630f9904f 100644
--- a/branches/sca-java-0.99/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
diff --git a/branches/sca-java-0.99/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/sca-java-1.x/branches/sca-java-0.99/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
index d0f78c409f..d0f78c409f 100644
--- a/branches/sca-java-0.99/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
diff --git a/branches/sca-java-0.99/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/sca-java-1.x/branches/sca-java-0.99/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
index e83952e573..e83952e573 100644
--- a/branches/sca-java-0.99/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
diff --git a/branches/sca-java-0.99/itest/operation-overloading/src/main/resources/OperationOverload.composite b/sca-java-1.x/branches/sca-java-0.99/itest/operation-overloading/src/main/resources/OperationOverload.composite
index cbf5aa2078..cbf5aa2078 100644
--- a/branches/sca-java-0.99/itest/operation-overloading/src/main/resources/OperationOverload.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/operation-overloading/src/main/resources/OperationOverload.composite
diff --git a/branches/sca-java-0.99/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
index 3129b03ff3..3129b03ff3 100644
--- a/branches/sca-java-0.99/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/build-bundles.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/build-bundles.xml
index 450b14a463..450b14a463 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/build-bundles.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/build-bundles.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/pom.xml
index 2cbbedd463..2cbbedd463 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/pom.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/Greetings.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
index 9285c0a8d5..9285c0a8d5 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
index 16d0eae990..16d0eae990 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
index 3d0e045225..3d0e045225 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
index c055aee142..c055aee142 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
index fb0313a313..fb0313a313 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
index 0588da9a85..0588da9a85 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
index 039a214856..039a214856 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
index 4a3cd4aed2..4a3cd4aed2 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
index a69f325526..a69f325526 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
index e2d25bf47d..e2d25bf47d 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
index 3f91f1e922..3f91f1e922 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
index a47f68c579..a47f68c579 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
index 25d7bcf2ff..25d7bcf2ff 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
index 2762bc62be..2762bc62be 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 80346311b1..80346311b1 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index 9717025a4f..9717025a4f 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
index c8cb522cf4..c8cb522cf4 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 37077bad8b..37077bad8b 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
index 02862bc5f6..02862bc5f6 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
index 981e3c7520..981e3c7520 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
index 599ab51a50..599ab51a50 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index df52c6c760..df52c6c760 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index d4374e4315..d4374e4315 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e71c624f49..e71c624f49 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
index a036ecfc76..a036ecfc76 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
index 278a439540..278a439540 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
index ee1f575e70..ee1f575e70 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
index 09e60ca626..09e60ca626 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
index 7dd70889c7..7dd70889c7 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
index 354f40a064..354f40a064 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index d0cf43a960..d0cf43a960 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index f3a98be77b..f3a98be77b 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
index e2f649e4f4..e2f649e4f4 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index effae8c246..effae8c246 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
index 4effadf208..4effadf208 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
index 3b87f6b087..3b87f6b087 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
index b66961b1c2..b66961b1c2 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index 9edf3567e5..9edf3567e5 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
index 659f16be7f..659f16be7f 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index dd283bf779..dd283bf779 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index bb04ff42e0..bb04ff42e0 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
index 3317816557..3317816557 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
index 6d1ad76796..6d1ad76796 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/NOTICE
index d83ebbe236..d83ebbe236 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/README.txt
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml
index 2d345390b7..2d345390b7 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
index 127349eacf..127349eacf 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
index 7e3810c458..7e3810c458 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
index 26f32fe617..26f32fe617 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
index 1b9e0e847e..1b9e0e847e 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
index 6066a38f29..6066a38f29 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
index 777edd3f7d..777edd3f7d 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
index d8adaa2ba3..d8adaa2ba3 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
index e0bd9d8c10..e0bd9d8c10 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
index 6005ae785c..6005ae785c 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
index 6f0b79ebc2..6f0b79ebc2 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
index d4b461460e..d4b461460e 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
index bb15e6e3aa..bb15e6e3aa 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
index 7591201b8c..7591201b8c 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
index 0e844fab99..0e844fab99 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
index fc86a76784..fc86a76784 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
index a8a87c5c8c..a8a87c5c8c 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
index 05bbf4db88..05bbf4db88 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
index a12d1a21ea..a12d1a21ea 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
index 2214db11a6..2214db11a6 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
index 236ff3f84f..236ff3f84f 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
index 60c0fb3fd3..60c0fb3fd3 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
index ca1392d2b8..ca1392d2b8 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
index 7c9f67c36d..7c9f67c36d 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
index 760c761666..760c761666 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
index ebca01749a..ebca01749a 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
index c7ff94d216..c7ff94d216 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
index 66f98011cb..66f98011cb 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
index 02fefbce42..02fefbce42 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
index 8b2e1717fa..8b2e1717fa 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
index c7f13a50a7..c7f13a50a7 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
index 01c125ae38..01c125ae38 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
index cbebf7eec2..cbebf7eec2 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
index fc762df8d5..fc762df8d5 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
index 02e42bc010..02e42bc010 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
index 390367b99b..390367b99b 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
index 4715cbd976..4715cbd976 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
index 932fb8a483..932fb8a483 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
index b10d0416dc..b10d0416dc 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
index c799f31606..c799f31606 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
index db68d7e333..db68d7e333 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
index 1aea3cf669..1aea3cf669 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
index 106bd1b6aa..106bd1b6aa 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
index 1e3c915a59..1e3c915a59 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
index d7d0b41f5e..d7d0b41f5e 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
index 81c51e6804..81c51e6804 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
index ca50b554df..ca50b554df 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
index 14658127f8..14658127f8 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
index 335bc419c1..335bc419c1 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
index a68b9d6dbb..a68b9d6dbb 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
index 02f79c15f3..02f79c15f3 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
index 8428b08d96..8428b08d96 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
index 01d0320f5b..01d0320f5b 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
index 8f311807b5..8f311807b5 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
index fccaad9e05..fccaad9e05 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
index 7ebbfbe185..7ebbfbe185 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
index 6674cdd7f2..6674cdd7f2 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
index 72df35ef41..72df35ef41 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
index 724c8132df..724c8132df 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
index 1e5035d949..1e5035d949 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
index 85bfd86422..85bfd86422 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
index 6e51b3d6f2..6e51b3d6f2 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
index 9a87758ec2..9a87758ec2 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
index e134bd1061..e134bd1061 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
index c19895bab1..c19895bab1 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
index 707609d2c4..707609d2c4 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
index e084e5831a..e084e5831a 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
index d96f6481fb..d96f6481fb 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
index 10ef690c9b..10ef690c9b 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
index 003f9dca5a..003f9dca5a 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
index fefdea106d..fefdea106d 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
index f6b847ed59..f6b847ed59 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
index 5cff2f573e..5cff2f573e 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
index ca50b554df..ca50b554df 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
index 14658127f8..14658127f8 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
index 0fec68a725..0fec68a725 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
index ca50b554df..ca50b554df 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
index 14658127f8..14658127f8 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
index 678014d48d..678014d48d 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
index f0090fb52b..f0090fb52b 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
index 0b50923a05..0b50923a05 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
index 1000a5f974..1000a5f974 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
index 4e392a9ff1..4e392a9ff1 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
index b10d0416dc..b10d0416dc 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
index 788ec4f19a..788ec4f19a 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
index 1ba16d0693..1ba16d0693 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
index a55ebd02a8..a55ebd02a8 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
index e7459360e6..e7459360e6 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
index d518ecab62..d518ecab62 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
index d7d0b41f5e..d7d0b41f5e 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
index 880304187b..880304187b 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
index ca50b554df..ca50b554df 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
index 14658127f8..14658127f8 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
index d8e4c1cb7e..d8e4c1cb7e 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/factory-ds-test.composite b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/factory-ds-test.composite
index ed5b7593dc..ed5b7593dc 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/factory-ds-test.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/factory-ds-test.composite
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/factory-test.composite b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/factory-test.composite
index 53abe030b7..53abe030b7 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/factory-test.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/factory-test.composite
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/helloworld.wsdl b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/helloworld.wsdl
index 68174d1ecd..68174d1ecd 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/helloworld.wsdl
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/interfaces-ds-test.composite b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/interfaces-ds-test.composite
index c3ad9e1588..c3ad9e1588 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/interfaces-ds-test.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/interfaces-ds-test.composite
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/interfaces-test.composite b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/interfaces-test.composite
index 56b04f348d..56b04f348d 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/interfaces-test.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/interfaces-test.composite
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/passbyref-test.composite b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/passbyref-test.composite
index 84e2c5b1cf..84e2c5b1cf 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/passbyref-test.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/passbyref-test.composite
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties-ds-test.composite b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties-ds-test.composite
index e6f51208a7..e6f51208a7 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties-ds-test.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties-ds-test.composite
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties-test.composite b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties-test.composite
index 2794007254..2794007254 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties-test.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties-test.composite
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties2-ds-test.composite b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties2-ds-test.composite
index c341446691..c341446691 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties2-ds-test.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties2-ds-test.composite
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties2-test.composite b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties2-test.composite
index 67b5c294ae..67b5c294ae 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties2-test.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties2-test.composite
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/services-ds-test.composite b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/services-ds-test.composite
index db743296a0..db743296a0 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/services-ds-test.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/services-ds-test.composite
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/services-test.composite b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/services-test.composite
index 35bb9834d6..35bb9834d6 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/services-test.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/services-test.composite
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/version-ds-test.composite b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/version-ds-test.composite
index 66d3a6474d..66d3a6474d 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/version-ds-test.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/version-ds-test.composite
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/version-test.composite b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/version-test.composite
index d3d1551c73..d3d1551c73 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/version-test.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/version-test.composite
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test1.composite b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test1.composite
index 24f8c8f6fc..24f8c8f6fc 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test1.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test1.composite
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test2.composite b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test2.composite
index 95be8374cd..95be8374cd 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test2.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test2.composite
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-test1.composite b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-test1.composite
index 67066049e7..67066049e7 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-test1.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-test1.composite
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-test2.composite b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-test2.composite
index a5a634208d..a5a634208d 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-test2.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-test2.composite
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/ws-helloworld.composite b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/ws-helloworld.composite
index 30fd337134..30fd337134 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/ws-helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/ws-helloworld.composite
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
index 0b0aa0912b..0b0aa0912b 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Customer.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Customer.componentType
index 64986c7dcc..64986c7dcc 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Customer.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Customer.componentType
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/CustomerServices.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/CustomerServices.componentType
index 0cf5563258..0cf5563258 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/CustomerServices.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/CustomerServices.componentType
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/CustomerWithQuery.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/CustomerWithQuery.componentType
index 9906af1463..9906af1463 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/CustomerWithQuery.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/CustomerWithQuery.componentType
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Retailer.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Retailer.componentType
index 7323b2d9be..7323b2d9be 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Retailer.componentType
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/RetailerServices.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/RetailerServices.componentType
index f7ead7eb85..f7ead7eb85 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/RetailerServices.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/RetailerServices.componentType
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/RetailerWithQuery.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/RetailerWithQuery.componentType
index f6ac2393dc..f6ac2393dc 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/RetailerWithQuery.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/RetailerWithQuery.componentType
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Shipper.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Shipper.componentType
index 7996f0f429..7996f0f429 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Shipper.componentType
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/ShipperServices.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/ShipperServices.componentType
index 2906e0d2ed..2906e0d2ed 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/ShipperServices.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/ShipperServices.componentType
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Warehouse.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Warehouse.componentType
index c5ae9b76f3..c5ae9b76f3 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Warehouse.componentType
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/WarehouseServices.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/WarehouseServices.componentType
index c5ae9b76f3..c5ae9b76f3 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/WarehouseServices.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/WarehouseServices.componentType
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/WarehouseWithQuery.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/WarehouseWithQuery.componentType
index 24edf697d5..24edf697d5 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/WarehouseWithQuery.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/WarehouseWithQuery.componentType
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/helloworld/HelloWorldTestCase.java
index ab08fd1982..ab08fd1982 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/helloworld/PassByRefTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/helloworld/PassByRefTestCase.java
index 454fc6a7f8..454fc6a7f8 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/helloworld/PassByRefTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/helloworld/PassByRefTestCase.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
index b41c00bd0b..b41c00bd0b 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
index d569cd7189..d569cd7189 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
index eba07d7d93..eba07d7d93 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
index 2f367a2f64..2f367a2f64 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
index 64610bfff8..64610bfff8 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
index 7b7d4f1e04..7b7d4f1e04 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
index 20dab1ec66..20dab1ec66 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
index 5de9035ace..5de9035ace 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
index 51d37a4519..51d37a4519 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
index 23e1624be1..23e1624be1 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
index 069a5e538d..069a5e538d 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
index 5ec9f51c71..5ec9f51c71 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
index 3226362335..3226362335 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
index 3153399820..3153399820 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
index 8c50bf89aa..8c50bf89aa 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
index 46d41710c6..46d41710c6 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
index 00c6d69678..00c6d69678 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
index b7f0ad79d8..b7f0ad79d8 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
index ad13e72866..ad13e72866 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
index 72fd6fd843..72fd6fd843 100644
--- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
diff --git a/branches/sca-java-0.99/itest/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/pom.xml
index 0c780081f6..0c780081f6 100644
--- a/branches/sca-java-0.99/itest/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/pom.xml
diff --git a/branches/sca-java-0.99/itest/properties/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/properties/pom.xml
index c4de0013df..c4de0013df 100644
--- a/branches/sca-java-0.99/itest/properties/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/properties/pom.xml
diff --git a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
index 667b854c10..667b854c10 100644
--- a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
diff --git a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
index 51d4d9b3cb..51d4d9b3cb 100644
--- a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
index c33c140aec..c33c140aec 100644
--- a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
diff --git a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
index b78d6380ef..b78d6380ef 100644
--- a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
index cd3046c62c..cd3046c62c 100644
--- a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
diff --git a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
index aec71d30f9..aec71d30f9 100644
--- a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
index 559b9ea327..559b9ea327 100644
--- a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
diff --git a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
index 116cdef48f..116cdef48f 100644
--- a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
diff --git a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
index a36bb5e419..a36bb5e419 100644
--- a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
index 459cf2be09..459cf2be09 100644
--- a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
diff --git a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
index cdf381a553..cdf381a553 100644
--- a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
index f20d295a06..f20d295a06 100644
--- a/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
diff --git a/branches/sca-java-0.99/itest/properties/src/main/resources/OuterPropertyTest.composite b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/resources/OuterPropertyTest.composite
index 43853d46a5..43853d46a5 100644
--- a/branches/sca-java-0.99/itest/properties/src/main/resources/OuterPropertyTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/resources/OuterPropertyTest.composite
diff --git a/branches/sca-java-0.99/itest/properties/src/main/resources/PropertyTest.composite b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/resources/PropertyTest.composite
index 0c328e04eb..0c328e04eb 100644
--- a/branches/sca-java-0.99/itest/properties/src/main/resources/PropertyTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/resources/PropertyTest.composite
diff --git a/branches/sca-java-0.99/itest/properties/src/main/resources/customer.xsd b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/resources/customer.xsd
index 8861d7e7b8..8861d7e7b8 100644
--- a/branches/sca-java-0.99/itest/properties/src/main/resources/customer.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/resources/customer.xsd
diff --git a/branches/sca-java-0.99/itest/properties/src/main/resources/fileProperty.txt b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/resources/fileProperty.txt
index 0d3d9ead83..0d3d9ead83 100644
--- a/branches/sca-java-0.99/itest/properties/src/main/resources/fileProperty.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/resources/fileProperty.txt
diff --git a/branches/sca-java-0.99/itest/properties/src/main/resources/manyValuesFileProperty.txt b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/resources/manyValuesFileProperty.txt
index 450f397b30..450f397b30 100644
--- a/branches/sca-java-0.99/itest/properties/src/main/resources/manyValuesFileProperty.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/main/resources/manyValuesFileProperty.txt
diff --git a/branches/sca-java-0.99/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
index b2ac537dec..b2ac537dec 100644
--- a/branches/sca-java-0.99/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
diff --git a/branches/sca-java-0.99/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
index a01700920f..a01700920f 100644
--- a/branches/sca-java-0.99/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
diff --git a/branches/sca-java-0.99/itest/recursive/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/pom.xml
index eecc750805..eecc750805 100644
--- a/branches/sca-java-0.99/itest/recursive/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/pom.xml
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/java/composite/CompositeClient.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/composite/CompositeClient.java
index 5edc305970..5edc305970 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/java/composite/CompositeClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/composite/CompositeClient.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/java/composite/Source.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/composite/Source.java
index d0efcc1df1..d0efcc1df1 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/java/composite/Source.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/composite/Source.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/java/composite/SourceCallback.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/composite/SourceCallback.java
index baa95a8e39..baa95a8e39 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/java/composite/SourceCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/composite/SourceCallback.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/java/composite/SourceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/composite/SourceImpl.java
index b9a0c7ff74..b9a0c7ff74 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/java/composite/SourceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/composite/SourceImpl.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/java/composite/Target.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/composite/Target.java
index 9a8f68a7fa..9a8f68a7fa 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/java/composite/Target.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/composite/Target.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/java/composite/TargetImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/composite/TargetImpl.java
index 86686e9233..86686e9233 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/java/composite/TargetImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/composite/TargetImpl.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/java/sample/ComponentAImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/sample/ComponentAImpl.java
index f513949105..f513949105 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/java/sample/ComponentAImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/sample/ComponentAImpl.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/java/sample/ComponentCImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/sample/ComponentCImpl.java
index 586a9ee6a7..586a9ee6a7 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/java/sample/ComponentCImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/sample/ComponentCImpl.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/java/sample/ComponentEImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/sample/ComponentEImpl.java
index dbf2735aa7..dbf2735aa7 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/java/sample/ComponentEImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/sample/ComponentEImpl.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/java/sample/ComponentFImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/sample/ComponentFImpl.java
index 5e136e536c..5e136e536c 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/java/sample/ComponentFImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/sample/ComponentFImpl.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/java/sample/Service1.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/sample/Service1.java
index 81bdce79f1..81bdce79f1 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/java/sample/Service1.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/sample/Service1.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/java/test/Aggregator.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/test/Aggregator.java
index 88b3bed1b2..88b3bed1b2 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/java/test/Aggregator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/test/Aggregator.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/java/test/AggregatorImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/test/AggregatorImpl.java
index f6ac6c8741..f6ac6c8741 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/java/test/AggregatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/test/AggregatorImpl.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/java/test/InnerSourceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/test/InnerSourceImpl.java
index c8dad5ae35..c8dad5ae35 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/java/test/InnerSourceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/test/InnerSourceImpl.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/java/test/OuterSourceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/test/OuterSourceImpl.java
index 11816e82cf..11816e82cf 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/java/test/OuterSourceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/test/OuterSourceImpl.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/java/test/Source.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/test/Source.java
index 9b93740d9d..9b93740d9d 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/java/test/Source.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/test/Source.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/java/test1/composite/Target.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/test1/composite/Target.java
index 4883e12f49..4883e12f49 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/java/test1/composite/Target.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/test1/composite/Target.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/java/test1/composite/TargetOne.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/test1/composite/TargetOne.java
index a7c68f4ffd..a7c68f4ffd 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/java/test1/composite/TargetOne.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/test1/composite/TargetOne.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/java/test1/composite/TargetTwo.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/test1/composite/TargetTwo.java
index 7fff8e2e9b..7fff8e2e9b 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/java/test1/composite/TargetTwo.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/java/test1/composite/TargetTwo.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/resources/Composite1.composite b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/Composite1.composite
index 56fd7c621f..56fd7c621f 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/resources/Composite1.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/Composite1.composite
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/resources/Composite2.composite b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/Composite2.composite
index 54f10673a4..54f10673a4 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/resources/Composite2.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/Composite2.composite
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/resources/Composite3.composite b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/Composite3.composite
index 040653493f..040653493f 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/resources/Composite3.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/Composite3.composite
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/resources/Inner.composite b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/Inner.composite
index 398ebdf6e2..398ebdf6e2 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/resources/Inner.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/Inner.composite
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/resources/InnerComposite.composite b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/InnerComposite.composite
index 3376ac8ff5..3376ac8ff5 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/resources/InnerComposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/InnerComposite.composite
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/resources/InnerComposite2.composite b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/InnerComposite2.composite
index c9eff4fa9d..c9eff4fa9d 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/resources/InnerComposite2.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/InnerComposite2.composite
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
index 289b92a3f2..289b92a3f2 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/resources/Outer.composite b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/Outer.composite
index 987990d854..987990d854 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/resources/Outer.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/Outer.composite
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/resources/OuterComposite.composite b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/OuterComposite.composite
index cb1c1e13d4..cb1c1e13d4 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/resources/OuterComposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/OuterComposite.composite
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/resources/test1/InnerComposite.composite b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/test1/InnerComposite.composite
index 177fa10550..177fa10550 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/resources/test1/InnerComposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/test1/InnerComposite.composite
diff --git a/branches/sca-java-0.99/itest/recursive/src/main/resources/test1/OuterComposite.composite b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/test1/OuterComposite.composite
index 6253533e01..6253533e01 100644
--- a/branches/sca-java-0.99/itest/recursive/src/main/resources/test1/OuterComposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/main/resources/test1/OuterComposite.composite
diff --git a/branches/sca-java-0.99/itest/recursive/src/test/java/composite/CompositeTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/test/java/composite/CompositeTestCase.java
index 5482e47463..5482e47463 100644
--- a/branches/sca-java-0.99/itest/recursive/src/test/java/composite/CompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/test/java/composite/CompositeTestCase.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
index f1d9fca53c..f1d9fca53c 100644
--- a/branches/sca-java-0.99/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
index e2480dfd0c..e2480dfd0c 100644
--- a/branches/sca-java-0.99/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
index a543add69b..a543add69b 100644
--- a/branches/sca-java-0.99/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/test/java/test/InnerTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/test/java/test/InnerTestCase.java
index ebb4bc7acb..ebb4bc7acb 100644
--- a/branches/sca-java-0.99/itest/recursive/src/test/java/test/InnerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/test/java/test/InnerTestCase.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/test/java/test/OuterTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/test/java/test/OuterTestCase.java
index 17de5ca4a8..17de5ca4a8 100644
--- a/branches/sca-java-0.99/itest/recursive/src/test/java/test/OuterTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/test/java/test/OuterTestCase.java
diff --git a/branches/sca-java-0.99/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
index ab3e625ae5..ab3e625ae5 100644
--- a/branches/sca-java-0.99/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
diff --git a/branches/sca-java-0.99/itest/references/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/references/pom.xml
index dab0d74964..dab0d74964 100644
--- a/branches/sca-java-0.99/itest/references/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/references/pom.xml
diff --git a/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java b/sca-java-1.x/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
index 8d27ee486c..8d27ee486c 100644
--- a/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
diff --git a/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
index 976efb4d3c..976efb4d3c 100644
--- a/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java b/sca-java-1.x/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
index 33b8d7b3a3..33b8d7b3a3 100644
--- a/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
diff --git a/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
index d19a9b0ec2..d19a9b0ec2 100644
--- a/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java b/sca-java-1.x/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
index 748564da79..748564da79 100644
--- a/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
diff --git a/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
index 694b522979..694b522979 100644
--- a/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java b/sca-java-1.x/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
index 5706c147fc..5706c147fc 100644
--- a/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
diff --git a/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
index 774bb4d222..774bb4d222 100644
--- a/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/references/src/main/resources/InnerReferencesTest.composite b/sca-java-1.x/branches/sca-java-0.99/itest/references/src/main/resources/InnerReferencesTest.composite
index 025092a020..025092a020 100644
--- a/branches/sca-java-0.99/itest/references/src/main/resources/InnerReferencesTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/references/src/main/resources/InnerReferencesTest.composite
diff --git a/branches/sca-java-0.99/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
index 239d72911e..239d72911e 100644
--- a/branches/sca-java-0.99/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
diff --git a/branches/sca-java-0.99/itest/scopes/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/scopes/pom.xml
index a114a600cf..a114a600cf 100644
--- a/branches/sca-java-0.99/itest/scopes/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/scopes/pom.xml
diff --git a/branches/sca-java-0.99/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
index f913b57130..f913b57130 100644
--- a/branches/sca-java-0.99/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
diff --git a/branches/sca-java-0.99/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
index 5e01553b78..5e01553b78 100644
--- a/branches/sca-java-0.99/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
diff --git a/branches/sca-java-0.99/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java b/sca-java-1.x/branches/sca-java-0.99/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
index 878f7e4cc6..878f7e4cc6 100644
--- a/branches/sca-java-0.99/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
diff --git a/branches/sca-java-0.99/itest/scopes/src/main/resources/scopes.composite b/sca-java-1.x/branches/sca-java-0.99/itest/scopes/src/main/resources/scopes.composite
index 54a1b66830..54a1b66830 100644
--- a/branches/sca-java-0.99/itest/scopes/src/main/resources/scopes.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/scopes/src/main/resources/scopes.composite
diff --git a/branches/sca-java-0.99/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
index ce2519cbc0..ce2519cbc0 100644
--- a/branches/sca-java-0.99/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
diff --git a/branches/sca-java-0.99/itest/services/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/services/pom.xml
index 9efff14575..9efff14575 100644
--- a/branches/sca-java-0.99/itest/services/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/services/pom.xml
diff --git a/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
index 885dc3ab1d..885dc3ab1d 100644
--- a/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
diff --git a/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
index 3577e09add..3577e09add 100644
--- a/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
index 2e9b56d64d..2e9b56d64d 100644
--- a/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
diff --git a/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
index cda3f38636..cda3f38636 100644
--- a/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
index 47e6287796..47e6287796 100644
--- a/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
diff --git a/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
index 0028f9c2ed..0028f9c2ed 100644
--- a/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
index aa745deb63..aa745deb63 100644
--- a/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
diff --git a/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
index 83da15089f..83da15089f 100644
--- a/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
diff --git a/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
index 36189f94bb..36189f94bb 100644
--- a/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
diff --git a/branches/sca-java-0.99/itest/services/src/main/resources/ServicesTest.composite b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/main/resources/ServicesTest.composite
index 4516d9c86f..4516d9c86f 100644
--- a/branches/sca-java-0.99/itest/services/src/main/resources/ServicesTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/main/resources/ServicesTest.composite
diff --git a/branches/sca-java-0.99/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
index 4b723d4949..4b723d4949 100644
--- a/branches/sca-java-0.99/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
diff --git a/branches/sca-java-0.99/itest/wsdl/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/pom.xml
index 5f2e53b2fa..5f2e53b2fa 100644
--- a/branches/sca-java-0.99/itest/wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/pom.xml
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
index 265b11f7dd..265b11f7dd 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
index f8c9c28f26..f8c9c28f26 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
index f16d20689d..f16d20689d 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
index cba6f2ee6c..cba6f2ee6c 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
index 9f15be0236..9f15be0236 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
index f174e1af07..f174e1af07 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
index 4a5b7bceef..4a5b7bceef 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
index e747eb041f..e747eb041f 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
index c9076ebba6..c9076ebba6 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
index bd527ff8e2..bd527ff8e2 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
index d706517b76..d706517b76 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
index 9d147dc013..9d147dc013 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
index 7556e02b36..7556e02b36 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
index e7031ff41c..e7031ff41c 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
index 7a049ed7b0..7a049ed7b0 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/resources/SDOWSDLTest.composite b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/resources/SDOWSDLTest.composite
index 62596ee62a..62596ee62a 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/resources/SDOWSDLTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/resources/SDOWSDLTest.composite
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/resources/WSDLTest.composite b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/resources/WSDLTest.composite
index 2024578dae..2024578dae 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/resources/WSDLTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/resources/WSDLTest.composite
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component2bImpl.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component2bImpl.componentType
index aa91a713d9..aa91a713d9 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component2bImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component2bImpl.componentType
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component3bImpl.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component3bImpl.componentType
index 57b1d66e9c..57b1d66e9c 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component3bImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component3bImpl.componentType
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component2bImpl.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component2bImpl.componentType
index de8307b8c2..de8307b8c2 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component2bImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component2bImpl.componentType
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component3bImpl.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component3bImpl.componentType
index de8307b8c2..de8307b8c2 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component3bImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component3bImpl.componentType
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
index 73f9ed4bfc..73f9ed4bfc 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-java-0.99/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
index 3921dec72d..3921dec72d 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-0.99/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
index 12441753fb..12441753fb 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
diff --git a/branches/sca-java-0.99/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
index fd30d69c79..fd30d69c79 100644
--- a/branches/sca-java-0.99/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
diff --git a/branches/sca-java-0.99/itest/wsdl2java/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl2java/pom.xml
index ef7257bade..ef7257bade 100644
--- a/branches/sca-java-0.99/itest/wsdl2java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl2java/pom.xml
diff --git a/branches/sca-java-0.99/itest/wsdl2java/src/test/resources/AccountService.wsdl b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl2java/src/test/resources/AccountService.wsdl
index 9e5650e7dd..9e5650e7dd 100644
--- a/branches/sca-java-0.99/itest/wsdl2java/src/test/resources/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl2java/src/test/resources/AccountService.wsdl
diff --git a/branches/sca-java-0.99/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
index c44229c162..c44229c162 100644
--- a/branches/sca-java-0.99/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
diff --git a/branches/sca-java-0.99/itest/wsdlless/pom.xml b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/pom.xml
index 7a03492d6d..7a03492d6d 100644
--- a/branches/sca-java-0.99/itest/wsdlless/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/pom.xml
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
index 81e393852d..81e393852d 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
index df658428fd..df658428fd 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
index d39df8c00e..d39df8c00e 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
index d4a06780c3..d4a06780c3 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
index 6dc46c60b5..6dc46c60b5 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
index 8471000152..8471000152 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
index 859c61a724..859c61a724 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
index e747eb041f..e747eb041f 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
index c9076ebba6..c9076ebba6 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
index bd527ff8e2..bd527ff8e2 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
index d706517b76..d706517b76 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
index 9d147dc013..9d147dc013 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
index 7556e02b36..7556e02b36 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
index e7031ff41c..e7031ff41c 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
index 7a049ed7b0..7a049ed7b0 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/resources/SDOWSDLTest.composite b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
index 16d3806318..16d3806318 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/resources/WSDLTest.composite b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/resources/WSDLTest.composite
index e69cdbc282..e69cdbc282 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/resources/WSDLTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/resources/WSDLTest.composite
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/resources/bigbank/account/services/accountdata/Component2bImpl.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/resources/bigbank/account/services/accountdata/Component2bImpl.componentType
index aa91a713d9..aa91a713d9 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/resources/bigbank/account/services/accountdata/Component2bImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/resources/bigbank/account/services/accountdata/Component2bImpl.componentType
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/resources/bigbank/account/services/accountdata/Component3bImpl.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/resources/bigbank/account/services/accountdata/Component3bImpl.componentType
index 57b1d66e9c..57b1d66e9c 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/resources/bigbank/account/services/accountdata/Component3bImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/resources/bigbank/account/services/accountdata/Component3bImpl.componentType
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/resources/org/apache/tuscany/sca/itest/Component2bImpl.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/resources/org/apache/tuscany/sca/itest/Component2bImpl.componentType
index de8307b8c2..de8307b8c2 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/resources/org/apache/tuscany/sca/itest/Component2bImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/resources/org/apache/tuscany/sca/itest/Component2bImpl.componentType
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/resources/org/apache/tuscany/sca/itest/Component3bImpl.componentType b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/resources/org/apache/tuscany/sca/itest/Component3bImpl.componentType
index de8307b8c2..de8307b8c2 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/resources/org/apache/tuscany/sca/itest/Component3bImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/resources/org/apache/tuscany/sca/itest/Component3bImpl.componentType
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
index 73f9ed4bfc..73f9ed4bfc 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
index 3921dec72d..3921dec72d 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
index 12441753fb..12441753fb 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
diff --git a/branches/sca-java-0.99/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
index fd30d69c79..fd30d69c79 100644
--- a/branches/sca-java-0.99/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/LICENSE
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/NOTICE
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/pom.xml
index caa428f437..caa428f437 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/pom.xml
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java
index 28a5ecdc24..28a5ecdc24 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java
index 98f247e5cc..98f247e5cc 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java
index 7f3c89fd2f..7f3c89fd2f 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java
index 8966a4be9d..8966a4be9d 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java
index f3e36e8c38..f3e36e8c38 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java
index e2108b5ef8..e2108b5ef8 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java
index 0968310548..0968310548 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java
index 9022b9d9e6..9022b9d9e6 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java
index 49f7cd46b2..49f7cd46b2 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java
index d9aab9de22..d9aab9de22 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java
index 379429d17e..379429d17e 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java
index 709562cd72..709562cd72 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java
index ba91fd2168..ba91fd2168 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java
index 4e239d03d3..4e239d03d3 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java
index 030c820ed2..030c820ed2 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java
index 92f448ec87..92f448ec87 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java
index b856201551..b856201551 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java
index 90a4292546..90a4292546 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java
diff --git a/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java
index a0580095a0..a0580095a0 100644
--- a/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/.checkstyle
index 3e57539570..3e57539570 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/.checkstyle
diff --git a/branches/sca-java-0.99/modules/assembly-xml/.pmd b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/.pmd
diff --git a/branches/sca-java-0.99/modules/assembly-xml/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/.ruleset
index 830b4cfee4..830b4cfee4 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/.ruleset
diff --git a/branches/sca-java-0.99/modules/assembly-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/assembly-xml/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/LICENSE
diff --git a/branches/sca-java-0.99/modules/assembly-xml/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/NOTICE
diff --git a/branches/sca-java-0.99/modules/assembly-xml/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/pom.xml
index 1d35898ee3..1d35898ee3 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/pom.xml
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseArtifactProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseArtifactProcessor.java
index c7b63d69fc..c7b63d69fc 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseArtifactProcessor.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
index f9d6809b17..f9d6809b17 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
index 5e4c437cae..5e4c437cae 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
index 684220eb61..684220eb61 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
index da21883fb5..da21883fb5 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
index a695fcb7f8..a695fcb7f8 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index 8480807e58..8480807e58 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
index 80ab8d1b70..80ab8d1b70 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
index fa22602356..fa22602356 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
index 8333a46b50..8333a46b50 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
index 1db4724233..1db4724233 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
index a75bc9b553..a75bc9b553 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/XAttr.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/XAttr.java
index fba7fc5391..fba7fc5391 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/XAttr.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/XAttr.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index ecc34942f1..ecc34942f1 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
index bb2c2269e4..bb2c2269e4 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java
index 20591214f4..20591214f4 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
index e2e2a668ee..e2e2a668ee 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
index 38d0b584a0..38d0b584a0 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
index 81c244a6d5..81c244a6d5 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
index d49339ad8f..d49339ad8f 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
index ddd26169e8..ddd26169e8 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
index 3224176d6e..3224176d6e 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
index c423df6f7d..c423df6f7d 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
index 757129565a..757129565a 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
index 96eeb72f3e..96eeb72f3e 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
index a49a46b41c..a49a46b41c 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/AnotherDefinitions.xml b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/AnotherDefinitions.xml
index b99287d57e..b99287d57e 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/AnotherDefinitions.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/AnotherDefinitions.xml
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
index 4546fddb2d..4546fddb2d 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
index 072fe8fde1..072fe8fde1 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
index d67ba3ec2b..d67ba3ec2b 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
index 39ba3c6b11..39ba3c6b11 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
index d59e69209d..d59e69209d 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
index 59f832d6df..59f832d6df 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
diff --git a/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/definitions.xml b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/definitions.xml
index 3c268f18e0..3c268f18e0 100644
--- a/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/definitions.xml
diff --git a/branches/sca-java-0.99/modules/assembly/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.99/modules/assembly/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/.checkstyle
diff --git a/branches/sca-java-0.99/modules/assembly/.pmd b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/.pmd
index aa1ce3e754..aa1ce3e754 100644
--- a/branches/sca-java-0.99/modules/assembly/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/.pmd
diff --git a/branches/sca-java-0.99/modules/assembly/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.99/modules/assembly/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/.ruleset
diff --git a/branches/sca-java-0.99/modules/assembly/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/assembly/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/assembly/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/assembly/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/LICENSE
diff --git a/branches/sca-java-0.99/modules/assembly/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/assembly/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/NOTICE
diff --git a/branches/sca-java-0.99/modules/assembly/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/pom.xml
index 361fc17141..361fc17141 100644
--- a/branches/sca-java-0.99/modules/assembly/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/pom.xml
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
index 6af7f40169..6af7f40169 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
index c5e78cb471..c5e78cb471 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
index a9ef26bbb9..a9ef26bbb9 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
index 9ae511c07b..9ae511c07b 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
index 3937d34f92..3937d34f92 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
index 76511d351d..76511d351d 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
index 11914778f7..11914778f7 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
index e21547d6a6..e21547d6a6 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
index 4d161f737e..4d161f737e 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
index f944d52794..f944d52794 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
index cf7a19fc7d..cf7a19fc7d 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
index 65945692f1..65945692f1 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
index e1ea65ea39..e1ea65ea39 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
index 0d9698f0ae..0d9698f0ae 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
index d3fa80ba74..d3fa80ba74 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
index 7143f571f9..7143f571f9 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
index 9890bfed68..9890bfed68 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
index 25d35d38f5..25d35d38f5 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
index 5dd256e3c4..5dd256e3c4 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
index 3577a94d1e..3577a94d1e 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
index 9b62bb4506..9b62bb4506 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
index 5d15ce9938..5d15ce9938 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
index 683920da58..683920da58 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
index f38346663a..f38346663a 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
index 2cf04277cd..2cf04277cd 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
index 0abfd13d10..0abfd13d10 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
index 020870cd34..020870cd34 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
index ee65e5746e..ee65e5746e 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireableBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireableBinding.java
index 9f5d032b18..9f5d032b18 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireableBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireableBinding.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
index 5f5856d051..5f5856d051 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
index 26bdc3cffa..26bdc3cffa 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
index 5a2015f55e..5a2015f55e 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
index aecdf417f2..aecdf417f2 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
index 8965410438..8965410438 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
index e1d550823c..e1d550823c 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
index 25c22fffe9..25c22fffe9 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
index 7ed2e8f5ca..7ed2e8f5ca 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
index 6f96d70fea..6f96d70fea 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
index ced482dbf6..ced482dbf6 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
index 824d0a9d7c..824d0a9d7c 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
index 3661411d49..3661411d49 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
index 71be058795..71be058795 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
index 5c4574cec7..5c4574cec7 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
index 270121f901..270121f901 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
index d0ee3832c5..d0ee3832c5 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
index 346764b1b4..346764b1b4 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
index 1e623d35f2..1e623d35f2 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
index 553e600bc9..553e600bc9 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
index f9c08e84a0..f9c08e84a0 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
index 10039d70cf..10039d70cf 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
index 512ab0d2d0..512ab0d2d0 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
index 2ad517eb2d..2ad517eb2d 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
index 0c78a2505f..0c78a2505f 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
index 238e0c3d1e..238e0c3d1e 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
index 088c6c4bc2..088c6c4bc2 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
index 4348e08fcb..4348e08fcb 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
index 6777a96982..6777a96982 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
index 14dee9f36b..14dee9f36b 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
index 358075fc96..358075fc96 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
index 9a7ca09e43..9a7ca09e43 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
index 518f9d2b40..518f9d2b40 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
index 314ddb113c..314ddb113c 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
index 5a6e2486fe..5a6e2486fe 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
index 0fa1512156..0fa1512156 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/util/PrintUtil.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/util/PrintUtil.java
index df84781270..df84781270 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/util/PrintUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/util/PrintUtil.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
index 859c4bde4b..859c4bde4b 100644
--- a/branches/sca-java-0.99/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
diff --git a/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
index 767b152624..767b152624 100644
--- a/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
index c9e32e7573..c9e32e7573 100644
--- a/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
index 61ca3945ea..61ca3945ea 100644
--- a/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
index dbe0cb8225..dbe0cb8225 100644
--- a/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
index ee6b95edc9..ee6b95edc9 100644
--- a/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
index d94a7e93a3..d94a7e93a3 100644
--- a/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
index 854d15f546..854d15f546 100644
--- a/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
diff --git a/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/util/PrintUtilTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/util/PrintUtilTestCase.java
index a61ae0d959..a61ae0d959 100644
--- a/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/util/PrintUtilTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/util/PrintUtilTestCase.java
diff --git a/branches/sca-java-0.99/modules/binding-dwr/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/binding-dwr/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/binding-dwr/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/binding-dwr/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/LICENSE
diff --git a/branches/sca-java-0.99/modules/binding-dwr/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/binding-dwr/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/NOTICE
diff --git a/branches/sca-java-0.99/modules/binding-dwr/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/pom.xml
index 3e67a7b645..3e67a7b645 100644
--- a/branches/sca-java-0.99/modules/binding-dwr/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/pom.xml
diff --git a/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
index f2ed343ea0..f2ed343ea0 100644
--- a/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
diff --git a/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
index 281be750d1..281be750d1 100644
--- a/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
diff --git a/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
index 5af31bd416..5af31bd416 100644
--- a/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
diff --git a/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
index 9ce9dd01bc..9ce9dd01bc 100644
--- a/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
diff --git a/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
index c5b0e4f6e6..c5b0e4f6e6 100644
--- a/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
diff --git a/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
index 0f55b65069..0f55b65069 100644
--- a/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
diff --git a/branches/sca-java-0.99/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
index 1a9f91fab2..1a9f91fab2 100644
--- a/branches/sca-java-0.99/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
diff --git a/branches/sca-java-0.99/modules/binding-ejb/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/binding-ejb/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/LICENSE
diff --git a/branches/sca-java-0.99/modules/binding-ejb/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/NOTICE
diff --git a/branches/sca-java-0.99/modules/binding-ejb/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/pom.xml
index 7d3a73e3c9..7d3a73e3c9 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/pom.xml
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
index c4b72ed274..c4b72ed274 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingActivator.java
index 4cc95e2c90..4cc95e2c90 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingActivator.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingsActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingsActivator.java
index 31a5a3e652..31a5a3e652 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingsActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingsActivator.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBTargetInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBTargetInvoker.java
index 9a9ccb61c4..9a9ccb61c4 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBTargetInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBTargetInvoker.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
index 543bd51d60..543bd51d60 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
index cff632eb3d..cff632eb3d 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
index 9e512e83af..9e512e83af 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
index 1be4a98a48..1be4a98a48 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
index 3ff0ed552a..3ff0ed552a 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
index f9aa9ffa22..f9aa9ffa22 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
index 945427ced2..945427ced2 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
index 89d6e1bf55..89d6e1bf55 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
index 14a7e94e48..14a7e94e48 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
index 95d0542e4f..95d0542e4f 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
index c05f9ad631..c05f9ad631 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
index 6a96b14d78..6a96b14d78 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
index e6f4032d06..e6f4032d06 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
index 1d99f157bb..1d99f157bb 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index f935bb989d..f935bb989d 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
index 1e69e1a07c..1e69e1a07c 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/test/java/account/BankManagerFacade.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/java/account/BankManagerFacade.java
index a8100d280b..a8100d280b 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/test/java/account/BankManagerFacade.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/java/account/BankManagerFacade.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/test/java/account/Customer.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/java/account/Customer.java
index 2b5ed04f6a..2b5ed04f6a 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/test/java/account/Customer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/java/account/Customer.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/test/java/account/CustomerImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/java/account/CustomerImpl.java
index 3d3f785a50..3d3f785a50 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/test/java/account/CustomerImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/java/account/CustomerImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/java/calculator/AddService.java
index 7cefba530a..7cefba530a 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/test/java/calculator/AddServiceHome.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/java/calculator/AddServiceHome.java
index 8b62f3c3d8..8b62f3c3d8 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/test/java/calculator/AddServiceHome.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/java/calculator/AddServiceHome.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
index 70e2461b0e..70e2461b0e 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
index 56c80f60eb..56c80f60eb 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCaseFIXME.java
index 9e86abbc93..9e86abbc93 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCaseFIXME.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
index 27d2a0be58..27d2a0be58 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
index 275ae31f90..275ae31f90 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
diff --git a/branches/sca-java-0.99/modules/binding-ejb/src/test/resources/account/account.composite b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/resources/account/account.composite
index 14f77eed08..14f77eed08 100644
--- a/branches/sca-java-0.99/modules/binding-ejb/src/test/resources/account/account.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ejb/src/test/resources/account/account.composite
diff --git a/branches/sca-java-0.99/modules/binding-feed/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/binding-feed/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/binding-feed/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-0.99/modules/binding-feed/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/LICENSE
diff --git a/branches/sca-java-0.99/modules/binding-feed/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/NOTICE
index eb1926d971..eb1926d971 100644
--- a/branches/sca-java-0.99/modules/binding-feed/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/NOTICE
diff --git a/branches/sca-java-0.99/modules/binding-feed/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/pom.xml
index aa4dd222e7..aa4dd222e7 100644
--- a/branches/sca-java-0.99/modules/binding-feed/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/pom.xml
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java
index 85ee25bf42..85ee25bf42 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java
index 050ba9b73c..050ba9b73c 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java
index a71205ea77..a71205ea77 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java
index c95c8ac012..c95c8ac012 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java
index 4cd48fd938..4cd48fd938 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java
index 09942bcc23..09942bcc23 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java
index 503f30e685..503f30e685 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java
index a9a1167544..a9a1167544 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
index 21e7d66227..21e7d66227 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java
index 4d8fb943f0..4d8fb943f0 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java
index 72ae22a4c8..72ae22a4c8 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java
index c684970136..c684970136 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java
index 0f2356b5e0..0f2356b5e0 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomEntryUtil.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomEntryUtil.java
index f2566f81a5..f2566f81a5 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomEntryUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomEntryUtil.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java
index 0d0cf86b3b..0d0cf86b3b 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
index 8778ded524..8778ded524 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
index 1f27becc2a..1f27becc2a 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java
index 4b3dbc7de3..4b3dbc7de3 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java
index 98c53d6bed..98c53d6bed 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java
index 34eae321ab..34eae321ab 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java
index 5fc5872e84..5fc5872e84 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory
index 49478e3db0..49478e3db0 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory
index f69b024da9..f69b024da9 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 3f073b28b9..3f073b28b9 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index f81a0d33ae..f81a0d33ae 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java
index 4a33637121..4a33637121 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java
index b7416011ba..b7416011ba 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java
index 5b08b036c1..5b08b036c1 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java
index 255f90685b..255f90685b 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java
index a9ddc1a2c8..a9ddc1a2c8 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
index 1987c042e6..1987c042e6 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
diff --git a/branches/sca-java-0.99/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
index 9268fbe211..9268fbe211 100644
--- a/branches/sca-java-0.99/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
diff --git a/branches/sca-java-0.99/modules/binding-http/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/binding-http/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/binding-http/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/binding-http/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/LICENSE
diff --git a/branches/sca-java-0.99/modules/binding-http/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/binding-http/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/NOTICE
diff --git a/branches/sca-java-0.99/modules/binding-http/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/pom.xml
index a0b7a3fc7e..a0b7a3fc7e 100644
--- a/branches/sca-java-0.99/modules/binding-http/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/pom.xml
diff --git a/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResource.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResource.java
index 7ed660a54f..7ed660a54f 100644
--- a/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResource.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResource.java
diff --git a/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBinding.java
index be9483b3c0..be9483b3c0 100644
--- a/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBinding.java
diff --git a/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingFactory.java
index cf59e07782..cf59e07782 100644
--- a/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingFactory.java
diff --git a/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingFactoryImpl.java
index 9620c2bc04..9620c2bc04 100644
--- a/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingFactoryImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingImpl.java
index aab392b2ed..aab392b2ed 100644
--- a/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceBindingProviderFactory.java
index 2cb7b1d530..2cb7b1d530 100644
--- a/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceBindingProviderFactory.java
diff --git a/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.java
index 32b0c4cc4a..32b0c4cc4a 100644
--- a/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.java
diff --git a/branches/sca-java-0.99/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPResourceBindingFactory b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPResourceBindingFactory
index ae416c25f0..ae416c25f0 100644
--- a/branches/sca-java-0.99/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPResourceBindingFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPResourceBindingFactory
diff --git a/branches/sca-java-0.99/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index bdccbd7314..bdccbd7314 100644
--- a/branches/sca-java-0.99/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-0.99/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 1351707239..1351707239 100644
--- a/branches/sca-java-0.99/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-0.99/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingTestCase.java
index 72eb537a8b..72eb537a8b 100644
--- a/branches/sca-java-0.99/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingTestCase.java
diff --git a/branches/sca-java-0.99/modules/binding-http/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-java-0.99/modules/binding-http/src/test/resources/content/test.html
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/test/resources/content/test.html
diff --git a/branches/sca-java-0.99/modules/binding-http/src/test/resources/resource.composite b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/test/resources/resource.composite
index 3b57544db5..3b57544db5 100644
--- a/branches/sca-java-0.99/modules/binding-http/src/test/resources/resource.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-http/src/test/resources/resource.composite
diff --git a/branches/sca-java-0.99/modules/binding-jms/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/binding-jms/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/binding-jms/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/binding-jms/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/LICENSE
diff --git a/branches/sca-java-0.99/modules/binding-jms/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/binding-jms/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/NOTICE
diff --git a/branches/sca-java-0.99/modules/binding-jms/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/pom.xml
index 0f8bd9d46b..0f8bd9d46b 100644
--- a/branches/sca-java-0.99/modules/binding-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/pom.xml
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/ActivationSpec.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/ActivationSpec.java
index eb441420aa..eb441420aa 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/ActivationSpec.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/ActivationSpec.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/ConnectionFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/ConnectionFactory.java
index d0f7a473ac..d0f7a473ac 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/ConnectionFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/ConnectionFactory.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/ConnectionInfo.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/ConnectionInfo.java
index b792c1c333..b792c1c333 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/ConnectionInfo.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/ConnectionInfo.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/CorrelationScheme.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/CorrelationScheme.java
index 5fa8a3c371..5fa8a3c371 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/CorrelationScheme.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/CorrelationScheme.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/CreateResource.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/CreateResource.java
index cba2f37e80..cba2f37e80 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/CreateResource.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/CreateResource.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/Definitions.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/Definitions.java
index f81192d6d9..f81192d6d9 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/Definitions.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/Definitions.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/Destination.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/Destination.java
index 47cb3633ef..47cb3633ef 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/Destination.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/Destination.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/DestinationType.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/DestinationType.java
index d8d5983d0f..d8d5983d0f 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/DestinationType.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/DestinationType.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/Headers.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/Headers.java
index d3bc110087..d3bc110087 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/Headers.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/Headers.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
index 84c638c845..84c638c845 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingFactory.java
index 2394cf5cdc..2394cf5cdc 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingFactory.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/OperationProperties.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/OperationProperties.java
index b67a6a414a..b67a6a414a 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/OperationProperties.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/OperationProperties.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/Property.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/Property.java
index efe45d4683..efe45d4683 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/Property.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/Property.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/PropertyList.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/PropertyList.java
index 323df239d4..323df239d4 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/PropertyList.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/PropertyList.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/ResourceAdapter.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/ResourceAdapter.java
index 633614198e..633614198e 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/ResourceAdapter.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/ResourceAdapter.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
index b3fc1d92e2..b3fc1d92e2 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
index 425fa6194e..425fa6194e 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java
index 60cd33d9bb..60cd33d9bb 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
index ac0a73c31d..ac0a73c31d 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
index c6e3b799f4..c6e3b799f4 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java
index 418a6467bd..418a6467bd 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
index b61ccaaaee..b61ccaaaee 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
index 7c5b677745..7c5b677745 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
index f6f34324f2..f6f34324f2 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
index f51b62b5ac..f51b62b5ac 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorImpl.java
index 0a0a4cde2b..0a0a4cde2b 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
index 21a6847840..21a6847840 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryActiveMQImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryActiveMQImpl.java
index 8d9a0ef210..8d9a0ef210 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryActiveMQImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryActiveMQImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ac37a0f26b..ac37a0f26b 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index dec0991984..dec0991984 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 490661dc91..490661dc91 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index abb29aec4c..abb29aec4c 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 192266e73a..192266e73a 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSTestCase.java
index 7427f3620b..7427f3620b 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSTestCase.java
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/test/resources/JMSBindingTest.composite b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/test/resources/JMSBindingTest.composite
index 81ae51c9cd..81ae51c9cd 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/test/resources/JMSBindingTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/test/resources/JMSBindingTest.composite
diff --git a/branches/sca-java-0.99/modules/binding-jms/src/test/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/test/resources/wsdl/helloworld.wsdl
index ea53e13692..ea53e13692 100644
--- a/branches/sca-java-0.99/modules/binding-jms/src/test/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jms/src/test/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-0.99/modules/binding-jsonrpc/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/binding-jsonrpc/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/binding-jsonrpc/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/binding-jsonrpc/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/LICENSE
diff --git a/branches/sca-java-0.99/modules/binding-jsonrpc/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/binding-jsonrpc/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/NOTICE
diff --git a/branches/sca-java-0.99/modules/binding-jsonrpc/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/pom.xml
index ed7b2b4301..ed7b2b4301 100644
--- a/branches/sca-java-0.99/modules/binding-jsonrpc/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/pom.xml
diff --git a/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
index 44c799f286..44c799f286 100644
--- a/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
diff --git a/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingActivator.java
index 84f09c8561..84f09c8561 100644
--- a/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingActivator.java
diff --git a/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCService.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCService.java
index 94bc6a5d6b..94bc6a5d6b 100644
--- a/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCService.java
diff --git a/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java
index b9eb71e259..b9eb71e259 100644
--- a/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java
diff --git a/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JavaToSmd.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JavaToSmd.java
index 196d973a76..196d973a76 100644
--- a/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JavaToSmd.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JavaToSmd.java
diff --git a/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java
index 7930a9b34c..7930a9b34c 100644
--- a/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java
diff --git a/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
index e35e70dacc..e35e70dacc 100644
--- a/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
diff --git a/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/jsonrpc.js b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/jsonrpc.js
index d837bab91c..d837bab91c 100644
--- a/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/jsonrpc.js
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/jsonrpc.js
diff --git a/branches/sca-java-0.99/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java
index 584228abde..584228abde 100644
--- a/branches/sca-java-0.99/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java
diff --git a/branches/sca-java-0.99/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java
index e63cafd6a6..e63cafd6a6 100644
--- a/branches/sca-java-0.99/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
index 1fa53a3817..1fa53a3817 100644
--- a/branches/sca-java-0.99/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
diff --git a/branches/sca-java-0.99/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite
index 491b42c69c..491b42c69c 100644
--- a/branches/sca-java-0.99/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite
diff --git a/branches/sca-java-0.99/modules/binding-notification/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/binding-notification/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/binding-notification/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-0.99/modules/binding-notification/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/LICENSE
diff --git a/branches/sca-java-0.99/modules/binding-notification/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/NOTICE
index eb1926d971..eb1926d971 100644
--- a/branches/sca-java-0.99/modules/binding-notification/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/NOTICE
diff --git a/branches/sca-java-0.99/modules/binding-notification/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/pom.xml
index 9bcd9b2eff..9bcd9b2eff 100644
--- a/branches/sca-java-0.99/modules/binding-notification/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/pom.xml
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java
index 8e6a78551a..8e6a78551a 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java
index 940a69784b..940a69784b 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java
index 31a8b26c02..31a8b26c02 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
index fa539b89ab..fa539b89ab 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
index a79441e288..a79441e288 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
index a4b48cf03a..a4b48cf03a 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
index 2a7892fd19..2a7892fd19 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java
index 8a6d57e825..8a6d57e825 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java
index 26bece5efa..26bece5efa 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
index f3784354c6..f3784354c6 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
index 3cea8b8d22..3cea8b8d22 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java
index 101d05f9cb..101d05f9cb 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
index 94689b4d10..94689b4d10 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java
index e99845d886..e99845d886 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java
index 6b3119d16e..6b3119d16e 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
index ca1fe39039..ca1fe39039 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java
index 3b2aacef4c..3b2aacef4c 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java
index 94357cd98d..94357cd98d 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
index c7bbadd0cd..c7bbadd0cd 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
index 0bc4cf70e8..0bc4cf70e8 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java
index 7c53d529a8..7c53d529a8 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
index a354f0ea79..a354f0ea79 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java
index a6a2b15a15..a6a2b15a15 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
index 352882a472..352882a472 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java
index 24395ee0a6..24395ee0a6 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
index 7ba94b3cff..7ba94b3cff 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java
index 5783d0de02..5783d0de02 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
index 7db017444f..7db017444f 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java
index 91ba05404a..91ba05404a 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
index 7cfc5fd9fa..7cfc5fd9fa 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java
index ca64c15305..ca64c15305 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java
index 1c678a2b96..1c678a2b96 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
index cda30fb184..cda30fb184 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
index 0e6596d656..0e6596d656 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
index 5b4488672e..5b4488672e 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java
index ee12161903..ee12161903 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java
index bf94da374c..bf94da374c 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java
index f5803e2432..f5803e2432 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java
index b91ce9b9ec..b91ce9b9ec 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java
index 8066184da9..8066184da9 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
index 27d88f80ff..27d88f80ff 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java
index b43ad5c214..b43ad5c214 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
index b1e78c5ded..b1e78c5ded 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java
index f2a36d89db..f2a36d89db 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
index 00b7546836..00b7546836 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java
index beba8fdc9b..beba8fdc9b 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
index 00ad42074e..00ad42074e 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java
index a9c901a431..a9c901a431 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java
index 864de25fd6..864de25fd6 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java
index b3f2c060fb..b3f2c060fb 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java
index 979a6e8e34..979a6e8e34 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java
index 902fd823cd..902fd823cd 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
index 82fdb4430d..82fdb4430d 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java
index 42f9e74a27..42f9e74a27 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
index 33020b5ab1..33020b5ab1 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java
index 92578af219..92578af219 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java
index 48c34ba74f..48c34ba74f 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
index c848b3cec7..c848b3cec7 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
index 23dbb3eb2a..23dbb3eb2a 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java
index 6f34fc0b7c..6f34fc0b7c 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
index 5c9ffa1499..5c9ffa1499 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java
index a47e1f4e55..a47e1f4e55 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
index 510c400069..510c400069 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java
index 60fb23be02..60fb23be02 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
index f304997b72..f304997b72 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java
index aa9180dcd7..aa9180dcd7 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
index 9760af6dd0..9760af6dd0 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java
index 49a4259333..49a4259333 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
index 6c2ef3437f..6c2ef3437f 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java
index 2ee9320f20..2ee9320f20 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
index de33400647..de33400647 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java
index 39050d158c..39050d158c 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
index 2e44f61809..2e44f61809 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java
index 047c5e9a58..047c5e9a58 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
index 5999ce7500..5999ce7500 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java
index 8145c6b170..8145c6b170 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
index 2c68d3ee4e..2c68d3ee4e 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java
index aca5c70641..aca5c70641 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
index e09c0c9e7d..e09c0c9e7d 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
index 40e0a8e47f..40e0a8e47f 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
index 5d05bb560c..5d05bb560c 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java
index 2a2b16d3b0..2a2b16d3b0 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 5e5ce97054..5e5ce97054 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java
index e46ecd0fa9..e46ecd0fa9 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java
diff --git a/branches/sca-java-0.99/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java
index e0d398f4d8..e0d398f4d8 100644
--- a/branches/sca-java-0.99/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java
diff --git a/branches/sca-java-0.99/modules/binding-osgi/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/binding-osgi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/binding-osgi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-osgi/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/binding-osgi/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-osgi/LICENSE
index 4b5ab74408..4b5ab74408 100644
--- a/branches/sca-java-0.99/modules/binding-osgi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-osgi/LICENSE
diff --git a/branches/sca-java-0.99/modules/binding-osgi/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-osgi/NOTICE
index 9a03eabdab..9a03eabdab 100644
--- a/branches/sca-java-0.99/modules/binding-osgi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-osgi/NOTICE
diff --git a/branches/sca-java-0.99/modules/binding-osgi/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-osgi/pom.xml
index 0decb4e98d..0decb4e98d 100644
--- a/branches/sca-java-0.99/modules/binding-osgi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-osgi/pom.xml
diff --git a/branches/sca-java-0.99/modules/binding-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.99/modules/binding-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 1021e0d536..1021e0d536 100644
--- a/branches/sca-java-0.99/modules/binding-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.99/modules/binding-rmi/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/.ruleset
index 3886f07f2d..3886f07f2d 100644
--- a/branches/sca-java-0.99/modules/binding-rmi/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/.ruleset
diff --git a/branches/sca-java-0.99/modules/binding-rmi/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/binding-rmi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/binding-rmi/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/binding-rmi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/LICENSE
diff --git a/branches/sca-java-0.99/modules/binding-rmi/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/binding-rmi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/NOTICE
diff --git a/branches/sca-java-0.99/modules/binding-rmi/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/pom.xml
index 9d4d237a0b..9d4d237a0b 100755
--- a/branches/sca-java-0.99/modules/binding-rmi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/pom.xml
diff --git a/branches/sca-java-0.99/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
index e9986e216c..e9986e216c 100644
--- a/branches/sca-java-0.99/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
diff --git a/branches/sca-java-0.99/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.java
index 066335fd57..066335fd57 100644
--- a/branches/sca-java-0.99/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.java
diff --git a/branches/sca-java-0.99/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java
index f9d8fd59fe..f9d8fd59fe 100644
--- a/branches/sca-java-0.99/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java
diff --git a/branches/sca-java-0.99/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java
index 2853946560..2853946560 100644
--- a/branches/sca-java-0.99/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java
diff --git a/branches/sca-java-0.99/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java
index 9a8a29049f..9a8a29049f 100644
--- a/branches/sca-java-0.99/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java
diff --git a/branches/sca-java-0.99/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
index 582f321be9..582f321be9 100644
--- a/branches/sca-java-0.99/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
diff --git a/branches/sca-java-0.99/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java
index acb81a00f6..acb81a00f6 100644
--- a/branches/sca-java-0.99/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java
index 73aedc3b6c..73aedc3b6c 100644
--- a/branches/sca-java-0.99/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java
index f636c8f7d8..f636c8f7d8 100644
--- a/branches/sca-java-0.99/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java
diff --git a/branches/sca-java-0.99/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java
index d5dc509f3e..d5dc509f3e 100644
--- a/branches/sca-java-0.99/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-0.99/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
index e626293c6e..e626293c6e 100644
--- a/branches/sca-java-0.99/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
diff --git a/branches/sca-java-0.99/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType
index 224a68f88d..224a68f88d 100644
--- a/branches/sca-java-0.99/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType
diff --git a/branches/sca-java-0.99/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType
index a83e7e6d1d..a83e7e6d1d 100644
--- a/branches/sca-java-0.99/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType
diff --git a/branches/sca-java-0.99/modules/binding-rmi/src/test/resources/RMIBindingTest.composite b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/test/resources/RMIBindingTest.composite
index aad99832d2..aad99832d2 100644
--- a/branches/sca-java-0.99/modules/binding-rmi/src/test/resources/RMIBindingTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-rmi/src/test/resources/RMIBindingTest.composite
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/LICENSE
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/NOTICE
index eb1926d971..eb1926d971 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/NOTICE
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/pom.xml
index bcb8b3ee4a..bcb8b3ee4a 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/pom.xml
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
index c1a39cfecb..c1a39cfecb 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
index 0ae598481c..0ae598481c 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
index 33db44fe3f..33db44fe3f 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
index eeb43cfd99..eeb43cfd99 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
index fd7b2cdb29..fd7b2cdb29 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 1b369cde06..1b369cde06 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
index dc52e1710d..dc52e1710d 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java
index fd72232dbd..fd72232dbd 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
index b43c127301..b43c127301 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
index 1814a2959c..1814a2959c 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
index a58a32dc4c..a58a32dc4c 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDistributedSCADomainImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDistributedSCADomainImpl.java
index 177fee62f8..177fee62f8 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDistributedSCADomainImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDistributedSCADomainImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestServiceDiscoveryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestServiceDiscoveryImpl.java
index 0aa3cd27a3..0aa3cd27a3 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestServiceDiscoveryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestServiceDiscoveryImpl.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
index 4db846cdf2..4db846cdf2 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
index d4d743648c..d4d743648c 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
index 0415368c20..0415368c20 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
index 23861bdf9f..23861bdf9f 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
index 157fcc5251..157fcc5251 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
index 46373ce90d..46373ce90d 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
index ef34c87fc0..ef34c87fc0 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
index ed76b45f67..ed76b45f67 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
index 7d07c4ff43..7d07c4ff43 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
index 0e1f07f3f2..0e1f07f3f2 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
index 804d1f1910..804d1f1910 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
index ad83358b39..ad83358b39 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
index fd3e3a1158..fd3e3a1158 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
index 3400e97447..3400e97447 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
index 20dd97b74a..20dd97b74a 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
index 5f8ccf9466..5f8ccf9466 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
index b25aebd9df..b25aebd9df 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
index eecadac929..eecadac929 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
index c9e2d122e0..c9e2d122e0 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
index d5d7773353..d5d7773353 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
index 485e0815d2..485e0815d2 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
index 9396dfd1f2..9396dfd1f2 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
index bf30bdf42d..bf30bdf42d 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
index 67c240592d..67c240592d 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
index eb0a386b2c..eb0a386b2c 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
index fadb164636..fadb164636 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
index e92c9ebd8e..e92c9ebd8e 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
diff --git a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/modules/binding-sca-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-xml/DISCLAIMER
index 8e5c524323..8e5c524323 100644
--- a/branches/sca-java-0.99/modules/binding-sca-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-xml/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/binding-sca-xml/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/binding-sca-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-xml/LICENSE
diff --git a/branches/sca-java-0.99/modules/binding-sca-xml/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-xml/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/binding-sca-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-xml/NOTICE
diff --git a/branches/sca-java-0.99/modules/binding-sca-xml/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-xml/pom.xml
index 6f970a7034..6f970a7034 100644
--- a/branches/sca-java-0.99/modules/binding-sca-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-xml/pom.xml
diff --git a/branches/sca-java-0.99/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
index 7f2e8dd6da..7f2e8dd6da 100644
--- a/branches/sca-java-0.99/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-0.99/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
index d0a65c3ecb..d0a65c3ecb 100644
--- a/branches/sca-java-0.99/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
diff --git a/branches/sca-java-0.99/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
index 99f5bb6799..99f5bb6799 100644
--- a/branches/sca-java-0.99/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
diff --git a/branches/sca-java-0.99/modules/binding-sca-xml/src/test/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-xml/src/test/resources/Calculator.composite
index 9028662d05..9028662d05 100644
--- a/branches/sca-java-0.99/modules/binding-sca-xml/src/test/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-xml/src/test/resources/Calculator.composite
diff --git a/branches/sca-java-0.99/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
index f02e7d6fc0..f02e7d6fc0 100644
--- a/branches/sca-java-0.99/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
diff --git a/branches/sca-java-0.99/modules/binding-sca/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/binding-sca/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/binding-sca/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/binding-sca/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/LICENSE
diff --git a/branches/sca-java-0.99/modules/binding-sca/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/binding-sca/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/NOTICE
diff --git a/branches/sca-java-0.99/modules/binding-sca/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/pom.xml
index 2ac44d6f26..2ac44d6f26 100644
--- a/branches/sca-java-0.99/modules/binding-sca/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/pom.xml
diff --git a/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
index be89a30193..be89a30193 100644
--- a/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
diff --git a/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
index e12fd82f97..e12fd82f97 100644
--- a/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingInvoker.java
index 8fb2497f81..8fb2497f81 100644
--- a/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingInvoker.java
diff --git a/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
index 3909c7ef4a..3909c7ef4a 100644
--- a/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
diff --git a/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
index 23e68340fc..23e68340fc 100644
--- a/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
diff --git a/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
index 3c33449fa4..3c33449fa4 100644
--- a/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
diff --git a/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
index f10da1005f..f10da1005f 100644
--- a/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
diff --git a/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
index 666c264e2e..666c264e2e 100644
--- a/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
index c2244690ca..c2244690ca 100644
--- a/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
index 4efa03a933..4efa03a933 100644
--- a/branches/sca-java-0.99/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
diff --git a/branches/sca-java-0.99/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 5c6b8e21fc..5c6b8e21fc 100644
--- a/branches/sca-java-0.99/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-0.99/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
index a69de52c92..a69de52c92 100644
--- a/branches/sca-java-0.99/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
diff --git a/branches/sca-java-0.99/modules/binding-sca/src/test/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/test/resources/Calculator.composite
index ec72c777ef..ec72c777ef 100644
--- a/branches/sca-java-0.99/modules/binding-sca/src/test/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-sca/src/test/resources/Calculator.composite
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/LICENSE
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/NOTICE
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/pom.xml
index 3fee49d566..3fee49d566 100755
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/pom.xml
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/assembly/axis2.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/assembly/axis2.xml
index 2b46940ab8..2b46940ab8 100644
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/assembly/axis2.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/assembly/axis2.xml
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
index 87ba29636f..87ba29636f 100644
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
index 610c376bc9..610c376bc9 100644
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
index 85826b27b3..85826b27b3 100644
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
index 50eaff31e4..50eaff31e4 100644
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
index 3be64d5004..3be64d5004 100644
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
index 89d0a4979d..89d0a4979d 100644
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
index 2104e7146a..2104e7146a 100644
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
index d41fee53d8..d41fee53d8 100644
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
index 5a867464aa..5a867464aa 100644
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
index 08cf492680..08cf492680 100644
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Java2WSDLHelper.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Java2WSDLHelper.java
index bdf4a64d19..bdf4a64d19 100644
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Java2WSDLHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Java2WSDLHelper.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
index 06301c8be0..06301c8be0 100755
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
index c761c7481e..c761c7481e 100644
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
index 000c04fbf8..000c04fbf8 100644
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index a48ff54c77..a48ff54c77 100644
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
index f646a4267a..f646a4267a 100755
--- a/branches/sca-java-0.99/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-0.99/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
index 2ce23bf2c4..2ce23bf2c4 100755
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
index d4d20414e5..d4d20414e5 100755
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java
index 767f59646f..767f59646f 100755
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
index e5e76af0b7..e5e76af0b7 100644
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Java2WSDLHelperTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Java2WSDLHelperTestCase.java
index 3cad9cd379..3cad9cd379 100644
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Java2WSDLHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Java2WSDLHelperTestCase.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java
index 69bb571144..69bb571144 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
index 8e17b89f33..8e17b89f33 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCaseFIXME.java
index 3752464cca..3752464cca 100644
--- a/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCaseFIXME.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
index 6146dc858a..6146dc858a 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
index 3ff98f9a51..3ff98f9a51 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
index 25815d8019..25815d8019 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
index 42b99e3a99..42b99e3a99 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
index 14ebfc837d..14ebfc837d 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
index 79285a5324..79285a5324 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/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-0.99/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-0.99/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-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
index 48ce948354..48ce948354 100644
--- a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/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-0.99/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-0.99/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-0.99/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-0.99/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-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
index fcb8443f60..fcb8443f60 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
diff --git a/branches/sca-java-0.99/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-0.99/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
index 06900866b5..06900866b5 100644
--- a/branches/sca-java-0.99/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-0.99/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
diff --git a/branches/sca-java-0.99/modules/binding-ws-xml/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.99/modules/binding-ws-xml/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/.checkstyle
diff --git a/branches/sca-java-0.99/modules/binding-ws-xml/.pmd b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.99/modules/binding-ws-xml/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/.pmd
diff --git a/branches/sca-java-0.99/modules/binding-ws-xml/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.99/modules/binding-ws-xml/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/.ruleset
diff --git a/branches/sca-java-0.99/modules/binding-ws-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/binding-ws-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/binding-ws-xml/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/binding-ws-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/LICENSE
diff --git a/branches/sca-java-0.99/modules/binding-ws-xml/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/binding-ws-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/NOTICE
diff --git a/branches/sca-java-0.99/modules/binding-ws-xml/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/pom.xml
index 5cb62e9994..5cb62e9994 100644
--- a/branches/sca-java-0.99/modules/binding-ws-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/pom.xml
diff --git a/branches/sca-java-0.99/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
index 1c3be41a46..1c3be41a46 100644
--- a/branches/sca-java-0.99/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
index d1e4ba3205..d1e4ba3205 100644
--- a/branches/sca-java-0.99/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-0.99/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
index d72186859d..d72186859d 100644
--- a/branches/sca-java-0.99/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
index 42dedc5455..42dedc5455 100644
--- a/branches/sca-java-0.99/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
diff --git a/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
index 896a901862..896a901862 100644
--- a/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
diff --git a/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
index e575c02d7d..e575c02d7d 100644
--- a/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
index 5e8e5dad0d..5e8e5dad0d 100644
--- a/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
diff --git a/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
diff --git a/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
index 39cd5547d9..39cd5547d9 100644
--- a/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
diff --git a/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
index 8e26f7b4b5..8e26f7b4b5 100644
--- a/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
diff --git a/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
index c2210f4a94..c2210f4a94 100644
--- a/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
diff --git a/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
index 529b395fd5..529b395fd5 100644
--- a/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
diff --git a/branches/sca-java-0.99/modules/binding-ws/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.99/modules/binding-ws/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/.checkstyle
diff --git a/branches/sca-java-0.99/modules/binding-ws/.pmd b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.99/modules/binding-ws/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/.pmd
diff --git a/branches/sca-java-0.99/modules/binding-ws/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.99/modules/binding-ws/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/.ruleset
diff --git a/branches/sca-java-0.99/modules/binding-ws/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/binding-ws/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/binding-ws/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/binding-ws/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/LICENSE
diff --git a/branches/sca-java-0.99/modules/binding-ws/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/binding-ws/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/NOTICE
diff --git a/branches/sca-java-0.99/modules/binding-ws/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/pom.xml
index 4959fefbad..4959fefbad 100644
--- a/branches/sca-java-0.99/modules/binding-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/pom.xml
diff --git a/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
index 04f8ab0d3c..04f8ab0d3c 100644
--- a/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
diff --git a/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
index 3a534e3baa..3a534e3baa 100644
--- a/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
diff --git a/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
index 1ad38c69e4..1ad38c69e4 100644
--- a/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
diff --git a/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
index a13584a3c2..a13584a3c2 100644
--- a/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
diff --git a/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
index 8902dd04ee..8902dd04ee 100644
--- a/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
diff --git a/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
index fd79f6a9ef..fd79f6a9ef 100644
--- a/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/.checkstyle
index ace5fe6f53..ace5fe6f53 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/.checkstyle
diff --git a/branches/sca-java-0.99/modules/contribution-impl/.pmd b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/.pmd
index 84af2f4d5d..84af2f4d5d 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/.pmd
diff --git a/branches/sca-java-0.99/modules/contribution-impl/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/.ruleset
index ac8671859d..ac8671859d 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/.ruleset
diff --git a/branches/sca-java-0.99/modules/contribution-impl/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/contribution-impl/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/LICENSE
diff --git a/branches/sca-java-0.99/modules/contribution-impl/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/NOTICE
diff --git a/branches/sca-java-0.99/modules/contribution-impl/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/pom.xml
index 26619c94cc..26619c94cc 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/pom.xml
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
index f7600e5a83..f7600e5a83 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
index 1ef7a98f9e..1ef7a98f9e 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
index 1e4688584b..1e4688584b 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/DeployedArtifactImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/DeployedArtifactImpl.java
index f3a688140c..f3a688140c 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/DeployedArtifactImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/DeployedArtifactImpl.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
index 03abd92123..03abd92123 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionException.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionException.java
index 6dbab56553..6dbab56553 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionException.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionURIException.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionURIException.java
index 8022834438..8022834438 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionURIException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionURIException.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
index fb7dbb89a4..fb7dbb89a4 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ModelResolverImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ModelResolverImpl.java
index 6c2257803a..6c2257803a 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ModelResolverImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ModelResolverImpl.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ArtifactTypeDescriberImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ArtifactTypeDescriberImpl.java
index 76318c6021..76318c6021 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ArtifactTypeDescriberImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ArtifactTypeDescriberImpl.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataDocumentProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataDocumentProcessor.java
index 2885d7c3d7..2885d7c3d7 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataDocumentProcessor.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataProcessor.java
index e4cc2c552f..e4cc2c552f 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataProcessor.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
index 51276d5f56..51276d5f56 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
index 4a1487e62a..4a1487e62a 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionMetadataException.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionMetadataException.java
index a1250dc777..a1250dc777 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionMetadataException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionMetadataException.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionURIException.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionURIException.java
index 80be4c3f00..80be4c3f00 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionURIException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionURIException.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
index 165c9d0616..165c9d0616 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/ConcurrentHashList.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/ConcurrentHashList.java
index 1eee0a2c42..1eee0a2c42 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/ConcurrentHashList.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/ConcurrentHashList.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
index bc63dca4a8..bc63dca4a8 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
index c8cc056b8f..c8cc056b8f 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
index e935f6eb63..e935f6eb63 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
index b644709266..b644709266 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
index 7daf302487..7daf302487 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
index 6ed735292f..6ed735292f 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
index d3dd49ca5f..d3dd49ca5f 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java
index 510febf07a..510febf07a 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleArtifactResolverTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleArtifactResolverTestCase.java
index c76c859a25..c76c859a25 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleArtifactResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleArtifactResolverTestCase.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
index d0db01fc09..d0db01fc09 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContentTypeDescriberImplTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContentTypeDescriberImplTestCase.java
index e5e84afe7d..e5e84afe7d 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContentTypeDescriberImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContentTypeDescriberImplTestCase.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataDocumentProcessorTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataDocumentProcessorTestCaseFIXME.java
index 0ebee35df7..0ebee35df7 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataDocumentProcessorTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataDocumentProcessorTestCaseFIXME.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
index 8a476a86bc..8a476a86bc 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
index 13d3e45d66..13d3e45d66 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
index 9c46c679d2..9c46c679d2 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/test/resources/test.composite b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/resources/test.composite
index 1e09549194..1e09549194 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/test/resources/test.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/resources/test.composite
diff --git a/branches/sca-java-0.99/modules/contribution-impl/src/test/resources/test.ext b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/resources/test.ext
index e69de29bb2..e69de29bb2 100644
--- a/branches/sca-java-0.99/modules/contribution-impl/src/test/resources/test.ext
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-impl/src/test/resources/test.ext
diff --git a/branches/sca-java-0.99/modules/contribution-java/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/.checkstyle
index ace5fe6f53..ace5fe6f53 100644
--- a/branches/sca-java-0.99/modules/contribution-java/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/.checkstyle
diff --git a/branches/sca-java-0.99/modules/contribution-java/.pmd b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/.pmd
index 84af2f4d5d..84af2f4d5d 100644
--- a/branches/sca-java-0.99/modules/contribution-java/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/.pmd
diff --git a/branches/sca-java-0.99/modules/contribution-java/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/.ruleset
index ac8671859d..ac8671859d 100644
--- a/branches/sca-java-0.99/modules/contribution-java/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/.ruleset
diff --git a/branches/sca-java-0.99/modules/contribution-java/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/pom.xml
index df03e75d49..df03e75d49 100644
--- a/branches/sca-java-0.99/modules/contribution-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/pom.xml
diff --git a/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
index 41e93ec148..41e93ec148 100644
--- a/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
diff --git a/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
index d3568f6283..d3568f6283 100644
--- a/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
diff --git a/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
index af2ca9cd57..af2ca9cd57 100644
--- a/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
diff --git a/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
index 0dc8251dc5..0dc8251dc5 100644
--- a/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
diff --git a/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
index 3139dbcaec..3139dbcaec 100644
--- a/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
diff --git a/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
index dc44d0d5f1..dc44d0d5f1 100644
--- a/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
diff --git a/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
index e5dc397f4e..e5dc397f4e 100644
--- a/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
diff --git a/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
index 8f12bf994c..8f12bf994c 100644
--- a/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
diff --git a/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
index d461574b2b..d461574b2b 100644
--- a/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
diff --git a/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
index 42a8c6d14d..42a8c6d14d 100644
--- a/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
diff --git a/branches/sca-java-0.99/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
index a293330a57..a293330a57 100644
--- a/branches/sca-java-0.99/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
diff --git a/branches/sca-java-0.99/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ac1fa9aade..ac1fa9aade 100644
--- a/branches/sca-java-0.99/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-0.99/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index c69eb40636..c69eb40636 100644
--- a/branches/sca-java-0.99/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-0.99/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
index 7debb3d3c6..7debb3d3c6 100644
--- a/branches/sca-java-0.99/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
diff --git a/branches/sca-java-0.99/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
index f0e74b363a..f0e74b363a 100644
--- a/branches/sca-java-0.99/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
diff --git a/branches/sca-java-0.99/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
index 81c7ee525a..81c7ee525a 100644
--- a/branches/sca-java-0.99/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
index 7f342c2278..7f342c2278 100644
--- a/branches/sca-java-0.99/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/contribution-namespace/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/.checkstyle
index ace5fe6f53..ace5fe6f53 100644
--- a/branches/sca-java-0.99/modules/contribution-namespace/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/.checkstyle
diff --git a/branches/sca-java-0.99/modules/contribution-namespace/.pmd b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/.pmd
index 84af2f4d5d..84af2f4d5d 100644
--- a/branches/sca-java-0.99/modules/contribution-namespace/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/.pmd
diff --git a/branches/sca-java-0.99/modules/contribution-namespace/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/.ruleset
index ac8671859d..ac8671859d 100644
--- a/branches/sca-java-0.99/modules/contribution-namespace/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/.ruleset
diff --git a/branches/sca-java-0.99/modules/contribution-namespace/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/pom.xml
index e705424d1e..e705424d1e 100644
--- a/branches/sca-java-0.99/modules/contribution-namespace/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/pom.xml
diff --git a/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
index c68aee8521..c68aee8521 100644
--- a/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
diff --git a/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
index 8af36d7da0..8af36d7da0 100644
--- a/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
diff --git a/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
index cfbac8bb1f..cfbac8bb1f 100644
--- a/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
diff --git a/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
index 080a6bab2b..080a6bab2b 100644
--- a/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
diff --git a/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
index ece5240801..ece5240801 100644
--- a/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
diff --git a/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
index 1146e593a9..1146e593a9 100644
--- a/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
diff --git a/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java
index f235f9f9f1..f235f9f9f1 100644
--- a/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java
diff --git a/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
index 468b18fc05..468b18fc05 100644
--- a/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
diff --git a/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
index 67c3d4b784..67c3d4b784 100644
--- a/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
diff --git a/branches/sca-java-0.99/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
index 095866fb6f..095866fb6f 100644
--- a/branches/sca-java-0.99/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
diff --git a/branches/sca-java-0.99/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 86f199368b..86f199368b 100644
--- a/branches/sca-java-0.99/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-0.99/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index c69eb40636..c69eb40636 100644
--- a/branches/sca-java-0.99/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-0.99/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
index cdf16a383f..cdf16a383f 100644
--- a/branches/sca-java-0.99/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
diff --git a/branches/sca-java-0.99/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
index 75219227c2..75219227c2 100644
--- a/branches/sca-java-0.99/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
index 9a05e43d7a..9a05e43d7a 100644
--- a/branches/sca-java-0.99/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/contribution/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.99/modules/contribution/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/.checkstyle
diff --git a/branches/sca-java-0.99/modules/contribution/.pmd b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/.pmd
index 84af2f4d5d..84af2f4d5d 100644
--- a/branches/sca-java-0.99/modules/contribution/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/.pmd
diff --git a/branches/sca-java-0.99/modules/contribution/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/.ruleset
index ac8671859d..ac8671859d 100644
--- a/branches/sca-java-0.99/modules/contribution/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/.ruleset
diff --git a/branches/sca-java-0.99/modules/contribution/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/contribution/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/contribution/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/contribution/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/LICENSE
diff --git a/branches/sca-java-0.99/modules/contribution/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/contribution/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/NOTICE
diff --git a/branches/sca-java-0.99/modules/contribution/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/pom.xml
index 8c02e8dcf6..8c02e8dcf6 100644
--- a/branches/sca-java-0.99/modules/contribution/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/pom.xml
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
index 1b4a61234b..1b4a61234b 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
index 51e5b586be..51e5b586be 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
index e31805bf9a..e31805bf9a 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
index e21ae3999b..e21ae3999b 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
index fd35facbe3..fd35facbe3 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
index 4b0fb1cc08..4b0fb1cc08 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
index bfa16b1ce3..bfa16b1ce3 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
index 4a4b63805b..4a4b63805b 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
index 0ada4ebec3..0ada4ebec3 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
index 014c187733..014c187733 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
index 029df61f0f..029df61f0f 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessor.java
index 3aa8195d34..3aa8195d34 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessor.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessorExtensionPoint.java
index 736f98c53d..736f98c53d 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
index 1c2faf9503..1c2faf9503 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultContributionPostProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultContributionPostProcessorExtensionPoint.java
index 79a6b50d95..79a6b50d95 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultContributionPostProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultContributionPostProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
index 5a794498d9..5a794498d9 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
index 9ebf49554c..9ebf49554c 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
index acc611c101..acc611c101 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleContributionPostProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleContributionPostProcessor.java
index e8046e965c..e8046e965c 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleContributionPostProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleContributionPostProcessor.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
index ac8fd6f272..ac8fd6f272 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
index 40575960f4..40575960f4 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
index 6e21238ca7..6e21238ca7 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
index 28b268301f..28b268301f 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
index 27499b5847..27499b5847 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
index 89c063a65e..89c063a65e 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
index 9a6388119e..9a6388119e 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
index ca95036912..ca95036912 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
index 95213f9dd1..95213f9dd1 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
index 6715341ca9..6715341ca9 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
index fcd94d0bb2..fcd94d0bb2 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
index 95399a06b7..95399a06b7 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
index bde0f24341..bde0f24341 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
index 47670e55e5..47670e55e5 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
index 850f79fdea..850f79fdea 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
index 0b14b7f3c3..0b14b7f3c3 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/AbstractContributionException.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/AbstractContributionException.java
index e5b18b4738..e5b18b4738 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/AbstractContributionException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/AbstractContributionException.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
index b76aba2c95..b76aba2c95 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
index 5158eaf85c..5158eaf85c 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
index ce2b4b13c3..ce2b4b13c3 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionMetadataDocumentProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionMetadataDocumentProcessor.java
index 75267195fa..75267195fa 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionMetadataDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionMetadataDocumentProcessor.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
index 33399dcc2f..33399dcc2f 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
index 838359be5f..838359be5f 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
index ecb774ac0c..ecb774ac0c 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
index 4bf29a3993..4bf29a3993 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
index d82f89b79e..d82f89b79e 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWireException.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWireException.java
index f67b2a1e51..f67b2a1e51 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWireException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWireException.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
index 8bfdedf180..8bfdedf180 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
index e660af7dd2..e660af7dd2 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
index 0b9aca70cf..0b9aca70cf 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/InvalidConfigurationException.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/InvalidConfigurationException.java
index 535f1549f6..535f1549f6 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/InvalidConfigurationException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/InvalidConfigurationException.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
index b0e02f06fa..b0e02f06fa 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
index 5079db4904..5079db4904 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
index 764fe251f2..764fe251f2 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/util/ServiceConfigurationUtil.java b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/util/ServiceConfigurationUtil.java
index 88d960994c..88d960994c 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/util/ServiceConfigurationUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/util/ServiceConfigurationUtil.java
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
index 6b4d2ebdeb..6b4d2ebdeb 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
index 9e6433ba6c..9e6433ba6c 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
index 7609eda0d1..7609eda0d1 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
index 8ea5fc0a7e..8ea5fc0a7e 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
index 9d78ca93d0..9d78ca93d0 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
index 4bb65e55e7..4bb65e55e7 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
diff --git a/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
index 6e61bebf79..6e61bebf79 100644
--- a/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
diff --git a/branches/sca-java-0.99/modules/core-databinding/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/.checkstyle
index c7b30ffd5e..c7b30ffd5e 100644
--- a/branches/sca-java-0.99/modules/core-databinding/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/.checkstyle
diff --git a/branches/sca-java-0.99/modules/core-databinding/.pmd b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.99/modules/core-databinding/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/.pmd
diff --git a/branches/sca-java-0.99/modules/core-databinding/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.99/modules/core-databinding/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/.ruleset
diff --git a/branches/sca-java-0.99/modules/core-databinding/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/core-databinding/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/core-databinding/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/core-databinding/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/LICENSE
diff --git a/branches/sca-java-0.99/modules/core-databinding/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/core-databinding/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/NOTICE
diff --git a/branches/sca-java-0.99/modules/core-databinding/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/pom.xml
index 68bc876c36..68bc876c36 100644
--- a/branches/sca-java-0.99/modules/core-databinding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/pom.xml
diff --git a/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
index 60eaf6ea27..60eaf6ea27 100644
--- a/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
diff --git a/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
index dc5fa34d2d..dc5fa34d2d 100644
--- a/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
diff --git a/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
index cd71869154..cd71869154 100644
--- a/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
diff --git a/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
index affc2aecda..affc2aecda 100644
--- a/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
diff --git a/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
index 4559b98dd3..4559b98dd3 100644
--- a/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
diff --git a/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
index fb2a8f5279..fb2a8f5279 100644
--- a/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
diff --git a/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInteceptor.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInteceptor.java
index fc8309aa88..fc8309aa88 100644
--- a/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInteceptor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInteceptor.java
diff --git a/branches/sca-java-0.99/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index baba638c9b..baba638c9b 100644
--- a/branches/sca-java-0.99/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.99/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
index c5ab064716..c5ab064716 100644
--- a/branches/sca-java-0.99/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCase.java.fixme b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCase.java.fixme
index ecae54188c..ecae54188c 100644
--- a/branches/sca-java-0.99/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCase.java.fixme
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCase.java.fixme
diff --git a/branches/sca-java-0.99/modules/core-spi/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/.checkstyle
index 3e57539570..3e57539570 100644
--- a/branches/sca-java-0.99/modules/core-spi/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/.checkstyle
diff --git a/branches/sca-java-0.99/modules/core-spi/.pmd b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/.pmd
index 4abfdec2b5..4abfdec2b5 100644
--- a/branches/sca-java-0.99/modules/core-spi/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/.pmd
diff --git a/branches/sca-java-0.99/modules/core-spi/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/.ruleset
index 3886f07f2d..3886f07f2d 100644
--- a/branches/sca-java-0.99/modules/core-spi/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/.ruleset
diff --git a/branches/sca-java-0.99/modules/core-spi/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/core-spi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/core-spi/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/core-spi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/LICENSE
diff --git a/branches/sca-java-0.99/modules/core-spi/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/core-spi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/NOTICE
diff --git a/branches/sca-java-0.99/modules/core-spi/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/pom.xml
index 620f7a3c8f..620f7a3c8f 100644
--- a/branches/sca-java-0.99/modules/core-spi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/pom.xml
diff --git a/branches/sca-java-0.99/modules/core-spi/src/doc/Context Model.emx b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/doc/Context Model.emx
index 0445ea5a6b..0445ea5a6b 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/doc/Context Model.emx
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/doc/Context Model.emx
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
index ed4b57639c..ed4b57639c 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
index c97ba6ae71..c97ba6ae71 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
index 50958b7848..50958b7848 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
index 546757c766..546757c766 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
index aafa23b7f5..aafa23b7f5 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultModelFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultModelFactoryExtensionPoint.java
index 724c129419..724c129419 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultModelFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultModelFactoryExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
index 9609487080..9609487080 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModelFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModelFactoryExtensionPoint.java
index 143a5e53dd..143a5e53dd 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModelFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModelFactoryExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
index 78cb4d14d6..78cb4d14d6 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
index 6a0c44a404..6a0c44a404 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
index c116be921c..c116be921c 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
index b0debc36c4..b0debc36c4 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
index b34dceee62..b34dceee62 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
index ca0f4889a5..ca0f4889a5 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
index a5f221fc11..a5f221fc11 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
index dcb9dba73a..dcb9dba73a 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
index 2748bbed9a..2748bbed9a 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
index e7616ff286..e7616ff286 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
index c2a9c488b8..c2a9c488b8 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
index 3626e16425..3626e16425 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
index 0f6a932c51..0f6a932c51 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
index 2452e3cf1a..2452e3cf1a 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
index a680277b99..a680277b99 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
index 6a37d1e951..6a37d1e951 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
index 2102806881..2102806881 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
index 5e781dd5b3..5e781dd5b3 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
index 4da4108168..4da4108168 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider2.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider2.java
index 39c1da78a0..39c1da78a0 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider2.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider2.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
index d2646d8d00..d2646d8d00 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider2.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider2.java
index 6302d4319e..6302d4319e 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider2.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider2.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
index 851afee3c1..851afee3c1 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
index 95e5b0c3ac..95e5b0c3ac 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
index 1f1c6ba31b..1f1c6ba31b 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
index 33bd44fd56..33bd44fd56 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
index da411bebdf..da411bebdf 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
index ebcdf302f1..ebcdf302f1 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
index ac7dc8fdc2..ac7dc8fdc2 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
index fbb7aae467..fbb7aae467 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
index 4b2c71b397..4b2c71b397 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
index 3cf82982dc..3cf82982dc 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
index 9d965a3369..9d965a3369 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
index b15cde066a..b15cde066a 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
index 647eba33aa..647eba33aa 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
index 5c1a3ca79d..5c1a3ca79d 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
index 66bbae684d..66bbae684d 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
index 3a563b9fb5..3a563b9fb5 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
index ad55ce386b..ad55ce386b 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
index 5701a04ed1..5701a04ed1 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
index f4e97f71ec..f4e97f71ec 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
index d1f4496337..d1f4496337 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
index e9de1f135f..e9de1f135f 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
index 95591dca5d..95591dca5d 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
diff --git a/branches/sca-java-0.99/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
index 56e99be0f2..56e99be0f2 100644
--- a/branches/sca-java-0.99/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
diff --git a/branches/sca-java-0.99/modules/core-spring/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/core-spring/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/core-spring/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/core-spring/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/LICENSE
diff --git a/branches/sca-java-0.99/modules/core-spring/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/core-spring/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/NOTICE
diff --git a/branches/sca-java-0.99/modules/core-spring/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/pom.xml
index 37657f5cd9..37657f5cd9 100644
--- a/branches/sca-java-0.99/modules/core-spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/pom.xml
diff --git a/branches/sca-java-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
index ffe6e530dd..ffe6e530dd 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
diff --git a/branches/sca-java-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
index de8898c5ef..de8898c5ef 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
diff --git a/branches/sca-java-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
index be91c07d50..be91c07d50 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
diff --git a/branches/sca-java-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
index ba2d5045f2..ba2d5045f2 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
diff --git a/branches/sca-java-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
index 8997cc2d0a..8997cc2d0a 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
index fef6fa5863..fef6fa5863 100644
--- a/branches/sca-java-0.99/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-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
index 7b24c76711..7b24c76711 100644
--- a/branches/sca-java-0.99/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-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
diff --git a/branches/sca-java-0.99/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-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
index 5f90ddf454..5f90ddf454 100644
--- a/branches/sca-java-0.99/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-0.99/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
diff --git a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/AddService.java
index 4eeb30a9c2..4eeb30a9c2 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
index ea3e5341d5..ea3e5341d5 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/CalculatorClient.java
index 56e737e3ab..56e737e3ab 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
index 11e8974657..11e8974657 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/DivideService.java
index 131c5a8014..131c5a8014 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
index 9c7e96a668..9c7e96a668 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/MultiplyService.java
index a917896aeb..a917896aeb 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
index 4892481203..4892481203 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
index 27430b7f5d..27430b7f5d 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
diff --git a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/SubtractService.java
index e328f024ea..e328f024ea 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
index ee1d7c3457..ee1d7c3457 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
index 6e81358b03..6e81358b03 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
diff --git a/branches/sca-java-0.99/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCase.java
index 3059c7c701..3059c7c701 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCase.java
diff --git a/branches/sca-java-0.99/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
index 6d998ba035..6d998ba035 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
diff --git a/branches/sca-java-0.99/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
index 8b043f2b4f..8b043f2b4f 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
diff --git a/branches/sca-java-0.99/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
index d7d1124050..d7d1124050 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
diff --git a/branches/sca-java-0.99/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
index c2b6cced36..c2b6cced36 100644
--- a/branches/sca-java-0.99/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
diff --git a/branches/sca-java-0.99/modules/core/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/core/.checkstyle
index 3e57539570..3e57539570 100644
--- a/branches/sca-java-0.99/modules/core/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/.checkstyle
diff --git a/branches/sca-java-0.99/modules/core/.pmd b/sca-java-1.x/branches/sca-java-0.99/modules/core/.pmd
index ffc4fe2bbb..ffc4fe2bbb 100644
--- a/branches/sca-java-0.99/modules/core/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/.pmd
diff --git a/branches/sca-java-0.99/modules/core/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/core/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.99/modules/core/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/.ruleset
diff --git a/branches/sca-java-0.99/modules/core/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/core/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/core/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/core/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/core/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/LICENSE
diff --git a/branches/sca-java-0.99/modules/core/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/core/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/core/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/NOTICE
diff --git a/branches/sca-java-0.99/modules/core/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/core/pom.xml
index 701bf4081c..701bf4081c 100644
--- a/branches/sca-java-0.99/modules/core/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/pom.xml
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
index c86c876075..c86c876075 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
index e8d5474b83..e8d5474b83 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
index 80d2f7fb9a..80d2f7fb9a 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
index da825dc37a..da825dc37a 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
index ee52c27d14..ee52c27d14 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
index cde9cbb18c..cde9cbb18c 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
index 5ad339b76d..5ad339b76d 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
index d86e810096..d86e810096 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
index 9a8635ddb0..9a8635ddb0 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
index 95691c22d0..95691c22d0 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
index e6679b7ce4..e6679b7ce4 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
index f020ede4c9..f020ede4c9 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ConversationImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ConversationImpl.java
index 8e7d979daf..8e7d979daf 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ConversationImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ConversationImpl.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
index c5b68389b2..c5b68389b2 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
index b577180291..b577180291 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
index 6810f44d08..6810f44d08 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
index 86d9e09642..86d9e09642 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
index 517e5579a4..517e5579a4 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
index 8e90c953e5..8e90c953e5 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
index d879182e14..d879182e14 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
index cd14710880..cd14710880 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
index a4cc49204e..a4cc49204e 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
index 4c3fd8b397..4c3fd8b397 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
index 67b922b99c..67b922b99c 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
index 8b5c512cf2..8b5c512cf2 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
index 974563b57c..974563b57c 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
index d35b27fd24..d35b27fd24 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
index 3f64d2405b..3f64d2405b 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
index f53551962b..f53551962b 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
index 219dc55536..219dc55536 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
index b6cd2dcc9f..b6cd2dcc9f 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
index 4fad747b3f..4fad747b3f 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
index b40574394b..b40574394b 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
index 934f2f7aa0..934f2f7aa0 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
index 72ce0f87fb..72ce0f87fb 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
index 9c6432682e..9c6432682e 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
index 99a769f256..99a769f256 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
index 9766286b56..9766286b56 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
index 6e182a6a14..6e182a6a14 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
index 379973af0d..379973af0d 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
index 733544d387..733544d387 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
index fcf708c00a..fcf708c00a 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
index c0646f577a..c0646f577a 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
index b72730397e..b72730397e 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
index fdd710c465..fdd710c465 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
index 2c4d657882..2c4d657882 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvokerCreationException.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvokerCreationException.java
index 354c3c34d9..354c3c34d9 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvokerCreationException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvokerCreationException.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
index f37e8182fa..f37e8182fa 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
index 0a40d49b36..0a40d49b36 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
index c39b39d491..c39b39d491 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
index 80c27aca1b..80c27aca1b 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
index 786988613b..786988613b 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
index 26f4544d14..26f4544d14 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
index a6663aba09..a6663aba09 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
index 5ae8b94647..5ae8b94647 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
index 49f89661b1..49f89661b1 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
index f11a61e662..f11a61e662 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
index 1cfb6b06a4..1cfb6b06a4 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
index 0a20d793f7..0a20d793f7 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
index cd0deb4900..cd0deb4900 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
index b19c14b3e0..b19c14b3e0 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
index 43a3288ff2..43a3288ff2 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
index 75261e11a8..75261e11a8 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
index 85a6626cdd..85a6626cdd 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
index c27b112f8a..c27b112f8a 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
index a2c0edb9b4..a2c0edb9b4 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
index 0471b2c52e..0471b2c52e 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
index 0f83dad97d..0f83dad97d 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
index 15959c0608..15959c0608 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
index 6e51a8c9ec..6e51a8c9ec 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
index ea8d0e876c..ea8d0e876c 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
index 5b838116c5..5b838116c5 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
index 6fe883157f..6fe883157f 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
index 1abe040c14..1abe040c14 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
index 60696692e1..60696692e1 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
index 62ebeea1fb..62ebeea1fb 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
diff --git a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
index 39a7c647f7..39a7c647f7 100644
--- a/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
diff --git a/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
index 7b44736d4b..7b44736d4b 100644
--- a/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
diff --git a/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
index 2bc78c3d35..2bc78c3d35 100644
--- a/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
diff --git a/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
index 48dcf8df07..48dcf8df07 100644
--- a/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
diff --git a/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
index 64114f7fb2..64114f7fb2 100644
--- a/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
diff --git a/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
index d46d77b4b8..d46d77b4b8 100644
--- a/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
diff --git a/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
index 58503fd852..58503fd852 100644
--- a/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
diff --git a/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
index 83f7bdd887..83f7bdd887 100644
--- a/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
diff --git a/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
index c5f93edeb6..c5f93edeb6 100644
--- a/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
diff --git a/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
index 341d889b7d..341d889b7d 100644
--- a/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/.ruleset
index 27b9ab847c..27b9ab847c 100644
--- a/branches/sca-java-0.99/modules/databinding-axiom/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/.ruleset
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/databinding-axiom/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/databinding-axiom/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/LICENSE
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/databinding-axiom/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/NOTICE
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/pom.xml
index 64f06c8287..64f06c8287 100755
--- a/branches/sca-java-0.99/modules/databinding-axiom/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/pom.xml
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
index dd90b079d0..dd90b079d0 100644
--- a/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandler.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandler.java
index fccf6c530d..fccf6c530d 100644
--- a/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandler.java
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
index 27e58412bb..27e58412bb 100644
--- a/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
index e3ff86d8cf..e3ff86d8cf 100644
--- a/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
index f5c657e29d..f5c657e29d 100755
--- a/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
index c1c94a1828..c1c94a1828 100755
--- a/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
index 44e2802b0c..44e2802b0c 100644
--- a/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
index f7ccb13e6e..f7ccb13e6e 100644
--- a/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
index 224c956fcb..224c956fcb 100755
--- a/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
index 0b3bc7a414..0b3bc7a414 100755
--- a/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 2e94116177..2e94116177 100644
--- a/branches/sca-java-0.99/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 78f1a80c37..78f1a80c37 100644
--- a/branches/sca-java-0.99/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandlerTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandlerTestCase.java
index d553772d7e..d553772d7e 100644
--- a/branches/sca-java-0.99/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandlerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandlerTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
index 661fb72905..661fb72905 100755
--- a/branches/sca-java-0.99/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/src/test/resources/ipo.xml b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/test/resources/ipo.xml
index df901d183d..df901d183d 100755
--- a/branches/sca-java-0.99/modules/databinding-axiom/src/test/resources/ipo.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/test/resources/ipo.xml
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/test/resources/ipo.xsd
index af1e73172d..af1e73172d 100755
--- a/branches/sca-java-0.99/modules/databinding-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-0.99/modules/databinding-axiom/src/test/resources/order.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/test/resources/order.wsdl
index a5ead60382..a5ead60382 100644
--- a/branches/sca-java-0.99/modules/databinding-axiom/src/test/resources/order.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-axiom/src/test/resources/order.wsdl
diff --git a/branches/sca-java-0.99/modules/databinding-fastinfoset/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/.ruleset
index e615e93a4b..e615e93a4b 100644
--- a/branches/sca-java-0.99/modules/databinding-fastinfoset/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/.ruleset
diff --git a/branches/sca-java-0.99/modules/databinding-fastinfoset/LICENSE.txt b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/LICENSE.txt
index d645695673..d645695673 100644
--- a/branches/sca-java-0.99/modules/databinding-fastinfoset/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/LICENSE.txt
diff --git a/branches/sca-java-0.99/modules/databinding-fastinfoset/NOTICE.txt b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/sca-java-0.99/modules/databinding-fastinfoset/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/NOTICE.txt
diff --git a/branches/sca-java-0.99/modules/databinding-fastinfoset/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/pom.xml
index 927fe56ef7..927fe56ef7 100644
--- a/branches/sca-java-0.99/modules/databinding-fastinfoset/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/pom.xml
diff --git a/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
index fe724e3302..fe724e3302 100644
--- a/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
diff --git a/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
index 3c8f352cd8..3c8f352cd8 100644
--- a/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
diff --git a/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
index dde9a411eb..dde9a411eb 100644
--- a/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
diff --git a/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
index cdb2f47d21..cdb2f47d21 100644
--- a/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
diff --git a/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
index b323081364..b323081364 100644
--- a/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
diff --git a/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
index c172633d4d..c172633d4d 100644
--- a/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
diff --git a/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 166455e6e3..166455e6e3 100644
--- a/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
index 523c39b1f8..523c39b1f8 100644
--- a/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/branches/sca-java-0.99/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
index d65ba623a3..d65ba623a3 100644
--- a/branches/sca-java-0.99/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding-fastinfoset/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100644
--- a/branches/sca-java-0.99/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/.ruleset
index 27b9ab847c..27b9ab847c 100644
--- a/branches/sca-java-0.99/modules/databinding-jaxb/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/.ruleset
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/databinding-jaxb/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/databinding-jaxb/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/LICENSE
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/databinding-jaxb/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/NOTICE
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/pom.xml
index f08c1fd168..f08c1fd168 100755
--- a/branches/sca-java-0.99/modules/databinding-jaxb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/pom.xml
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
index 6e0f03951b..6e0f03951b 100755
--- a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
index 54e51cd97c..54e51cd97c 100644
--- a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
index 9706ffdc21..9706ffdc21 100644
--- a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBExceptionHandler.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBExceptionHandler.java
index aa37031c04..aa37031c04 100644
--- a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBExceptionHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBExceptionHandler.java
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
index 528d6fd703..528d6fd703 100644
--- a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXWSJavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXWSJavaInterfaceProcessor.java
index bf0f43fd3a..bf0f43fd3a 100644
--- a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXWSJavaInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXWSJavaInterfaceProcessor.java
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
index 1490183edb..1490183edb 100755
--- a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
index c4aab8a898..c4aab8a898 100644
--- a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
index d74a777fa1..d74a777fa1 100755
--- a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 58d6123373..58d6123373 100644
--- a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index d3efc9e0d7..d3efc9e0d7 100644
--- a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor
index 28ce24b63a..28ce24b63a 100644
--- a/branches/sca-java-0.99/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java
index b121e2c99f..b121e2c99f 100644
--- a/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBExceptionHandlerTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBExceptionHandlerTestCase.java
index 9cf40ee9a6..9cf40ee9a6 100644
--- a/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBExceptionHandlerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBExceptionHandlerTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java
index 05f112aff3..05f112aff3 100755
--- a/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java
index 69ed9d81f0..69ed9d81f0 100644
--- a/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXWSJavaInterfaceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXWSJavaInterfaceProcessorTestCase.java
index 83abdc29f5..83abdc29f5 100644
--- a/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXWSJavaInterfaceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXWSJavaInterfaceProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/fault/InvalidSymbolFault.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/fault/InvalidSymbolFault.java
index fd21d72337..fd21d72337 100644
--- a/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/fault/InvalidSymbolFault.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/fault/InvalidSymbolFault.java
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/fault/InvalidSymbolFault_Exception.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/fault/InvalidSymbolFault_Exception.java
index e78889aee0..e78889aee0 100644
--- a/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/fault/InvalidSymbolFault_Exception.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/fault/InvalidSymbolFault_Exception.java
diff --git a/branches/sca-java-0.99/modules/databinding-jaxb/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100755
--- a/branches/sca-java-0.99/modules/databinding-jaxb/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-jaxb/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-0.99/modules/databinding-json/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/.ruleset
index e615e93a4b..e615e93a4b 100644
--- a/branches/sca-java-0.99/modules/databinding-json/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/.ruleset
diff --git a/branches/sca-java-0.99/modules/databinding-json/LICENSE.txt b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/LICENSE.txt
index d645695673..d645695673 100644
--- a/branches/sca-java-0.99/modules/databinding-json/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/LICENSE.txt
diff --git a/branches/sca-java-0.99/modules/databinding-json/NOTICE.txt b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/sca-java-0.99/modules/databinding-json/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/NOTICE.txt
diff --git a/branches/sca-java-0.99/modules/databinding-json/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/pom.xml
index 0a78ceddd5..0a78ceddd5 100644
--- a/branches/sca-java-0.99/modules/databinding-json/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/pom.xml
diff --git a/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
index 9723a8ba69..9723a8ba69 100644
--- a/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
diff --git a/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
index b55bd2b652..b55bd2b652 100644
--- a/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
diff --git a/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
index a00b8fe3d0..a00b8fe3d0 100644
--- a/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
diff --git a/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
index 3e7d074be3..3e7d074be3 100644
--- a/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
diff --git a/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
index 76f94c7b28..76f94c7b28 100644
--- a/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
diff --git a/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamSerializer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamSerializer.java
index 26987cbb28..26987cbb28 100644
--- a/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamSerializer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamSerializer.java
diff --git a/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
index a26540e77d..a26540e77d 100644
--- a/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
diff --git a/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
index adc38772be..adc38772be 100644
--- a/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
diff --git a/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
index 50086550a3..50086550a3 100644
--- a/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
diff --git a/branches/sca-java-0.99/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 49c1010f0c..49c1010f0c 100644
--- a/branches/sca-java-0.99/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-0.99/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index a6e3f63418..a6e3f63418 100644
--- a/branches/sca-java-0.99/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-0.99/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
index 761b8ac897..761b8ac897 100644
--- a/branches/sca-java-0.99/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding-json/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100644
--- a/branches/sca-java-0.99/modules/databinding-json/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-json/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/LICENSE.txt b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/LICENSE.txt
index d645695673..d645695673 100644
--- a/branches/sca-java-0.99/modules/databinding-saxon/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/LICENSE.txt
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/NOTICE.txt b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/sca-java-0.99/modules/databinding-saxon/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/NOTICE.txt
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/mvn-install-saxon.sh b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/mvn-install-saxon.sh
index 523b0c58be..523b0c58be 100755
--- a/branches/sca-java-0.99/modules/databinding-saxon/mvn-install-saxon.sh
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/mvn-install-saxon.sh
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/pom.xml
index 655ab48b6d..655ab48b6d 100644
--- a/branches/sca-java-0.99/modules/databinding-saxon/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/pom.xml
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
index 06f07790f5..06f07790f5 100644
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
index 0de9d67ccf..0de9d67ccf 100644
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
index 520cc1d79d..520cc1d79d 100644
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
index 743848c61e..743848c61e 100644
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
index 76f30b188b..76f30b188b 100644
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
index eac40c9b99..eac40c9b99 100644
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
index 97c7530241..97c7530241 100644
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
index 106979cf4f..106979cf4f 100644
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
index e8af18a566..e8af18a566 100644
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
index 8d9127a692..8d9127a692 100644
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
index 7d69e7f31a..7d69e7f31a 100644
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/module/SaxonDataBindingModuleActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/module/SaxonDataBindingModuleActivator.java
index ac7bdd6a17..ac7bdd6a17 100644
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/module/SaxonDataBindingModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/module/SaxonDataBindingModuleActivator.java
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index a06e29e8a4..a06e29e8a4 100644
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/.checkstyle
index c7b30ffd5e..c7b30ffd5e 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/.checkstyle
diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/.ruleset
index 27b9ab847c..27b9ab847c 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/.ruleset
diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/LICENSE
diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/NOTICE
diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/pom.xml
index 9e7deb1148..9e7deb1148 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/pom.xml
diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
index 1c5351bc70..1c5351bc70 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
index ef6b5b0bf2..ef6b5b0bf2 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java
index 36b775b123..36b775b123 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
index f461a80029..f461a80029 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
index 1f3384efd8..1f3384efd8 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 51a451e0f8..51a451e0f8 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
index d3a1c3f656..d3a1c3f656 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
index f5182f465c..f5182f465c 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
index e141e27098..e141e27098 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/test/resources/stock.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
index a0a6717371..a0a6717371 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/.checkstyle
index c7b30ffd5e..c7b30ffd5e 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/.checkstyle
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/.ruleset
index 27b9ab847c..27b9ab847c 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/.ruleset
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/LICENSE
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/NOTICE
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/pom.xml
index e95b9bc376..e95b9bc376 100755
--- a/branches/sca-java-0.99/modules/databinding-sdo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/pom.xml
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
index 51f378ba27..51f378ba27 100755
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
index 4f91764ffd..4f91764ffd 100755
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
index 30a3e1c3a9..30a3e1c3a9 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
index 93d5e2e1c0..93d5e2e1c0 100755
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
index fd464e3750..fd464e3750 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
index a526ece68d..a526ece68d 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java
index a4ffcaff41..a4ffcaff41 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
index f2b01a7e4e..f2b01a7e4e 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
index d89627da71..d89627da71 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
index bc212d7351..bc212d7351 100755
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
index c43aa40452..c43aa40452 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
index 50b257176c..50b257176c 100755
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
index df13aa3489..df13aa3489 100755
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
index 75bb6dad74..75bb6dad74 100755
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ffe8b895b8..ffe8b895b8 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index afd00b552c..afd00b552c 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 00c8e642a4..00c8e642a4 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
index c5d87d2c3c..c5d87d2c3c 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
index 3665434cee..3665434cee 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
index 369912f115..369912f115 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
index 10bea0a30d..10bea0a30d 100755
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
index a41dc585d9..a41dc585d9 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandlerTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandlerTestCase.java
index 62069acaaa..62069acaaa 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandlerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandlerTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
index f5c26bf9f5..f5c26bf9f5 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
index ffafbe5094..ffafbe5094 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
index ce04f5be3f..ce04f5be3f 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
index 78bc62eb3a..78bc62eb3a 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100755
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/model/sca-core.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
index 56c6977254..56c6977254 100755
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
index bbaf58f00c..bbaf58f00c 100755
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/stock.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/stock.xsd
index a0a6717371..a0a6717371 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/stock.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/stock.xsd
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/wrapper.xml b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/wrapper.xml
index 2526629409..2526629409 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/wrapper.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/wrapper.xml
diff --git a/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/wrapper.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/wrapper.xsd
index ea4dc5f7f3..ea4dc5f7f3 100644
--- a/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/wrapper.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-sdo/src/test/resources/wrapper.xsd
diff --git a/branches/sca-java-0.99/modules/databinding-xmlbeans/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/.ruleset
index e615e93a4b..e615e93a4b 100644
--- a/branches/sca-java-0.99/modules/databinding-xmlbeans/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/.ruleset
diff --git a/branches/sca-java-0.99/modules/databinding-xmlbeans/LICENSE.txt b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/LICENSE.txt
index d645695673..d645695673 100755
--- a/branches/sca-java-0.99/modules/databinding-xmlbeans/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/LICENSE.txt
diff --git a/branches/sca-java-0.99/modules/databinding-xmlbeans/NOTICE.txt b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/sca-java-0.99/modules/databinding-xmlbeans/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/NOTICE.txt
diff --git a/branches/sca-java-0.99/modules/databinding-xmlbeans/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/pom.xml
index edfce74591..edfce74591 100644
--- a/branches/sca-java-0.99/modules/databinding-xmlbeans/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/pom.xml
diff --git a/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
index 4130dcb4df..4130dcb4df 100755
--- a/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
diff --git a/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
index eaf4fb4902..eaf4fb4902 100644
--- a/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
diff --git a/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
index a4f32c5cb1..a4f32c5cb1 100755
--- a/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
diff --git a/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
index 800fae9780..800fae9780 100755
--- a/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
diff --git a/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
index 4fd961c52e..4fd961c52e 100755
--- a/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
diff --git a/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 907d06559a..907d06559a 100644
--- a/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 392b2c9389..392b2c9389 100644
--- a/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-0.99/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
index 3b62a99021..3b62a99021 100755
--- a/branches/sca-java-0.99/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding-xmlbeans/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100755
--- a/branches/sca-java-0.99/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-0.99/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
index a397182672..a397182672 100755
--- a/branches/sca-java-0.99/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
diff --git a/branches/sca-java-0.99/modules/databinding/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/.checkstyle
index c7b30ffd5e..c7b30ffd5e 100644
--- a/branches/sca-java-0.99/modules/databinding/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/.checkstyle
diff --git a/branches/sca-java-0.99/modules/databinding/.pmd b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.99/modules/databinding/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/.pmd
diff --git a/branches/sca-java-0.99/modules/databinding/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.99/modules/databinding/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/.ruleset
diff --git a/branches/sca-java-0.99/modules/databinding/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/databinding/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/databinding/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/databinding/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/LICENSE
diff --git a/branches/sca-java-0.99/modules/databinding/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/databinding/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/NOTICE
diff --git a/branches/sca-java-0.99/modules/databinding/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/pom.xml
index 10b9838e82..10b9838e82 100644
--- a/branches/sca-java-0.99/modules/databinding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/pom.xml
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
index 34313fdae0..34313fdae0 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
index 205843e2be..205843e2be 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
index 69a0e4510a..69a0e4510a 100755
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
index 4486117d31..4486117d31 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
index c44487acdc..c44487acdc 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
index 8a5392aebc..8a5392aebc 100755
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/ExceptionHandler.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/ExceptionHandler.java
index 131e8a3114..131e8a3114 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/ExceptionHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/ExceptionHandler.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
index 168a1052b3..168a1052b3 100755
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
index feed87e45f..feed87e45f 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
index 80e5e4f0a3..80e5e4f0a3 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
index 70ea431d57..70ea431d57 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
index 27818dc24f..27818dc24f 100755
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
index 8d2b36482d..8d2b36482d 100755
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
index 062f087a15..062f087a15 100755
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
index 1abae06754..1abae06754 100755
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
index a94e986755..a94e986755 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
index 1d0e117d34..1d0e117d34 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
index 0bc9d3c192..0bc9d3c192 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
index 0efb7e41b5..0efb7e41b5 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
index 65dd772708..65dd772708 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
index 6ecc1c6cd8..6ecc1c6cd8 100755
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
index d1dd6f28f0..d1dd6f28f0 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
index 0cc87f8325..0cc87f8325 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
index 50b5bf6e8d..50b5bf6e8d 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
index 1b625b379b..1b625b379b 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
index e2db8c5834..e2db8c5834 100755
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/ServiceConfigurationUtil.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/ServiceConfigurationUtil.java
index 79e68a4f3b..79e68a4f3b 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/ServiceConfigurationUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/ServiceConfigurationUtil.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
index d75b26ade0..d75b26ade0 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
index c36ebb04c5..c36ebb04c5 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
index 6a11f4fcb3..6a11f4fcb3 100755
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
index 310d1e6c00..310d1e6c00 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
index 31a36f6fdd..31a36f6fdd 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
index 050c4288c3..050c4288c3 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
index 056eea58d6..056eea58d6 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReader.java
index a0a9493551..a0a9493551 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReader.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
index 1f64a6aa82..1f64a6aa82 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
index f7b684e227..f7b684e227 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansExceptionHandler.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansExceptionHandler.java
index 8c704b6df2..8c704b6df2 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansExceptionHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansExceptionHandler.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
index 1fe75f1de9..1fe75f1de9 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
index 76f51c4ef0..76f51c4ef0 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
index b7dee262c0..b7dee262c0 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanUtil.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanUtil.java
index 345ad478cf..345ad478cf 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanUtil.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
index 9e3d352ac8..9e3d352ac8 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
index 0dde4628c5..0dde4628c5 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
index e377dd1d8b..e377dd1d8b 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
index 40d5c07499..40d5c07499 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
index 2a6094a76a..2a6094a76a 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
index d842048d81..d842048d81 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
index 2ec864fbbd..2ec864fbbd 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
index 06b2521d47..06b2521d47 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
index 157a95025d..157a95025d 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
index 71af7519e7..71af7519e7 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
index 04d7d65a0d..04d7d65a0d 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
index abc4bf3785..abc4bf3785 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
index 3e20e0be70..3e20e0be70 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
index f20cd4f901..f20cd4f901 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
index b07e6eb955..b07e6eb955 100755
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
index 2b26c11d50..2b26c11d50 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
index e611b0d09d..e611b0d09d 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
index aa96877c02..aa96877c02 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
index bf8edc47f9..bf8edc47f9 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
index 6cdbc82d9d..6cdbc82d9d 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
index 35c20c28c0..35c20c28c0 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
index 486f1f256a..486f1f256a 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
index b502b5003f..b502b5003f 100755
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
index 6257681091..6257681091 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
index 57b02204e3..57b02204e3 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
index 103ecbd7d1..103ecbd7d1 100755
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
index f5fd229ae5..f5fd229ae5 100755
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
index 902fddc234..902fddc234 100755
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
index 776bae535c..776bae535c 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
index 6dc78eefdb..6dc78eefdb 100755
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
index dbf5de55cd..dbf5de55cd 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
index 3ec97a9049..3ec97a9049 100755
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
index e2bebd0eb0..e2bebd0eb0 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
index a42d6acc9a..a42d6acc9a 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
index 07f3d0d111..07f3d0d111 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
index 08bfed9545..08bfed9545 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
index 909e8ad57d..909e8ad57d 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
index 8d12b2574e..8d12b2574e 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
index fd1cab54b3..fd1cab54b3 100755
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
index 93939c5cd7..93939c5cd7 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
index f32f93d098..f32f93d098 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
index 21307909a7..21307909a7 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index ad7e79c18b..ad7e79c18b 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
index 568e04f9de..568e04f9de 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 9012c210cb..9012c210cb 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
index 6ba1ea32a9..6ba1ea32a9 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/branches/sca-java-0.99/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
index 7d8642fb1e..7d8642fb1e 100644
--- a/branches/sca-java-0.99/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
diff --git a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
index d210ad1371..d210ad1371 100644
--- a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
index 174202842a..174202842a 100644
--- a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
index 4e321f2055..4e321f2055 100644
--- a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
index 08141583c3..08141583c3 100644
--- a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
index 31eed42c06..31eed42c06 100644
--- a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
index 1aa90cce1b..1aa90cce1b 100644
--- a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
index 1dc91374ea..1dc91374ea 100644
--- a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
index 3025dbfd13..3025dbfd13 100755
--- a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
index 391fcde38c..391fcde38c 100644
--- a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
index f6b31b63a8..f6b31b63a8 100644
--- a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
index 5200cdacd5..5200cdacd5 100644
--- a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
index b7184cef9c..b7184cef9c 100644
--- a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
index 3db8dad8a7..3db8dad8a7 100644
--- a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
index 3627b2d094..3627b2d094 100755
--- a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
index 21d584e16c..21d584e16c 100644
--- a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
index 6344df674a..6344df674a 100644
--- a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
index b5758d2149..b5758d2149 100644
--- a/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
diff --git a/branches/sca-java-0.99/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
index 92a576fb98..92a576fb98 100644
--- a/branches/sca-java-0.99/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
diff --git a/branches/sca-java-0.99/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
index 100890e10b..100890e10b 100644
--- a/branches/sca-java-0.99/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
diff --git a/branches/sca-java-0.99/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
index 0ba8ade1e0..0ba8ade1e0 100644
--- a/branches/sca-java-0.99/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
diff --git a/branches/sca-java-0.99/modules/discovery-jms/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/discovery-jms/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/discovery-jms/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/discovery-jms/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/discovery-jms/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/discovery-jms/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/discovery-jms/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/discovery-jms/LICENSE
diff --git a/branches/sca-java-0.99/modules/discovery-jms/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/discovery-jms/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/discovery-jms/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/discovery-jms/NOTICE
diff --git a/branches/sca-java-0.99/modules/discovery-jms/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/discovery-jms/pom.xml
index 1f64ac3c29..1f64ac3c29 100644
--- a/branches/sca-java-0.99/modules/discovery-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/discovery-jms/pom.xml
diff --git a/branches/sca-java-0.99/modules/discovery-jms/src/main/java/org/apache/tuscany/service/discovery/jms/JmsDiscoveryService.java b/sca-java-1.x/branches/sca-java-0.99/modules/discovery-jms/src/main/java/org/apache/tuscany/service/discovery/jms/JmsDiscoveryService.java
index 518d482245..518d482245 100644
--- a/branches/sca-java-0.99/modules/discovery-jms/src/main/java/org/apache/tuscany/service/discovery/jms/JmsDiscoveryService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/discovery-jms/src/main/java/org/apache/tuscany/service/discovery/jms/JmsDiscoveryService.java
diff --git a/branches/sca-java-0.99/modules/discovery-jms/src/main/java/org/apache/tuscany/service/discovery/jms/TuscanyJmsException.java b/sca-java-1.x/branches/sca-java-0.99/modules/discovery-jms/src/main/java/org/apache/tuscany/service/discovery/jms/TuscanyJmsException.java
index 6b5f4066bf..6b5f4066bf 100644
--- a/branches/sca-java-0.99/modules/discovery-jms/src/main/java/org/apache/tuscany/service/discovery/jms/TuscanyJmsException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/discovery-jms/src/main/java/org/apache/tuscany/service/discovery/jms/TuscanyJmsException.java
diff --git a/branches/sca-java-0.99/modules/discovery-jms/src/main/java/org/apache/tuscany/service/discovery/jms/TuscanyMessageListener.java b/sca-java-1.x/branches/sca-java-0.99/modules/discovery-jms/src/main/java/org/apache/tuscany/service/discovery/jms/TuscanyMessageListener.java
index e34e1f6199..e34e1f6199 100644
--- a/branches/sca-java-0.99/modules/discovery-jms/src/main/java/org/apache/tuscany/service/discovery/jms/TuscanyMessageListener.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/discovery-jms/src/main/java/org/apache/tuscany/service/discovery/jms/TuscanyMessageListener.java
diff --git a/branches/sca-java-0.99/modules/distributed-impl/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/distributed-impl/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/LICENSE
diff --git a/branches/sca-java-0.99/modules/distributed-impl/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/NOTICE
index eb1926d971..eb1926d971 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/NOTICE
diff --git a/branches/sca-java-0.99/modules/distributed-impl/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/pom.xml
index 5c204a955d..5c204a955d 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/pom.xml
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/domain/impl/DistributedSCADomainImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/domain/impl/DistributedSCADomainImpl.java
index 93d84a34e6..93d84a34e6 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/domain/impl/DistributedSCADomainImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/domain/impl/DistributedSCADomainImpl.java
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/domain/impl/DistributedSCADomainMemoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/domain/impl/DistributedSCADomainMemoryImpl.java
index bf9d68f8c9..bf9d68f8c9 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/domain/impl/DistributedSCADomainMemoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/domain/impl/DistributedSCADomainMemoryImpl.java
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/domain/impl/DistributedSCADomainNetworkImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/domain/impl/DistributedSCADomainNetworkImpl.java
index e254f3654c..e254f3654c 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/domain/impl/DistributedSCADomainNetworkImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/domain/impl/DistributedSCADomainNetworkImpl.java
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/DistributedDomainManagerMemoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/DistributedDomainManagerMemoryImpl.java
index 155326e40b..155326e40b 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/DistributedDomainManagerMemoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/DistributedDomainManagerMemoryImpl.java
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/DistributedDomainManagerNetworkImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/DistributedDomainManagerNetworkImpl.java
index 23b4a7dca6..23b4a7dca6 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/DistributedDomainManagerNetworkImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/DistributedDomainManagerNetworkImpl.java
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/ServiceDiscoveryMemoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/ServiceDiscoveryMemoryImpl.java
index 2f884d59df..2f884d59df 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/ServiceDiscoveryMemoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/ServiceDiscoveryMemoryImpl.java
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/ServiceDiscoveryNetworkImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/ServiceDiscoveryNetworkImpl.java
index 86a36a68a3..86a36a68a3 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/ServiceDiscoveryNetworkImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/ServiceDiscoveryNetworkImpl.java
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/node/impl/EmbeddedNode.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/node/impl/EmbeddedNode.java
index f4f30896b4..f4f30896b4 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/node/impl/EmbeddedNode.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/node/impl/EmbeddedNode.java
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/AddService.java
index 797ebb4024..797ebb4024 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/AddServiceImpl.java
index 1a63d4ff77..1a63d4ff77 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/CalculatorServiceImpl.java
index 8ee640ed6b..8ee640ed6b 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/SubtractService.java
index 615320e670..615320e670 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/SubtractServiceImpl.java
index abf2777c7d..abf2777c7d 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/org/apache/tuscany/sca/distributed/impl/InMemoryTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/org/apache/tuscany/sca/distributed/impl/InMemoryTestCase.java
index b22cba7ea1..b22cba7ea1 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/java/org/apache/tuscany/sca/distributed/impl/InMemoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/java/org/apache/tuscany/sca/distributed/impl/InMemoryTestCase.java
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/management/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/management/META-INF/sca-contribution.xml
index b73217ebb8..b73217ebb8 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/management/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/management/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/management/management.composite b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/management/management.composite
index a308f6ad61..a308f6ad61 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/management/management.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/management/management.composite
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeA/Calculator.composite b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeA/Calculator.composite
index a43491f509..a43491f509 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeA/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeA/Calculator.composite
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml
index 3f9ed8024b..3f9ed8024b 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeA/wsdl/add.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeA/wsdl/add.wsdl
index 5dda2c214e..5dda2c214e 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeA/wsdl/add.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeA/wsdl/add.wsdl
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeA/wsdl/multiply.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeA/wsdl/multiply.wsdl
index 81033cc9ec..81033cc9ec 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeA/wsdl/multiply.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeA/wsdl/multiply.wsdl
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeA/wsdl/subtract.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeA/wsdl/subtract.wsdl
index ed015d31c2..ed015d31c2 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeA/wsdl/subtract.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeA/wsdl/subtract.wsdl
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeB/Calculator.composite b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeB/Calculator.composite
index 08abaf40ce..08abaf40ce 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeB/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeB/Calculator.composite
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeB/META-INF/sca-contribution.xml
index 3f9ed8024b..3f9ed8024b 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeC/Calculator.composite b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeC/Calculator.composite
index 4ef4c5ddb6..4ef4c5ddb6 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeC/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeC/Calculator.composite
diff --git a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeC/META-INF/sca-contribution.xml
index 3f9ed8024b..3f9ed8024b 100644
--- a/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed-impl/src/test/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/modules/distributed/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/distributed/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/distributed/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/distributed/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/LICENSE
diff --git a/branches/sca-java-0.99/modules/distributed/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/distributed/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/NOTICE
diff --git a/branches/sca-java-0.99/modules/distributed/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/pom.xml
index a01403778e..a01403778e 100644
--- a/branches/sca-java-0.99/modules/distributed/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/pom.xml
diff --git a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/domain/DistributedSCADomain.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/domain/DistributedSCADomain.java
index 8ebaac82e1..8ebaac82e1 100644
--- a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/domain/DistributedSCADomain.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/domain/DistributedSCADomain.java
diff --git a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/BaseUriMap.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/BaseUriMap.java
index 01d81df6d4..01d81df6d4 100644
--- a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/BaseUriMap.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/BaseUriMap.java
diff --git a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ComponentManager.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ComponentManager.java
index e86f20badf..e86f20badf 100644
--- a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ComponentManager.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ComponentManager.java
diff --git a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ComponentMap.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ComponentMap.java
index a7b6b72b42..a7b6b72b42 100644
--- a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ComponentMap.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ComponentMap.java
diff --git a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ContributionManager.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ContributionManager.java
index 374f8a046b..374f8a046b 100644
--- a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ContributionManager.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ContributionManager.java
diff --git a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DistributedDomainManager.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DistributedDomainManager.java
index aa3c472c9e..aa3c472c9e 100644
--- a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DistributedDomainManager.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DistributedDomainManager.java
diff --git a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DomainNodeManager.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DomainNodeManager.java
index 9654ba7914..9654ba7914 100644
--- a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DomainNodeManager.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DomainNodeManager.java
diff --git a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/NodeManager.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/NodeManager.java
index 44abb3ad21..44abb3ad21 100644
--- a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/NodeManager.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/NodeManager.java
diff --git a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ServiceDiscovery.java b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ServiceDiscovery.java
index b2a9e6fa57..b2a9e6fa57 100644
--- a/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ServiceDiscovery.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ServiceDiscovery.java
diff --git a/branches/sca-java-0.99/modules/extension-helper/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/extension-helper/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/extension-helper/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/extension-helper/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/LICENSE
diff --git a/branches/sca-java-0.99/modules/extension-helper/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/extension-helper/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/NOTICE
diff --git a/branches/sca-java-0.99/modules/extension-helper/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/pom.xml
index efcfa53501..efcfa53501 100644
--- a/branches/sca-java-0.99/modules/extension-helper/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/pom.xml
diff --git a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java
index 2eeccd7e4a..2eeccd7e4a 100644
--- a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java
diff --git a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java
index 75494cd02c..75494cd02c 100644
--- a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java
diff --git a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java
index 3b508b8ffd..3b508b8ffd 100644
--- a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java
diff --git a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java
index 1c98c41fb4..1c98c41fb4 100644
--- a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java
diff --git a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java
index 2b848c24cf..2b848c24cf 100644
--- a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java
diff --git a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java
index ffe6ae2e3d..ffe6ae2e3d 100644
--- a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java
diff --git a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java
index 7f25db0620..7f25db0620 100644
--- a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java
diff --git a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java
index e6b89440d9..e6b89440d9 100644
--- a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java
diff --git a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java
index a5ae3c32f8..a5ae3c32f8 100644
--- a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java
diff --git a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java
index 7baffacc32..7baffacc32 100644
--- a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java
diff --git a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java
index 6acc4f1c49..6acc4f1c49 100644
--- a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java
diff --git a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java
index a23f3a2ec0..a23f3a2ec0 100644
--- a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java
diff --git a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java
index 3686412331..3686412331 100644
--- a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java
diff --git a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java
index bc3c94b0ff..bc3c94b0ff 100644
--- a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java
diff --git a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java
index 197429a8cc..197429a8cc 100644
--- a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java
diff --git a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java
index d68e2dcb6b..d68e2dcb6b 100644
--- a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java
diff --git a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java
index 010a647ee7..010a647ee7 100644
--- a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java
diff --git a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java
index 8f032c68f5..8f032c68f5 100644
--- a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java
diff --git a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java
index 0ddf7cc57b..0ddf7cc57b 100644
--- a/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java
diff --git a/branches/sca-java-0.99/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index a408b0d061..a408b0d061 100644
--- a/branches/sca-java-0.99/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.99/modules/host-embedded/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/.checkstyle
index ea05637a07..ea05637a07 100644
--- a/branches/sca-java-0.99/modules/host-embedded/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/.checkstyle
diff --git a/branches/sca-java-0.99/modules/host-embedded/.pmd b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/.pmd
index aa1ce3e754..aa1ce3e754 100644
--- a/branches/sca-java-0.99/modules/host-embedded/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/.pmd
diff --git a/branches/sca-java-0.99/modules/host-embedded/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/.ruleset
index a7ff3be272..a7ff3be272 100644
--- a/branches/sca-java-0.99/modules/host-embedded/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/.ruleset
diff --git a/branches/sca-java-0.99/modules/host-embedded/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/host-embedded/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/host-embedded/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/host-embedded/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/LICENSE
diff --git a/branches/sca-java-0.99/modules/host-embedded/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/host-embedded/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/NOTICE
diff --git a/branches/sca-java-0.99/modules/host-embedded/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/pom.xml
index 5226e19ee0..5226e19ee0 100644
--- a/branches/sca-java-0.99/modules/host-embedded/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/pom.xml
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
index 6954110bc5..6954110bc5 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
index 9ee7c274fd..9ee7c274fd 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
index 3aa334a3d5..3aa334a3d5 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
index 8a512de5f8..8a512de5f8 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
index 1e6a5cb3b1..1e6a5cb3b1 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
index 20fa2837a3..20fa2837a3 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
index 2942e61db2..2942e61db2 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
index 40ec206b2c..40ec206b2c 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
index afe5180a64..afe5180a64 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
index 452f1a1ab1..452f1a1ab1 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
index 57b6a6d746..57b6a6d746 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/ComponentInfo.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/ComponentInfo.java
index 1b835d1ba6..1b835d1ba6 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/ComponentInfo.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/ComponentInfo.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/ComponentListener.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/ComponentListener.java
index f117304a81..f117304a81 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/ComponentListener.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/ComponentListener.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/ComponentManager.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/ComponentManager.java
index 399d30836f..399d30836f 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/ComponentManager.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/ComponentManager.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/ComponentManagerService.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/ComponentManagerService.java
index 547e4c13d2..547e4c13d2 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/ComponentManagerService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/ComponentManagerService.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/impl/ComponentInfoImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/impl/ComponentInfoImpl.java
index 76b8c866fc..76b8c866fc 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/impl/ComponentInfoImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/impl/ComponentInfoImpl.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/impl/ComponentManagerImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/impl/ComponentManagerImpl.java
index 384122e1d3..384122e1d3 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/impl/ComponentManagerImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/impl/ComponentManagerImpl.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/impl/ComponentManagerServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/impl/ComponentManagerServiceImpl.java
index cb05c28841..cb05c28841 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/impl/ComponentManagerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/variation/impl/ComponentManagerServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
index c47ea2ab7a..c47ea2ab7a 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
index 896a34515c..896a34515c 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
index 25918b8c90..25918b8c90 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
index fc11337426..fc11337426 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
index 6969cba054..6969cba054 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/CRUD.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/CRUD.java
index 7f652ff489..7f652ff489 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/CRUD.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/CRUD.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/CRUDImplementation.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/CRUDImplementation.java
index 29f620c78d..29f620c78d 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/CRUDImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/CRUDImplementation.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/CRUDImplementationFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/CRUDImplementationFactory.java
index 78115f8619..78115f8619 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/CRUDImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/CRUDImplementationFactory.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/DefaultCRUDImplementationFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/DefaultCRUDImplementationFactory.java
index fc59ba05ef..fc59ba05ef 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/DefaultCRUDImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/DefaultCRUDImplementationFactory.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/backend/ResourceManager.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/backend/ResourceManager.java
index f5914be043..f5914be043 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/backend/ResourceManager.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/backend/ResourceManager.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/impl/CRUDImplementationImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/impl/CRUDImplementationImpl.java
index 2060432b1b..2060432b1b 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/impl/CRUDImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/impl/CRUDImplementationImpl.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/impl/CRUDImplementationProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/impl/CRUDImplementationProcessor.java
index fa18a98957..fa18a98957 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/impl/CRUDImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/impl/CRUDImplementationProcessor.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/module/CRUDModuleActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/module/CRUDModuleActivator.java
index 00a1da9217..00a1da9217 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/module/CRUDModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/module/CRUDModuleActivator.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProvider.java
index bc9cffe53f..bc9cffe53f 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProvider.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProviderFactory.java
index 290716ed7f..290716ed7f 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProviderFactory.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/provider/CRUDInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/provider/CRUDInvoker.java
index 8f32089e9c..8f32089e9c 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/provider/CRUDInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/java/test/crud/provider/CRUDInvoker.java
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index eca487b829..eca487b829 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/test/resources/crud.composite b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/resources/crud.composite
index 65f24ec93c..65f24ec93c 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/test/resources/crud.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/resources/crud.composite
diff --git a/branches/sca-java-0.99/modules/host-embedded/src/test/resources/test.txt b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/resources/test.txt
index 287f9b1f65..287f9b1f65 100644
--- a/branches/sca-java-0.99/modules/host-embedded/src/test/resources/test.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-embedded/src/test/resources/test.txt
diff --git a/branches/sca-java-0.99/modules/host-home/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/host-home/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/host-home/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-home/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/host-home/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/host-home/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/host-home/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-home/LICENSE
diff --git a/branches/sca-java-0.99/modules/host-home/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/host-home/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/host-home/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-home/NOTICE
diff --git a/branches/sca-java-0.99/modules/host-home/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/host-home/pom.xml
index 4873976937..4873976937 100644
--- a/branches/sca-java-0.99/modules/host-home/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-home/pom.xml
diff --git a/branches/sca-java-0.99/modules/host-http/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/host-http/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/host-http/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/host-http/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/LICENSE
diff --git a/branches/sca-java-0.99/modules/host-http/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/host-http/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/NOTICE
diff --git a/branches/sca-java-0.99/modules/host-http/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/pom.xml
index fee8a0bd58..fee8a0bd58 100644
--- a/branches/sca-java-0.99/modules/host-http/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/pom.xml
diff --git a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
index 7efaed1a1e..7efaed1a1e 100644
--- a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
diff --git a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
index 8f20287f84..8f20287f84 100644
--- a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
index 8fb0eac553..8fb0eac553 100644
--- a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
diff --git a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
index b5ef0e189c..b5ef0e189c 100644
--- a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
diff --git a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
index f887151a77..f887151a77 100644
--- a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
index b061f171b9..b061f171b9 100644
--- a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
diff --git a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/DefaultResourceServlet.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/DefaultResourceServlet.java
index 45708178bd..45708178bd 100644
--- a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/DefaultResourceServlet.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/DefaultResourceServlet.java
diff --git a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/DefaultServletHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/DefaultServletHostExtensionPoint.java
index e4ba57b68c..e4ba57b68c 100644
--- a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/DefaultServletHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/DefaultServletHostExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ExtensibleServletHost.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ExtensibleServletHost.java
index 99ccefd86c..99ccefd86c 100644
--- a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ExtensibleServletHost.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ExtensibleServletHost.java
diff --git a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHost.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHost.java
index 15a657f25b..15a657f25b 100644
--- a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHost.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHost.java
diff --git a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHostExtensionPoint.java
index 9b834b48a2..9b834b48a2 100644
--- a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHostExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletMappingException.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletMappingException.java
index bf73a701e0..bf73a701e0 100644
--- a/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletMappingException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletMappingException.java
diff --git a/branches/sca-java-0.99/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
index 44f4550b40..44f4550b40 100644
--- a/branches/sca-java-0.99/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
diff --git a/branches/sca-java-0.99/modules/host-osgi/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/host-osgi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/host-osgi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-osgi/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/host-osgi/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/host-osgi/LICENSE
index 4b5ab74408..4b5ab74408 100644
--- a/branches/sca-java-0.99/modules/host-osgi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-osgi/LICENSE
diff --git a/branches/sca-java-0.99/modules/host-osgi/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/host-osgi/NOTICE
index 9a03eabdab..9a03eabdab 100644
--- a/branches/sca-java-0.99/modules/host-osgi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-osgi/NOTICE
diff --git a/branches/sca-java-0.99/modules/host-osgi/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/host-osgi/pom.xml
index f688e74285..f688e74285 100644
--- a/branches/sca-java-0.99/modules/host-osgi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-osgi/pom.xml
diff --git a/branches/sca-java-0.99/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.99/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 8bab603184..8bab603184 100644
--- a/branches/sca-java-0.99/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.99/modules/host-rmi/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/host-rmi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/host-rmi/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/host-rmi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/LICENSE
diff --git a/branches/sca-java-0.99/modules/host-rmi/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/host-rmi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/NOTICE
diff --git a/branches/sca-java-0.99/modules/host-rmi/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/pom.xml
index 2c31003678..2c31003678 100644
--- a/branches/sca-java-0.99/modules/host-rmi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/pom.xml
diff --git a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
index 396693e7c1..396693e7c1 100644
--- a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
diff --git a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
index 3ac086a2ee..3ac086a2ee 100644
--- a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
index 32fe6c2deb..32fe6c2deb 100644
--- a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
diff --git a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
index dcda47f51d..dcda47f51d 100644
--- a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
diff --git a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
index 959eb72f6e..959eb72f6e 100644
--- a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
diff --git a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
index 60804c1003..60804c1003 100644
--- a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
index 7ce19d0510..7ce19d0510 100644
--- a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
diff --git a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/DefaultRMIHost.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/DefaultRMIHost.java
index 0b32fb9bce..0b32fb9bce 100644
--- a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/DefaultRMIHost.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/DefaultRMIHost.java
diff --git a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/DefaultRMIHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/DefaultRMIHostExtensionPoint.java
index c2cb152dd3..c2cb152dd3 100644
--- a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/DefaultRMIHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/DefaultRMIHostExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/ExtensibleRMIHost.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/ExtensibleRMIHost.java
index b0d3fe1649..b0d3fe1649 100644
--- a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/ExtensibleRMIHost.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/ExtensibleRMIHost.java
diff --git a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHost.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHost.java
index 86d45e9be3..86d45e9be3 100644
--- a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHost.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHost.java
diff --git a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostException.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostException.java
index 336ddb7e3e..336ddb7e3e 100644
--- a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostException.java
diff --git a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostExtensionPoint.java
index a21c35f7d1..a21c35f7d1 100644
--- a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostExtensionPoint.java
diff --git a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostRuntimeException.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostRuntimeException.java
index 2b0c79ccd3..2b0c79ccd3 100644
--- a/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostRuntimeException.java
diff --git a/branches/sca-java-0.99/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
index 014c5391b8..014c5391b8 100644
--- a/branches/sca-java-0.99/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
diff --git a/branches/sca-java-0.99/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
index f69a042ef6..f69a042ef6 100644
--- a/branches/sca-java-0.99/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
diff --git a/branches/sca-java-0.99/modules/host-webapp/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/host-webapp/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/host-webapp/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/host-webapp/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/LICENSE
diff --git a/branches/sca-java-0.99/modules/host-webapp/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/host-webapp/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/NOTICE
diff --git a/branches/sca-java-0.99/modules/host-webapp/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/pom.xml
index a631839bbb..a631839bbb 100644
--- a/branches/sca-java-0.99/modules/host-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/pom.xml
diff --git a/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java
index e6300c81b9..e6300c81b9 100644
--- a/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java
diff --git a/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java
index dff63ed01e..dff63ed01e 100644
--- a/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java
diff --git a/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
index 5bc83df77f..5bc83df77f 100644
--- a/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
diff --git a/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java
index 0e64ebc9b8..0e64ebc9b8 100644
--- a/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java
diff --git a/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java
index 09b11145d6..09b11145d6 100644
--- a/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java
diff --git a/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
index 4e0d3d88c5..4e0d3d88c5 100644
--- a/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
diff --git a/branches/sca-java-0.99/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index d99fdf257e..d99fdf257e 100644
--- a/branches/sca-java-0.99/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.99/modules/http-jetty/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/.ruleset
index 3886f07f2d..3886f07f2d 100644
--- a/branches/sca-java-0.99/modules/http-jetty/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/.ruleset
diff --git a/branches/sca-java-0.99/modules/http-jetty/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/http-jetty/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/http-jetty/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/http-jetty/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/LICENSE
diff --git a/branches/sca-java-0.99/modules/http-jetty/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/http-jetty/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/NOTICE
diff --git a/branches/sca-java-0.99/modules/http-jetty/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/pom.xml
index 6e357e5dca..6e357e5dca 100644
--- a/branches/sca-java-0.99/modules/http-jetty/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/pom.xml
diff --git a/branches/sca-java-0.99/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
index da661e384e..da661e384e 100644
--- a/branches/sca-java-0.99/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
diff --git a/branches/sca-java-0.99/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
index 1ecf1bca1b..1ecf1bca1b 100644
--- a/branches/sca-java-0.99/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
diff --git a/branches/sca-java-0.99/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
index f8014904df..f8014904df 100644
--- a/branches/sca-java-0.99/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
diff --git a/branches/sca-java-0.99/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
index 11b8a269ab..11b8a269ab 100644
--- a/branches/sca-java-0.99/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
diff --git a/branches/sca-java-0.99/modules/http-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index f61708de90..f61708de90 100644
--- a/branches/sca-java-0.99/modules/http-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.99/modules/http-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
index e22559cc9c..e22559cc9c 100644
--- a/branches/sca-java-0.99/modules/http-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
diff --git a/branches/sca-java-0.99/modules/http-jetty/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-java-0.99/modules/http-jetty/src/test/resources/content/test.html
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-jetty/src/test/resources/content/test.html
diff --git a/branches/sca-java-0.99/modules/http-tomcat/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/.ruleset
index 3886f07f2d..3886f07f2d 100644
--- a/branches/sca-java-0.99/modules/http-tomcat/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/.ruleset
diff --git a/branches/sca-java-0.99/modules/http-tomcat/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/http-tomcat/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/http-tomcat/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/http-tomcat/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/LICENSE
diff --git a/branches/sca-java-0.99/modules/http-tomcat/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/http-tomcat/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/NOTICE
diff --git a/branches/sca-java-0.99/modules/http-tomcat/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/pom.xml
index 989a0fdad2..989a0fdad2 100644
--- a/branches/sca-java-0.99/modules/http-tomcat/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/pom.xml
diff --git a/branches/sca-java-0.99/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
index b1dd818371..b1dd818371 100644
--- a/branches/sca-java-0.99/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
diff --git a/branches/sca-java-0.99/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
index e38f9a0dc9..e38f9a0dc9 100644
--- a/branches/sca-java-0.99/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
diff --git a/branches/sca-java-0.99/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
index e88dcaf1c6..e88dcaf1c6 100644
--- a/branches/sca-java-0.99/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
diff --git a/branches/sca-java-0.99/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
index 9309e89d60..9309e89d60 100644
--- a/branches/sca-java-0.99/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
diff --git a/branches/sca-java-0.99/modules/http-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index f0f4e17507..f0f4e17507 100644
--- a/branches/sca-java-0.99/modules/http-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.99/modules/http-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
index 56051d5464..56051d5464 100644
--- a/branches/sca-java-0.99/modules/http-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
diff --git a/branches/sca-java-0.99/modules/http-tomcat/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-java-0.99/modules/http-tomcat/src/test/resources/content/test.html
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/http-tomcat/src/test/resources/content/test.html
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/LICENSE
index baba9ca048..baba9ca048 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/LICENSE
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/NOTICE
index f6366c5162..f6366c5162 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/NOTICE
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/pom.xml
index 0b2e442e16..0b2e442e16 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/pom.xml
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPEL.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPEL.java
index c474c59d51..c474c59d51 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPEL.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPEL.java
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
index 9e3adefe5c..9e3adefe5c 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationFactory.java
index 9df99b6069..9df99b6069 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/DefaultBPELImplementationFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/DefaultBPELImplementationFactory.java
index 28bc603c8b..28bc603c8b 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/DefaultBPELImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/DefaultBPELImplementationFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELArtifactProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELArtifactProcessor.java
index 1bb88496b4..1bb88496b4 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELArtifactProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
index 81401f0c72..81401f0c72 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ODEProcessException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ODEProcessException.java
index 34743896b1..34743896b1 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ODEProcessException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ODEProcessException.java
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
index 5846c90150..5846c90150 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
index d20dbe6ffc..d20dbe6ffc 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
index bf8f55be3d..bf8f55be3d 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
index e95bb80438..e95bb80438 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java
index 33112dbc0c..33112dbc0c 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java
index b786f00266..b786f00266 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 91b67833a8..91b67833a8 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index b6481b1512..b6481b1512 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELTestCase.java
index 0a872c7df8..0a872c7df8 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/src/test/resources/HelloWorld.bpel b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/test/resources/HelloWorld.bpel
index 7156fa11b6..7156fa11b6 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/src/test/resources/HelloWorld.bpel
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/test/resources/HelloWorld.bpel
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/src/test/resources/HelloWorld.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/test/resources/HelloWorld.wsdl
index a2ae0c5fa5..a2ae0c5fa5 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/src/test/resources/HelloWorld.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/test/resources/HelloWorld.wsdl
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/src/test/resources/helloworld.componentType b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/test/resources/helloworld.componentType
index 9360403f7e..9360403f7e 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/src/test/resources/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/test/resources/helloworld.componentType
diff --git a/branches/sca-java-0.99/modules/implementation-bpel/src/test/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/test/resources/helloworld.composite
index 7930685e47..7930685e47 100644
--- a/branches/sca-java-0.99/modules/implementation-bpel/src/test/resources/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-bpel/src/test/resources/helloworld.composite
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/.checkstyle
index 3e57539570..3e57539570 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/.checkstyle
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/.pmd b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/.pmd
index 4abfdec2b5..4abfdec2b5 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/.pmd
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/.ruleset
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/LICENSE
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/NOTICE
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/pom.xml
index 49645f63c1..49645f63c1 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/pom.xml
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
index ac8af3ed64..ac8af3ed64 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
index a93710d266..a93710d266 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
index b5d3254fa0..b5d3254fa0 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
index 5285caa481..5285caa481 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
index 2513c63e38..2513c63e38 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
index d8eef18c74..d8eef18c74 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
index 1ce9b53c09..1ce9b53c09 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
index 0f86dc6ae8..0f86dc6ae8 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
index 4a8c8f31b8..4a8c8f31b8 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
index 4d062859b9..4d062859b9 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
index 04ba42ed88..04ba42ed88 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
index 312d1eeb64..312d1eeb64 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
index 9f587f58de..9f587f58de 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
index 6f8d07bf84..6f8d07bf84 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
index ca9c08fe63..ca9c08fe63 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
index 70c368a0e6..70c368a0e6 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
index 17450f43cb..17450f43cb 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
index 5d4d999453..5d4d999453 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
index f94b24762a..f94b24762a 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
index 25c09231c5..25c09231c5 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
index e6ebb5abc3..e6ebb5abc3 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
index 135fde09ff..135fde09ff 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
index 2903cc6fc8..2903cc6fc8 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
index 82d08bd11e..82d08bd11e 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
index 4a5ad98e5b..4a5ad98e5b 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
index ddb10bbc5a..ddb10bbc5a 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
index b12abcab3c..b12abcab3c 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
index 7d479723f5..7d479723f5 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
index 23d42c5616..23d42c5616 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
index f0bf0b738d..f0bf0b738d 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
index a7b175cf9b..a7b175cf9b 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PassByValueInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PassByValueInvoker.java
index 95f6cca5ca..95f6cca5ca 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PassByValueInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PassByValueInvoker.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/TargetMethodNotFoundException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/TargetMethodNotFoundException.java
index 7ebd65d750..7ebd65d750 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/TargetMethodNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/TargetMethodNotFoundException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
index 01b58dbd1f..01b58dbd1f 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 0871ddf4be..0871ddf4be 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
index ba8da101c6..ba8da101c6 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
index 628a308c86..628a308c86 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
index 29dcfa8169..29dcfa8169 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
index cc852cc677..cc852cc677 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
index 4de0a4e8c7..4de0a4e8c7 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
index 214779ed3f..214779ed3f 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
index c470b8cf3d..c470b8cf3d 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
index ed7a0e7d03..ed7a0e7d03 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
index c1650c3a83..c1650c3a83 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
index 40ad1b1e95..40ad1b1e95 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
index de371e09bb..de371e09bb 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
index 1fb7abb917..1fb7abb917 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
index 8a7040a616..8a7040a616 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
index a00b9e7109..a00b9e7109 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
index a5e12d181c..a5e12d181c 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
index 587de11454..587de11454 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
index 408cedb8be..408cedb8be 100644
--- a/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/.checkstyle
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/.pmd b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/.pmd
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/.ruleset
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/LICENSE
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/NOTICE
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/pom.xml
index 4d68f1a4f8..4d68f1a4f8 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/pom.xml
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
index 0e14a2a689..0e14a2a689 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
index 5461dc363c..5461dc363c 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/AddService.java
index 4eeb30a9c2..4eeb30a9c2 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
index ea3e5341d5..ea3e5341d5 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
index 11e8974657..11e8974657 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
index 131c5a8014..131c5a8014 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
index 9c7e96a668..9c7e96a668 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
index a917896aeb..a917896aeb 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
index 4892481203..4892481203 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
index e328f024ea..e328f024ea 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
index ee1d7c3457..ee1d7c3457 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
index 092efbf338..092efbf338 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
index a19c7def04..a19c7def04 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
index 47cba81b18..47cba81b18 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
index 7d2f71176b..7d2f71176b 100644
--- a/branches/sca-java-0.99/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
diff --git a/branches/sca-java-0.99/modules/implementation-java/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.99/modules/implementation-java/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/.checkstyle
diff --git a/branches/sca-java-0.99/modules/implementation-java/.pmd b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/.pmd
index aa1ce3e754..aa1ce3e754 100644
--- a/branches/sca-java-0.99/modules/implementation-java/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/.pmd
diff --git a/branches/sca-java-0.99/modules/implementation-java/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.99/modules/implementation-java/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/.ruleset
diff --git a/branches/sca-java-0.99/modules/implementation-java/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/implementation-java/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/implementation-java/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/implementation-java/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/LICENSE
diff --git a/branches/sca-java-0.99/modules/implementation-java/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/implementation-java/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/NOTICE
diff --git a/branches/sca-java-0.99/modules/implementation-java/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/pom.xml
index 1b391f07a5..1b391f07a5 100644
--- a/branches/sca-java-0.99/modules/implementation-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/pom.xml
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
index c8b7c072ac..c8b7c072ac 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
index 7b849f9b47..7b849f9b47 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
index 2198a632c0..2198a632c0 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
index 93632a7a8e..93632a7a8e 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
index 8228c80372..8228c80372 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
index b21c300f37..b21c300f37 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
index a89eba95a1..a89eba95a1 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
index c0b04b4b4e..c0b04b4b4e 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
index daabec499f..daabec499f 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
index a6c3c16966..a6c3c16966 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
index 80b3fc0e5d..80b3fc0e5d 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
index c4c528f4f2..c4c528f4f2 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
index 1aca15ebb8..1aca15ebb8 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
index 85c2f73f75..85c2f73f75 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
index 3dc79a0da5..3dc79a0da5 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
index 6700c5a8c2..6700c5a8c2 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
index 4a3ce0c343..4a3ce0c343 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
index c6e6b6e4d6..c6e6b6e4d6 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
index bc6551d45d..bc6551d45d 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
index 556f0b77e9..556f0b77e9 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
index e05df90343..e05df90343 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
index 177ceaa57c..177ceaa57c 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
index 593cbfb883..593cbfb883 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
index 2f4b4bda38..2f4b4bda38 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
index 5f59a82401..5f59a82401 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
index 88a245cbf3..88a245cbf3 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
index 9b834e7e87..9b834e7e87 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
index 4325faef26..4325faef26 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
index b9e1923e73..b9e1923e73 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
index 300ad6817e..300ad6817e 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
index 2d177b3f76..2d177b3f76 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
index 5619275b82..5619275b82 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
index 0fc0d6ad0b..0fc0d6ad0b 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
index 05df03471c..05df03471c 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
index f5696122df..f5696122df 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
index 6a0d60c92f..6a0d60c92f 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
index 8f50852c2d..8f50852c2d 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
index 54f7dfad1e..54f7dfad1e 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
index 25196c56e5..25196c56e5 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
index ccfbaf0043..ccfbaf0043 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
index e130f4221d..e130f4221d 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
index 9141151e28..9141151e28 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
index 91b97b2caf..91b97b2caf 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
index a1e1d01ab3..a1e1d01ab3 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
index 976b4da120..976b4da120 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
index e77a6beb0d..e77a6beb0d 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
index debb5cbacc..debb5cbacc 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
index 7147da55b4..7147da55b4 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
index 1e96577d6e..1e96577d6e 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
index 453cfa35fe..453cfa35fe 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
index f710ac097e..f710ac097e 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
index c15d9b5127..c15d9b5127 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
index 106f07ec14..106f07ec14 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
index 3d43e39ce8..3d43e39ce8 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
index e15f9a0d6a..e15f9a0d6a 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
index a3d3889d30..a3d3889d30 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
index ee10d4cd2e..ee10d4cd2e 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
index e1ca3ea565..e1ca3ea565 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
index 57d224b2bf..57d224b2bf 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
index dc9de12632..dc9de12632 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
index fe93424d28..fe93424d28 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
index 5beb31f0f9..5beb31f0f9 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
index e5abb07760..e5abb07760 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
index fa1527fbe5..fa1527fbe5 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
index 690869ccb8..690869ccb8 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
index 8c10df2146..8c10df2146 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
index 365fb12afe..365fb12afe 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
index f77c9abad9..f77c9abad9 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
index 8a56da7e5e..8a56da7e5e 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
index 336501c1ff..336501c1ff 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
index aa2671071c..aa2671071c 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
index 657ad757e5..657ad757e5 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
index 09bcc7ab6c..09bcc7ab6c 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
index c7f340bd46..c7f340bd46 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
index 0db94425d7..0db94425d7 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
index c762447f05..c762447f05 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
index 32c7a5d3cc..32c7a5d3cc 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
index be2b5aa56e..be2b5aa56e 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
index 388a1aae8b..388a1aae8b 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
index aad6b96cf9..aad6b96cf9 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
index 765ff8167c..765ff8167c 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
index ee6adf6810..ee6adf6810 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
index e514e56935..e514e56935 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
index 7bb8e15696..7bb8e15696 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
index d7de4e522e..d7de4e522e 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
index 8f8aeb4f05..8f8aeb4f05 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
index 01e89bbfc4..01e89bbfc4 100644
--- a/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-notification/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/implementation-notification/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/implementation-notification/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-0.99/modules/implementation-notification/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/LICENSE
diff --git a/branches/sca-java-0.99/modules/implementation-notification/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/NOTICE
index eb1926d971..eb1926d971 100644
--- a/branches/sca-java-0.99/modules/implementation-notification/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/NOTICE
diff --git a/branches/sca-java-0.99/modules/implementation-notification/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/pom.xml
index 3d3a8233c1..3d3a8233c1 100644
--- a/branches/sca-java-0.99/modules/implementation-notification/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/pom.xml
diff --git a/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java
index 3f79ca71e5..3f79ca71e5 100644
--- a/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java
index 917ee67d82..917ee67d82 100644
--- a/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java
diff --git a/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java
index 0b2448e1db..0b2448e1db 100644
--- a/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java
diff --git a/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java
index cea7038e9c..cea7038e9c 100644
--- a/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java
index 5184d8088f..5184d8088f 100644
--- a/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoader.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoader.java
index a64c7f64a4..a64c7f64a4 100644
--- a/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoader.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoader.java
diff --git a/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
index a3bc3dc91c..a3bc3dc91c 100644
--- a/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
diff --git a/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java
index 80785e36e7..80785e36e7 100644
--- a/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java
index 1e8fbda77c..1e8fbda77c 100644
--- a/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java
diff --git a/branches/sca-java-0.99/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 5d3395c6ae..5d3395c6ae 100644
--- a/branches/sca-java-0.99/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.99/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java
index 02363480d6..02363480d6 100644
--- a/branches/sca-java-0.99/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java
index d6a61ac8e3..d6a61ac8e3 100644
--- a/branches/sca-java-0.99/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType
index 1fd952a0a8..1fd952a0a8 100644
--- a/branches/sca-java-0.99/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/LICENSE
index 6b0b1270ff..6b0b1270ff 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/LICENSE
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/NOTICE
index a507b4f0b8..a507b4f0b8 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/NOTICE
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/pom.xml
index 860e4fbe50..860e4fbe50 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/pom.xml
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationInterface.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationInterface.java
index cfc98c711a..cfc98c711a 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationInterface.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationInterface.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
index af09013b6e..af09013b6e 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java
index c621794006..c621794006 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProviderFactory.java
index f6bf8a8b1e..f6bf8a8b1e 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProviderFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiInstanceWrapper.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiInstanceWrapper.java
index 4d221d6669..4d221d6669 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiInstanceWrapper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiInstanceWrapper.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java
index 59efe57bae..59efe57bae 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTargetInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTargetInvoker.java
index b128905703..b128905703 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTargetInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTargetInvoker.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/EquinoxRuntime.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/EquinoxRuntime.java
index 37fc76fca1..37fc76fca1 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/EquinoxRuntime.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/EquinoxRuntime.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/FelixRuntime.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/FelixRuntime.java
index 1ba8ce3c6b..1ba8ce3c6b 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/FelixRuntime.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/FelixRuntime.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/KnopflerfishRuntime.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/KnopflerfishRuntime.java
index 6a273015f3..6a273015f3 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/KnopflerfishRuntime.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/KnopflerfishRuntime.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRuntime.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRuntime.java
index cd416be39a..cd416be39a 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRuntime.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRuntime.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java
index a5d86bb92b..a5d86bb92b 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
index e2f2f81dce..e2f2f81dce 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 0f2b028e87..0f2b028e87 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 0f0fa03f75..0f0fa03f75 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiPropertyTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiPropertyTestCase.java
index 7f1c83ccf0..7f1c83ccf0 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiPropertyTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTestCase.java
index df986e7aae..df986e7aae 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRuntimeTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRuntimeTestCase.java
index 27a3db0776..27a3db0776 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRuntimeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRuntimeTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
index e8d89fe02b..e8d89fe02b 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
index 3e120f3767..3e120f3767 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
index 7a6181206f..7a6181206f 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
index 78b6d759a1..78b6d759a1 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCaseFIXME.java
index e342751ab9..e342751ab9 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCaseFIXME.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
index beda53f6fe..beda53f6fe 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
index 254ce99d59..254ce99d59 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
diff --git a/branches/sca-java-0.99/modules/implementation-osgi/src/test/resources/osgitest.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/resources/osgitest.composite
index 88cb92e422..88cb92e422 100644
--- a/branches/sca-java-0.99/modules/implementation-osgi/src/test/resources/osgitest.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-osgi/src/test/resources/osgitest.composite
diff --git a/branches/sca-java-0.99/modules/implementation-resource/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/implementation-resource/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/implementation-resource/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-0.99/modules/implementation-resource/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/LICENSE
diff --git a/branches/sca-java-0.99/modules/implementation-resource/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/NOTICE
index eb1926d971..eb1926d971 100644
--- a/branches/sca-java-0.99/modules/implementation-resource/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/NOTICE
diff --git a/branches/sca-java-0.99/modules/implementation-resource/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/pom.xml
index 9ca49a7ca0..9ca49a7ca0 100644
--- a/branches/sca-java-0.99/modules/implementation-resource/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/pom.xml
diff --git a/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
index ab99615571..ab99615571 100644
--- a/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
diff --git a/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
index 92d2fe5f0b..92d2fe5f0b 100644
--- a/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
diff --git a/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
index 95ac452c66..95ac452c66 100644
--- a/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
index d4db8772e4..d4db8772e4 100644
--- a/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
index dc52862f75..dc52862f75 100644
--- a/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
index 94f69ea2f9..94f69ea2f9 100644
--- a/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationInvoker.java
index a2c01c2e2b..a2c01c2e2b 100644
--- a/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationInvoker.java
diff --git a/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
index 816c97f1f2..816c97f1f2 100644
--- a/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
diff --git a/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
index b8ab28cfaa..b8ab28cfaa 100644
--- a/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index b5774c5c5b..b5774c5c5b 100644
--- a/branches/sca-java-0.99/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-0.99/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
index f77f723c3e..f77f723c3e 100644
--- a/branches/sca-java-0.99/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
diff --git a/branches/sca-java-0.99/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 656d8c2751..656d8c2751 100644
--- a/branches/sca-java-0.99/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-0.99/modules/implementation-resource/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
index cde06eb629..cde06eb629 100644
--- a/branches/sca-java-0.99/modules/implementation-resource/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-resource/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-java-0.99/modules/implementation-resource/src/test/resources/content/test.html
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/test/resources/content/test.html
diff --git a/branches/sca-java-0.99/modules/implementation-resource/src/test/resources/resource.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/test/resources/resource.composite
index 4654056cd7..4654056cd7 100644
--- a/branches/sca-java-0.99/modules/implementation-resource/src/test/resources/resource.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-resource/src/test/resources/resource.composite
diff --git a/branches/sca-java-0.99/modules/implementation-script/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/implementation-script/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/implementation-script/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/LICENSE
index 4b5ab74408..4b5ab74408 100644
--- a/branches/sca-java-0.99/modules/implementation-script/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/LICENSE
diff --git a/branches/sca-java-0.99/modules/implementation-script/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/NOTICE
index 9a03eabdab..9a03eabdab 100644
--- a/branches/sca-java-0.99/modules/implementation-script/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/NOTICE
diff --git a/branches/sca-java-0.99/modules/implementation-script/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/pom.xml
index 049bbba5fb..049bbba5fb 100644
--- a/branches/sca-java-0.99/modules/implementation-script/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/pom.xml
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
index ef2fce70ce..ef2fce70ce 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java
index 4ceb847a7a..4ceb847a7a 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java
index 5ededafc05..5ededafc05 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
index 08d17e07b2..08d17e07b2 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
index 4006728f72..4006728f72 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator
index c8152b606f..c8152b606f 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
index e3f81dd19b..e3f81dd19b 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java
index fd742f4279..fd742f4279 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java
index df9e7a5c46..df9e7a5c46 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java
index 709114ebad..709114ebad 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java
index ab76b9ca3d..ab76b9ca3d 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
index dedc8bce09..dedc8bce09 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
index 39161a447b..39161a447b 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
index e86119b72e..e86119b72e 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
index 9485f39faa..9485f39faa 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
index 56015b5f7c..56015b5f7c 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java
index e8a6cd9819..e8a6cd9819 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
index 2ccbd4d4b4..2ccbd4d4b4 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
index 79c204c759..79c204c759 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
index 8d9e7b119f..8d9e7b119f 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
index 996978e196..996978e196 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
index 73fcd77b44..73fcd77b44 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
index bd18153be8..bd18153be8 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
index 8220fcade8..8220fcade8 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
index abd3ff311d..abd3ff311d 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
index c2f1ce811d..c2f1ce811d 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
index 3f72c6cf45..3f72c6cf45 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
index 454843ea6c..454843ea6c 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
index 3c8b77e39f..3c8b77e39f 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
index 9caf7a715f..9caf7a715f 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
index 26c970a56b..26c970a56b 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.composite
index 77ba095988..77ba095988 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.composite
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite
index 4e71a4a3e6..4e71a4a3e6 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js
index beee72314d..beee72314d 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js
index 69a2f2e639..69a2f2e639 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
index ce377e4ed3..ce377e4ed3 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
index 4d32ed9f6b..4d32ed9f6b 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.composite
index 7ddf517b96..7ddf517b96 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.composite
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
index 13cb94d511..13cb94d511 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
index c641b82cd6..c641b82cd6 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
index bb0ddd002f..bb0ddd002f 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
index 9f89bd373e..9f89bd373e 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
index eac2ab283f..eac2ab283f 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
index f5dd0f8fcf..f5dd0f8fcf 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
index cd2d3bcaea..cd2d3bcaea 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
index 26574c6266..26574c6266 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
index a3551cefc3..a3551cefc3 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
index f72c6e922f..f72c6e922f 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
index bd754c8d2e..bd754c8d2e 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
index 06f261015e..06f261015e 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
index a7eb446d37..a7eb446d37 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
index 64df3ebbef..64df3ebbef 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
index 868cfa9eeb..868cfa9eeb 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
index 2844f8b8d9..2844f8b8d9 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
index 175bb79104..175bb79104 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
index 7581b633cc..7581b633cc 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
index 91085b9eb2..91085b9eb2 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
index 535164aae7..535164aae7 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
index 3edd075126..3edd075126 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
index 5d2216d583..5d2216d583 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
index ad0a932d26..ad0a932d26 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
index aee8bf991d..aee8bf991d 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
diff --git a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
index 87f0f56082..87f0f56082 100644
--- a/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
diff --git a/branches/sca-java-0.99/modules/implementation-spring/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/.ruleset
index ac8671859d..ac8671859d 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/.ruleset
diff --git a/branches/sca-java-0.99/modules/implementation-spring/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/implementation-spring/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/LICENSE
diff --git a/branches/sca-java-0.99/modules/implementation-spring/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/NOTICE
diff --git a/branches/sca-java-0.99/modules/implementation-spring/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/pom.xml
index df82e820a3..df82e820a3 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/pom.xml
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java
index b550fc3229..b550fc3229 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java
index 2d298b1dd8..2d298b1dd8 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java
index d1be4b4c18..d1be4b4c18 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java
index 37389ef655..37389ef655 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java
index c4fe5aff87..c4fe5aff87 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java
index fa45cbf652..fa45cbf652 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java
index ce2d00478f..ce2d00478f 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringArtifactProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringArtifactProcessor.java
index 670745ccae..670745ccae 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringArtifactProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
index fe855e0c21..fe855e0c21 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
index ff0a4706ff..ff0a4706ff 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
index b17a3272e9..b17a3272e9 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java
index ff6070fd19..ff6070fd19 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
index 45c26f5f42..45c26f5f42 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
index bfbdb04f5b..bfbdb04f5b 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
index 5d677b6c26..5d677b6c26 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java
index 9fa7e47599..9fa7e47599 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
index 34b218dad2..34b218dad2 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
index ae191d6b45..ae191d6b45 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
index ceee459e3e..ceee459e3e 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
index b3f0b8bbf9..b3f0b8bbf9 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
index 9e55f30b46..9e55f30b46 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
index 85b29e5684..85b29e5684 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
index 7f9765e6ab..7f9765e6ab 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 7417fbf62b..7417fbf62b 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index ab707cfd68..ab707cfd68 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/resources/META-INF/spring.handlers b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
index 4e7df50291..4e7df50291 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/resources/META-INF/spring.schemas b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
index 4374e4f1b0..4374e4f1b0 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
index e20f4e8158..e20f4e8158 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
index 6640b990ca..6640b990ca 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
index 5d5344cd13..5d5344cd13 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
index 0b7d2525cf..0b7d2525cf 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
index 249067ab2d..249067ab2d 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
index 43bb685e32..43bb685e32 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
index 94f7e83f30..94f7e83f30 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
index 9603b50704..9603b50704 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
index 83a6898502..83a6898502 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
index 4aaac6fa6a..4aaac6fa6a 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
index 1a93b1a8f9..1a93b1a8f9 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
index 76926c44c9..76926c44c9 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
index 1d91dc341e..1d91dc341e 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
index f3e45d766f..f3e45d766f 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
index 3fd7e72be4..3fd7e72be4 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
index 48a5971711..48a5971711 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
index 0ad7b01e9d..0ad7b01e9d 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
index 0733f49de8..0733f49de8 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
index c7feddf87f..c7feddf87f 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
index d59205e066..d59205e066 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
index f366c6819f..f366c6819f 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml
index a181446ffb..a181446ffb 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml
index aef5a5524b..aef5a5524b 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml
index fb9fb03692..fb9fb03692 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
index 7595278e0e..7595278e0e 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
index 38b6151ee6..38b6151ee6 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
index fc32a0255a..fc32a0255a 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
index 6cfff8941b..6cfff8941b 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
index 3792f5b22f..3792f5b22f 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
diff --git a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/test.xml b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/test.xml
index 477ca69a38..477ca69a38 100644
--- a/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/test.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-spring/src/test/resources/test.xml
diff --git a/branches/sca-java-0.99/modules/implementation-xquery/LICENSE.txt b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/LICENSE.txt
index d645695673..d645695673 100644
--- a/branches/sca-java-0.99/modules/implementation-xquery/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/LICENSE.txt
diff --git a/branches/sca-java-0.99/modules/implementation-xquery/NOTICE.txt b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/sca-java-0.99/modules/implementation-xquery/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/NOTICE.txt
diff --git a/branches/sca-java-0.99/modules/implementation-xquery/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/pom.xml
index aa965ffc15..aa965ffc15 100644
--- a/branches/sca-java-0.99/modules/implementation-xquery/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/pom.xml
diff --git a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementation.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementation.java
index b061cad70d..b061cad70d 100644
--- a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementation.java
diff --git a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationFactory.java
index d04b5372ac..d04b5372ac 100644
--- a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationProvider.java
index a9397db42e..a9397db42e 100644
--- a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationProvider.java
diff --git a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationProviderFactory.java
index 91e8074654..91e8074654 100644
--- a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationProviderFactory.java
diff --git a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryInvokationException.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryInvokationException.java
index e9b8d7b775..e9b8d7b775 100644
--- a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryInvokationException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryInvokationException.java
diff --git a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryInvoker.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryInvoker.java
index cdf8f03581..cdf8f03581 100644
--- a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryInvoker.java
diff --git a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryModuleActivator.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryModuleActivator.java
index d5c655e9ba..d5c655e9ba 100644
--- a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryModuleActivator.java
diff --git a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/impl/XQueryImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
index 7cf55a1692..7cf55a1692 100644
--- a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/impl/XQueryImplementationImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/impl/XQueryImplementationImpl.java
index af837204b7..af837204b7 100644
--- a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/impl/XQueryImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/impl/XQueryImplementationImpl.java
diff --git a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/xml/XQueryArtifactProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/xml/XQueryArtifactProcessor.java
index 7877e84dab..7877e84dab 100644
--- a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/xml/XQueryArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/xml/XQueryArtifactProcessor.java
diff --git a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/xml/XQueryIntrospector.java b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/xml/XQueryIntrospector.java
index 2e3da7d61c..2e3da7d61c 100644
--- a/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/xml/XQueryIntrospector.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/xml/XQueryIntrospector.java
diff --git a/branches/sca-java-0.99/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 6bf9535169..6bf9535169 100644
--- a/branches/sca-java-0.99/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.99/modules/interface-java-xml/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.99/modules/interface-java-xml/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/.checkstyle
diff --git a/branches/sca-java-0.99/modules/interface-java-xml/.pmd b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.99/modules/interface-java-xml/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/.pmd
diff --git a/branches/sca-java-0.99/modules/interface-java-xml/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.99/modules/interface-java-xml/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/.ruleset
diff --git a/branches/sca-java-0.99/modules/interface-java-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/interface-java-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/interface-java-xml/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/interface-java-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/LICENSE
diff --git a/branches/sca-java-0.99/modules/interface-java-xml/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/interface-java-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/NOTICE
diff --git a/branches/sca-java-0.99/modules/interface-java-xml/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/pom.xml
index 09bef8a989..09bef8a989 100644
--- a/branches/sca-java-0.99/modules/interface-java-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/pom.xml
diff --git a/branches/sca-java-0.99/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
index 852f3dc3b5..852f3dc3b5 100644
--- a/branches/sca-java-0.99/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
diff --git a/branches/sca-java-0.99/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
index 10490ff78e..10490ff78e 100644
--- a/branches/sca-java-0.99/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-0.99/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
index 45e18c9f3d..45e18c9f3d 100644
--- a/branches/sca-java-0.99/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
diff --git a/branches/sca-java-0.99/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
index f440331e5c..f440331e5c 100644
--- a/branches/sca-java-0.99/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
diff --git a/branches/sca-java-0.99/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
index 3de6410596..3de6410596 100644
--- a/branches/sca-java-0.99/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
diff --git a/branches/sca-java-0.99/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
index dca38c9224..dca38c9224 100644
--- a/branches/sca-java-0.99/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-java-0.99/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
index 23ebf576e5..23ebf576e5 100644
--- a/branches/sca-java-0.99/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-0.99/modules/interface-java/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.99/modules/interface-java/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/.checkstyle
diff --git a/branches/sca-java-0.99/modules/interface-java/.pmd b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.99/modules/interface-java/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/.pmd
diff --git a/branches/sca-java-0.99/modules/interface-java/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.99/modules/interface-java/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/.ruleset
diff --git a/branches/sca-java-0.99/modules/interface-java/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/interface-java/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/interface-java/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/interface-java/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/LICENSE
diff --git a/branches/sca-java-0.99/modules/interface-java/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/interface-java/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/NOTICE
diff --git a/branches/sca-java-0.99/modules/interface-java/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/pom.xml
index 6f1f5d3d45..6f1f5d3d45 100644
--- a/branches/sca-java-0.99/modules/interface-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/pom.xml
diff --git a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
index 04ce2a76c6..04ce2a76c6 100644
--- a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
diff --git a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
index 700b3192f9..700b3192f9 100644
--- a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
diff --git a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
index e3a84c63f0..e3a84c63f0 100644
--- a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
diff --git a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
index 9225926269..9225926269 100644
--- a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
diff --git a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
index d43ebe558b..d43ebe558b 100644
--- a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
diff --git a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
index e3ced406be..e3ced406be 100644
--- a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
diff --git a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
index 2b5beb9087..2b5beb9087 100644
--- a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
diff --git a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
index 30015623bb..30015623bb 100644
--- a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
diff --git a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
index 78476af077..78476af077 100644
--- a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
diff --git a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/ExtensibleJavaInterfaceIntrospector.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/ExtensibleJavaInterfaceIntrospector.java
index 599de9093d..599de9093d 100644
--- a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/ExtensibleJavaInterfaceIntrospector.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/ExtensibleJavaInterfaceIntrospector.java
diff --git a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceIntrospector.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceIntrospector.java
index 50d7e8d628..50d7e8d628 100644
--- a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceIntrospector.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceIntrospector.java
diff --git a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
index 3bc03a528e..3bc03a528e 100644
--- a/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
diff --git a/branches/sca-java-0.99/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
index 5ba12ec137..5ba12ec137 100644
--- a/branches/sca-java-0.99/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
diff --git a/branches/sca-java-0.99/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
index 56d51edc62..56d51edc62 100644
--- a/branches/sca-java-0.99/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
diff --git a/branches/sca-java-0.99/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
index f90a5cb8a1..f90a5cb8a1 100644
--- a/branches/sca-java-0.99/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
diff --git a/branches/sca-java-0.99/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
index e71e608c76..e71e608c76 100644
--- a/branches/sca-java-0.99/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/.checkstyle
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/.pmd b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/.pmd
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/.ruleset
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/LICENSE
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/NOTICE
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/pom.xml
index e342b207a8..e342b207a8 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/pom.xml
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
index 7de5d5349f..7de5d5349f 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
index 635f88feb8..635f88feb8 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
index e3f562ec82..e3f562ec82 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
index 6c57fdf949..6c57fdf949 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelper.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelper.java
index e5cd9d9a15..e5cd9d9a15 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelper.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessor.java
index 02c5593f86..02c5593f86 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessor.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDModelResolver.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDModelResolver.java
index e74467c8b8..e74467c8b8 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDModelResolver.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/TestModelResolver.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/TestModelResolver.java
index 3c160a3bfa..3c160a3bfa 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/TestModelResolver.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
index 275f2fa8d8..275f2fa8d8 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
index 91586f7440..91586f7440 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
index 1960bcbca7..1960bcbca7 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
index 839e31d3e6..839e31d3e6 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
index 5385f12460..5385f12460 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
index 3696c8f073..3696c8f073 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
index 3a9468216f..3a9468216f 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
index e8fb4c6385..e8fb4c6385 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessorTestCase.java
index 9d4ee87ece..9d4ee87ece 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessorTestCase.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
index 875fdf35d2..875fdf35d2 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
index 3eb81b61bd..3eb81b61bd 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
index aea7046a3d..aea7046a3d 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
index 5e8e5dad0d..5e8e5dad0d 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
index 39cd5547d9..39cd5547d9 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
index 8e26f7b4b5..8e26f7b4b5 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
index c2210f4a94..c2210f4a94 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
index 529b395fd5..529b395fd5 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl
index 5e2c681d47..5e2c681d47 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl
index 0a7979e308..0a7979e308 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd
index 635ca25bfc..635ca25bfc 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd
diff --git a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd
index 300de931ec..300de931ec 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/.checkstyle
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/.pmd b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/.pmd
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/.ruleset
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/LICENSE
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/NOTICE
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/pom.xml
index 95afe3da36..95afe3da36 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/pom.xml
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
index 8f75de59e2..8f75de59e2 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
index 93941ac2eb..93941ac2eb 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
index ffa17d0a85..ffa17d0a85 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
index 92bebed7de..92bebed7de 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
index 59db17116b..59db17116b 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/XSDefinition.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/XSDefinition.java
index 1b990ab4bf..1b990ab4bf 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/XSDefinition.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/XSDefinition.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
index 1e7b4faa32..1e7b4faa32 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
index b5ff912878..b5ff912878 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
index ade34a2fdb..ade34a2fdb 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
index e10bc0d178..e10bc0d178 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
index 3719bbd79a..3719bbd79a 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
index 744e7c1bd5..744e7c1bd5 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
index ed42e05d2e..ed42e05d2e 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/XSDefinitionImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/XSDefinitionImpl.java
index 0c822013c9..0c822013c9 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/XSDefinitionImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/XSDefinitionImpl.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/DefaultWSDLInterfaceIntrospector.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/DefaultWSDLInterfaceIntrospector.java
index 4ca214ffc2..4ca214ffc2 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/DefaultWSDLInterfaceIntrospector.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/DefaultWSDLInterfaceIntrospector.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospector.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospector.java
index 3ba8a4866d..3ba8a4866d 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospector.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospector.java
diff --git a/branches/sca-java-0.99/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
index c11d22d7b2..c11d22d7b2 100644
--- a/branches/sca-java-0.99/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
diff --git a/branches/sca-java-0.99/modules/interface/.checkstyle b/sca-java-1.x/branches/sca-java-0.99/modules/interface/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.99/modules/interface/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/.checkstyle
diff --git a/branches/sca-java-0.99/modules/interface/.pmd b/sca-java-1.x/branches/sca-java-0.99/modules/interface/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.99/modules/interface/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/.pmd
diff --git a/branches/sca-java-0.99/modules/interface/.ruleset b/sca-java-1.x/branches/sca-java-0.99/modules/interface/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.99/modules/interface/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/.ruleset
diff --git a/branches/sca-java-0.99/modules/interface/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/interface/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/interface/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/interface/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/interface/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/interface/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/LICENSE
diff --git a/branches/sca-java-0.99/modules/interface/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/interface/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/interface/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/NOTICE
diff --git a/branches/sca-java-0.99/modules/interface/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/interface/pom.xml
index fb37272934..fb37272934 100644
--- a/branches/sca-java-0.99/modules/interface/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/pom.xml
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Base.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Base.java
index cc6f7fc45c..cc6f7fc45c 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Base.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Base.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
index ce00834572..ce00834572 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
index 2503c80f86..2503c80f86 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
index cce99b4674..cce99b4674 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
index 2ea3a75f0a..2ea3a75f0a 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
index 568a6c595c..568a6c595c 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
index 54edd3015a..54edd3015a 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
index f952a86478..f952a86478 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
index c4b2dd240d..c4b2dd240d 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
index b19805c5b1..b19805c5b1 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
index d9ff31ba92..d9ff31ba92 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
index 424303a4c7..424303a4c7 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
index 272acb56ed..272acb56ed 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
index c6c97e7036..c6c97e7036 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
index 33f397c71d..33f397c71d 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
index 63d1906fcb..63d1906fcb 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
index 54ae6e0ec8..54ae6e0ec8 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
index 21505df918..21505df918 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
index 1775e065aa..1775e065aa 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
index 5efa8ab15f..5efa8ab15f 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
index f835caabef..f835caabef 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
index 73aa244bbd..73aa244bbd 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
diff --git a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
index aeafe15df1..aeafe15df1 100644
--- a/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
diff --git a/branches/sca-java-0.99/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
index 424d9327ff..424d9327ff 100644
--- a/branches/sca-java-0.99/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
diff --git a/branches/sca-java-0.99/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
index 74d717854d..74d717854d 100644
--- a/branches/sca-java-0.99/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/java2wsdl/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/LICENSE
diff --git a/branches/sca-java-0.99/modules/java2wsdl/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/NOTICE
diff --git a/branches/sca-java-0.99/modules/java2wsdl/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/pom.xml
index 0d7ef8d99c..0d7ef8d99c 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/pom.xml
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
index b9b3e9841e..b9b3e9841e 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
index d5832e23aa..d5832e23aa 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
index 3323113af4..3323113af4 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
index e8f3db95b0..e8f3db95b0 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
index 1eed03334a..1eed03334a 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
index 5e7c5055f1..5e7c5055f1 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
index 3ea688ca06..3ea688ca06 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
index b23726f6fa..b23726f6fa 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
index fef03876cc..fef03876cc 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
index 319eb6c65a..319eb6c65a 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
index 339458a423..339458a423 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
index b7fd720d17..b7fd720d17 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
index 4ddb1666d1..4ddb1666d1 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
index e30ada3af5..e30ada3af5 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
index 788d162f34..788d162f34 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
index b30b8cd62b..b30b8cd62b 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/resources/META-INF/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
index 135b374357..135b374357 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
index dfebd77215..dfebd77215 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
index 85d767ea36..85d767ea36 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
index bf49d98888..bf49d98888 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
index cf83095852..cf83095852 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
index 901da8e551..901da8e551 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
index 78a64dcc64..78a64dcc64 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/test/resources/AccountService.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/resources/AccountService.wsdl
index 6f2fed1e2a..6f2fed1e2a 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/test/resources/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/resources/AccountService.wsdl
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
index 09d1a58589..09d1a58589 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/test/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/resources/helloworld.wsdl
index 051f604bb2..051f604bb2 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/test/resources/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/resources/helloworld.wsdl
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/test/resources/interopdoc.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/resources/interopdoc.wsdl
index 820c26ca34..820c26ca34 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/test/resources/interopdoc.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/resources/interopdoc.wsdl
diff --git a/branches/sca-java-0.99/modules/java2wsdl/src/test/resources/sequences.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/resources/sequences.xsd
index a565f3fa65..a565f3fa65 100644
--- a/branches/sca-java-0.99/modules/java2wsdl/src/test/resources/sequences.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/java2wsdl/src/test/resources/sequences.xsd
diff --git a/branches/sca-java-0.99/modules/jmx/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/jmx/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/jmx/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/jmx/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/LICENSE
diff --git a/branches/sca-java-0.99/modules/jmx/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/jmx/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/NOTICE
diff --git a/branches/sca-java-0.99/modules/jmx/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/pom.xml
index fb49a0dcc0..fb49a0dcc0 100644
--- a/branches/sca-java-0.99/modules/jmx/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/pom.xml
diff --git a/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java
index 58e205189c..58e205189c 100644
--- a/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java
diff --git a/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java
index 2fa3675b4f..2fa3675b4f 100644
--- a/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java
diff --git a/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/AbstractAgent.java b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/AbstractAgent.java
index 0172b15d8c..0172b15d8c 100644
--- a/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/AbstractAgent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/AbstractAgent.java
diff --git a/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/Agent.java b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/Agent.java
index 30727e21bf..30727e21bf 100644
--- a/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/Agent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/Agent.java
diff --git a/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/ManagementException.java b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/ManagementException.java
index 6ff8c14ac6..6ff8c14ac6 100644
--- a/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/ManagementException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/ManagementException.java
diff --git a/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/RmiAgent.java b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/RmiAgent.java
index f6fa58a77c..f6fa58a77c 100644
--- a/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/RmiAgent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/RmiAgent.java
diff --git a/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/AnnotationDrivenDynamicMBean.java b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/AnnotationDrivenDynamicMBean.java
index 3d16ff6a2a..3d16ff6a2a 100644
--- a/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/AnnotationDrivenDynamicMBean.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/AnnotationDrivenDynamicMBean.java
diff --git a/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentationException.java b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentationException.java
index a8ad1666d5..a8ad1666d5 100644
--- a/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentationException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentationException.java
diff --git a/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java
index 9e0f06ec13..9e0f06ec13 100644
--- a/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java
diff --git a/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/ReflectedDynamicMBean.java b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/ReflectedDynamicMBean.java
index b07787208c..b07787208c 100644
--- a/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/ReflectedDynamicMBean.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/ReflectedDynamicMBean.java
diff --git a/branches/sca-java-0.99/modules/maven-java2wsdl/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/maven-java2wsdl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/maven-java2wsdl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/maven-java2wsdl/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/maven-java2wsdl/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/maven-java2wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/maven-java2wsdl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/maven-java2wsdl/LICENSE
diff --git a/branches/sca-java-0.99/modules/maven-java2wsdl/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/maven-java2wsdl/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/maven-java2wsdl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/maven-java2wsdl/NOTICE
diff --git a/branches/sca-java-0.99/modules/maven-java2wsdl/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/maven-java2wsdl/pom.xml
index 824ca96335..824ca96335 100644
--- a/branches/sca-java-0.99/modules/maven-java2wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/maven-java2wsdl/pom.xml
diff --git a/branches/sca-java-0.99/modules/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java b/sca-java-1.x/branches/sca-java-0.99/modules/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java
index a5f6158dcd..a5f6158dcd 100644
--- a/branches/sca-java-0.99/modules/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java
diff --git a/branches/sca-java-0.99/modules/maven-wsdl2java/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/maven-wsdl2java/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/maven-wsdl2java/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/maven-wsdl2java/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/maven-wsdl2java/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/maven-wsdl2java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/maven-wsdl2java/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/maven-wsdl2java/LICENSE
diff --git a/branches/sca-java-0.99/modules/maven-wsdl2java/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/maven-wsdl2java/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/maven-wsdl2java/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/maven-wsdl2java/NOTICE
diff --git a/branches/sca-java-0.99/modules/maven-wsdl2java/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/maven-wsdl2java/pom.xml
index 175052970e..175052970e 100644
--- a/branches/sca-java-0.99/modules/maven-wsdl2java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/maven-wsdl2java/pom.xml
diff --git a/branches/sca-java-0.99/modules/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java b/sca-java-1.x/branches/sca-java-0.99/modules/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java
index 2d08c31326..2d08c31326 100644
--- a/branches/sca-java-0.99/modules/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java
diff --git a/branches/sca-java-0.99/modules/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java b/sca-java-1.x/branches/sca-java-0.99/modules/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java
index 3e6ebf0acc..3e6ebf0acc 100644
--- a/branches/sca-java-0.99/modules/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java
diff --git a/branches/sca-java-0.99/modules/policy-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/policy-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/policy-xml/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-0.99/modules/policy-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/LICENSE
diff --git a/branches/sca-java-0.99/modules/policy-xml/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/NOTICE
index eb1926d971..eb1926d971 100644
--- a/branches/sca-java-0.99/modules/policy-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/NOTICE
diff --git a/branches/sca-java-0.99/modules/policy-xml/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/pom.xml
index 575a8f4331..575a8f4331 100644
--- a/branches/sca-java-0.99/modules/policy-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/pom.xml
diff --git a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
index 56eedc7069..56eedc7069 100644
--- a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
diff --git a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
index 05622012bb..05622012bb 100644
--- a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
diff --git a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointProcessor.java
index 38ac4427c7..38ac4427c7 100644
--- a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointProcessor.java
diff --git a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
index 5929f67c5f..5929f67c5f 100644
--- a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
diff --git a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
index f2ad797383..f2ad797383 100644
--- a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
diff --git a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
index 087f83cd7d..087f83cd7d 100644
--- a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
diff --git a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
index fb242c50cf..fb242c50cf 100644
--- a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
diff --git a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
index a3d9d39875..a3d9d39875 100644
--- a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
diff --git a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsBuilder.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsBuilder.java
index 0cd110a805..0cd110a805 100644
--- a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsBuilder.java
diff --git a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsBuilderException.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsBuilderException.java
index 56d7756d9c..56d7756d9c 100644
--- a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsBuilderException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsBuilderException.java
diff --git a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsBuilderImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsBuilderImpl.java
index 6026f70340..6026f70340 100644
--- a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsBuilderImpl.java
diff --git a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsDocumentProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsDocumentProcessor.java
index 5536327d14..5536327d14 100644
--- a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsDocumentProcessor.java
diff --git a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsProcessor.java
index bccdb805e8..bccdb805e8 100644
--- a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsProcessor.java
diff --git a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsResolver.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsResolver.java
index 6ea08b92a9..6ea08b92a9 100644
--- a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsResolver.java
diff --git a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
index 9011529559..9011529559 100644
--- a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
diff --git a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/XAttr.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/XAttr.java
index eab38f8ca7..eab38f8ca7 100644
--- a/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/XAttr.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/XAttr.java
diff --git a/branches/sca-java-0.99/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
index b84e1ff748..b84e1ff748 100644
--- a/branches/sca-java-0.99/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
diff --git a/branches/sca-java-0.99/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
index 742742ddef..742742ddef 100644
--- a/branches/sca-java-0.99/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-java-0.99/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/definitions.xml b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/definitions.xml
index a6aaebb42d..a6aaebb42d 100644
--- a/branches/sca-java-0.99/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/definitions.xml
diff --git a/branches/sca-java-0.99/modules/policy/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/policy/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/policy/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/policy/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/policy/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/policy/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/LICENSE
diff --git a/branches/sca-java-0.99/modules/policy/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/policy/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/policy/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/NOTICE
diff --git a/branches/sca-java-0.99/modules/policy/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/policy/pom.xml
index bd5ab4b56b..bd5ab4b56b 100644
--- a/branches/sca-java-0.99/modules/policy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/pom.xml
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
index 2da41675a1..2da41675a1 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
index a9b9ac4884..a9b9ac4884 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
index 982af3929d..982af3929d 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
index 64aeb52678..64aeb52678 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
index 9bd51d4745..9bd51d4745 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
index 9dd0be314b..9dd0be314b 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
index ec4bded7da..ec4bded7da 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
index c0f2087ca6..c0f2087ca6 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
index f782080618..f782080618 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
index 42e6fab199..42e6fab199 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
index e1f14a3215..e1f14a3215 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
index ff9fe89c62..ff9fe89c62 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
index 6c859283c6..6c859283c6 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/SCADefinitions.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/SCADefinitions.java
index 12c2dd915c..12c2dd915c 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/SCADefinitions.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/SCADefinitions.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
index 76e17e83f2..76e17e83f2 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/DefaultIntentAttachPointTypeFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/DefaultIntentAttachPointTypeFactoryImpl.java
index 76b00075ea..76b00075ea 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/DefaultIntentAttachPointTypeFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/DefaultIntentAttachPointTypeFactoryImpl.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
index c4c5c0afce..c4c5c0afce 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
index 757e4bcfc7..757e4bcfc7 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
index aab03281ba..aab03281ba 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
index 1db29b835e..1db29b835e 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
index 9664bd5c0c..9664bd5c0c 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
index 33887a784b..33887a784b 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
index cdab3bcda2..cdab3bcda2 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
index e418e399ca..e418e399ca 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
diff --git a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/SCADefinitionsImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/SCADefinitionsImpl.java
index f4d1f33fad..f4d1f33fad 100644
--- a/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/SCADefinitionsImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/SCADefinitionsImpl.java
diff --git a/branches/sca-java-0.99/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
index d7f87b1c5d..d7f87b1c5d 100644
--- a/branches/sca-java-0.99/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
diff --git a/branches/sca-java-0.99/modules/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/pom.xml
index dadeba7f68..dadeba7f68 100644
--- a/branches/sca-java-0.99/modules/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/pom.xml
diff --git a/branches/sca-java-0.99/modules/sca-api/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/sca-api/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/sca-api/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/sca-api/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/LICENSE
diff --git a/branches/sca-java-0.99/modules/sca-api/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/sca-api/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/NOTICE
diff --git a/branches/sca-java-0.99/modules/sca-api/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/pom.xml
index 628c7a8028..628c7a8028 100644
--- a/branches/sca-java-0.99/modules/sca-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/pom.xml
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
index c32d229a76..c32d229a76 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
index 616d4c6338..616d4c6338 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/Constants.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
index b1b2af8048..b1b2af8048 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
index 64423a4aa2..64423a4aa2 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
index 63e3907cff..63e3907cff 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
index 7c067a3a43..7c067a3a43 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
index 900d5eecc1..900d5eecc1 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
index 8790aac4fb..8790aac4fb 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
index 1c6b436afa..1c6b436afa 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
index d3543799ed..d3543799ed 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
index bab9713026..bab9713026 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
index 1d1ecdbc13..1d1ecdbc13 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
index a9fc36f769..a9fc36f769 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
index 477053670a..477053670a 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
index f54e421c81..f54e421c81 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
index 86d2d6560d..86d2d6560d 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
index 37f767c1f4..37f767c1f4 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
index 51d5ae76ca..51d5ae76ca 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
index 13ca9a2931..13ca9a2931 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
index f16bf44808..f16bf44808 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
index 7d3da46ea9..7d3da46ea9 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
index b9483bc9a8..b9483bc9a8 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
index 9e6942651b..9e6942651b 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
index 32654fea17..32654fea17 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
index 1a9288934c..1a9288934c 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
index 0769a94fbb..0769a94fbb 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
index fbc7398da4..fbc7398da4 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
index 57247cd8a3..57247cd8a3 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
index 864a69b19a..864a69b19a 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
index a0abe16068..a0abe16068 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
index e07f70c2fe..e07f70c2fe 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
index 1021f6e37f..1021f6e37f 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
index aa439cabab..aa439cabab 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
index 6fded2dec8..6fded2dec8 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
diff --git a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
index 1e475cd4c8..1e475cd4c8 100644
--- a/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
diff --git a/branches/sca-java-0.99/modules/topology-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/topology-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/topology-xml/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/topology-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/LICENSE
diff --git a/branches/sca-java-0.99/modules/topology-xml/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/topology-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/NOTICE
diff --git a/branches/sca-java-0.99/modules/topology-xml/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/pom.xml
index 6d58011256..6d58011256 100644
--- a/branches/sca-java-0.99/modules/topology-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/pom.xml
diff --git a/branches/sca-java-0.99/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/BaseArtifactProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/BaseArtifactProcessor.java
index 97d596a42e..97d596a42e 100644
--- a/branches/sca-java-0.99/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/BaseArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/BaseArtifactProcessor.java
diff --git a/branches/sca-java-0.99/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/Constants.java b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/Constants.java
index fc450db3b5..fc450db3b5 100644
--- a/branches/sca-java-0.99/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/Constants.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/Constants.java
diff --git a/branches/sca-java-0.99/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/TopologyDocumentProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/TopologyDocumentProcessor.java
index 568e4969e1..568e4969e1 100644
--- a/branches/sca-java-0.99/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/TopologyDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/TopologyDocumentProcessor.java
diff --git a/branches/sca-java-0.99/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/TopologyProcessor.java b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/TopologyProcessor.java
index 177133e109..177133e109 100644
--- a/branches/sca-java-0.99/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/TopologyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/TopologyProcessor.java
diff --git a/branches/sca-java-0.99/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/XAttr.java b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/XAttr.java
index 65f992e3e7..65f992e3e7 100644
--- a/branches/sca-java-0.99/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/XAttr.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/XAttr.java
diff --git a/branches/sca-java-0.99/modules/topology-xml/src/test/java/org/apache/tuscany/sca/topology/xml/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/src/test/java/org/apache/tuscany/sca/topology/xml/ReadDocumentTestCase.java
index ad7b2c5d37..ad7b2c5d37 100644
--- a/branches/sca-java-0.99/modules/topology-xml/src/test/java/org/apache/tuscany/sca/topology/xml/ReadDocumentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/src/test/java/org/apache/tuscany/sca/topology/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-java-0.99/modules/topology-xml/src/test/java/org/apache/tuscany/sca/topology/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/src/test/java/org/apache/tuscany/sca/topology/xml/TestModelResolver.java
index b079958f8a..b079958f8a 100644
--- a/branches/sca-java-0.99/modules/topology-xml/src/test/java/org/apache/tuscany/sca/topology/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/src/test/java/org/apache/tuscany/sca/topology/xml/TestModelResolver.java
diff --git a/branches/sca-java-0.99/modules/topology-xml/src/test/resources/org/apache/tuscany/sca/topology/xml/runtime.topology b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/src/test/resources/org/apache/tuscany/sca/topology/xml/runtime.topology
index f1c625052b..f1c625052b 100644
--- a/branches/sca-java-0.99/modules/topology-xml/src/test/resources/org/apache/tuscany/sca/topology/xml/runtime.topology
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology-xml/src/test/resources/org/apache/tuscany/sca/topology/xml/runtime.topology
diff --git a/branches/sca-java-0.99/modules/topology/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/topology/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/topology/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/topology/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/topology/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/topology/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology/LICENSE
diff --git a/branches/sca-java-0.99/modules/topology/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/topology/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/topology/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology/NOTICE
diff --git a/branches/sca-java-0.99/modules/topology/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/topology/pom.xml
index 56ba0d72b4..56ba0d72b4 100644
--- a/branches/sca-java-0.99/modules/topology/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology/pom.xml
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Component.java b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Component.java
index 512fa19645..512fa19645 100644
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Component.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Component.java
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/DefaultTopologyFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/DefaultTopologyFactory.java
index ddeeac9a93..ddeeac9a93 100644
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/DefaultTopologyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/DefaultTopologyFactory.java
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Node.java b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Node.java
index a44e998e43..a44e998e43 100644
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Node.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Node.java
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Runtime.java b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Runtime.java
index 7775a3878f..7775a3878f 100644
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Runtime.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Runtime.java
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Scheme.java b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Scheme.java
index 794e43e8a6..794e43e8a6 100644
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Scheme.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Scheme.java
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/TopologyFactory.java b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/TopologyFactory.java
index 020b15ea17..020b15ea17 100644
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/TopologyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/TopologyFactory.java
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/ComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/ComponentImpl.java
index 68364e3420..68364e3420 100644
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/ComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/ComponentImpl.java
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/NodeImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/NodeImpl.java
index 0200376caa..0200376caa 100644
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/NodeImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/NodeImpl.java
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/RuntimeImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/RuntimeImpl.java
index 9a4568deee..9a4568deee 100644
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/RuntimeImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/RuntimeImpl.java
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/SchemeImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/SchemeImpl.java
index ffd08cef92..ffd08cef92 100644
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/SchemeImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/SchemeImpl.java
diff --git a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/TopologyFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/TopologyFactoryImpl.java
index 793ed4a06d..793ed4a06d 100644
--- a/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/TopologyFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/TopologyFactoryImpl.java
diff --git a/branches/sca-java-0.99/modules/topology/src/test/java/org/apache/tuscany/sca/topology/TopologyFactoryTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/test/java/org/apache/tuscany/sca/topology/TopologyFactoryTestCase.java
index 0cf572ba57..0cf572ba57 100644
--- a/branches/sca-java-0.99/modules/topology/src/test/java/org/apache/tuscany/sca/topology/TopologyFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/topology/src/test/java/org/apache/tuscany/sca/topology/TopologyFactoryTestCase.java
diff --git a/branches/sca-java-0.99/modules/wsdl2java/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.99/modules/wsdl2java/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/DISCLAIMER
diff --git a/branches/sca-java-0.99/modules/wsdl2java/LICENSE b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.99/modules/wsdl2java/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/LICENSE
diff --git a/branches/sca-java-0.99/modules/wsdl2java/NOTICE b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.99/modules/wsdl2java/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/NOTICE
diff --git a/branches/sca-java-0.99/modules/wsdl2java/pom.xml b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/pom.xml
index 1d8bf2acd1..1d8bf2acd1 100644
--- a/branches/sca-java-0.99/modules/wsdl2java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/pom.xml
diff --git a/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
index ebd5e72146..ebd5e72146 100644
--- a/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
diff --git a/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
index 83ae455289..83ae455289 100644
--- a/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
diff --git a/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
index c48814c5ac..c48814c5ac 100644
--- a/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
diff --git a/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
index 4ab152fb90..4ab152fb90 100644
--- a/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
diff --git a/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
index 2d81ef12bf..2d81ef12bf 100644
--- a/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
diff --git a/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
index d72baeed81..d72baeed81 100644
--- a/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
diff --git a/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
index d0b325982c..d0b325982c 100644
--- a/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
diff --git a/branches/sca-java-0.99/modules/wsdl2java/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/main/resources/META-INF/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/sca-java-0.99/modules/wsdl2java/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-0.99/modules/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
index 00714af44b..00714af44b 100644
--- a/branches/sca-java-0.99/modules/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
diff --git a/branches/sca-java-0.99/modules/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
index 2d173384b3..2d173384b3 100644
--- a/branches/sca-java-0.99/modules/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
diff --git a/branches/sca-java-0.99/modules/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
index e9e8aa882a..e9e8aa882a 100644
--- a/branches/sca-java-0.99/modules/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
diff --git a/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/AccountService.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/AccountService.wsdl
index 6f2fed1e2a..6f2fed1e2a 100644
--- a/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/AccountService.wsdl
diff --git a/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
index dda5a36085..dda5a36085 100644
--- a/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
diff --git a/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
index 09d1a58589..09d1a58589 100644
--- a/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
diff --git a/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/helloworld.wsdl
index 051f604bb2..051f604bb2 100644
--- a/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/helloworld.wsdl
diff --git a/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/interopdoc.wsdl b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/interopdoc.wsdl
index 820c26ca34..820c26ca34 100644
--- a/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/interopdoc.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/interopdoc.wsdl
diff --git a/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/sequences.xsd b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/sequences.xsd
index a565f3fa65..a565f3fa65 100644
--- a/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/sequences.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/modules/wsdl2java/src/test/resources/sequences.xsd
diff --git a/branches/sca-java-0.99/pom.xml b/sca-java-1.x/branches/sca-java-0.99/pom.xml
index 344feead9e..344feead9e 100644
--- a/branches/sca-java-0.99/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/pom.xml
diff --git a/branches/sca-java-0.99/samples/README b/sca-java-1.x/branches/sca-java-0.99/samples/README
index 67c84f3c37..67c84f3c37 100644
--- a/branches/sca-java-0.99/samples/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/README
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/README b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/README
index 94716b151f..94716b151f 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/README
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/build.xml
index 5df5981bea..5df5981bea 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/build.xml
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/pom.xml
index 2c7dd5cbc5..2c7dd5cbc5 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/pom.xml
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
index 16948874d1..16948874d1 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
index 0f6fee82be..0f6fee82be 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
index af759dbf93..af759dbf93 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
index bf91880f76..bf91880f76 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
index cd6ad97193..cd6ad97193 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
index 91697fcd9a..91697fcd9a 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
index 485386cea8..485386cea8 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
index ba74d8f99a..ba74d8f99a 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
index 06c8df0080..06c8df0080 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
index 43354d1e90..43354d1e90 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
index 33dc761aa4..33dc761aa4 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
index 49d195395b..49d195395b 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
index 7d38e3b7a8..7d38e3b7a8 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
index 72b8002238..72b8002238 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
index deda8d9744..deda8d9744 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
index ffadfc7fff..ffadfc7fff 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
index 6fa5f26977..6fa5f26977 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
index cf55b36fc2..cf55b36fc2 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
index ac610cfb51..ac610cfb51 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
index 0ac113df07..0ac113df07 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
index 8ea2395d04..8ea2395d04 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
index 32336dd94f..32336dd94f 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
index 55be293862..55be293862 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index efa475ef92..efa475ef92 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/Echo.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/Echo.java
index 1d5e973f33..1d5e973f33 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/Echo.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/Echo.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
index ba68dfe908..ba68dfe908 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
index 7383077f18..7383077f18 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
index ab05516622..ab05516622 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/resources/EchoBinding.composite b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
index ecb6063010..ecb6063010 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/resources/definitions.xml b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/test/resources/definitions.xml
index a742804fb8..a742804fb8 100644
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo-extension/src/test/resources/definitions.xml
diff --git a/branches/sca-java-0.99/samples/binding-echo/README b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo/README
index 0aea36a081..0aea36a081 100644
--- a/branches/sca-java-0.99/samples/binding-echo/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo/README
diff --git a/branches/sca-java-0.99/samples/binding-echo/binding-echo.png b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo/binding-echo.png
index a38d985363..a38d985363 100644
--- a/branches/sca-java-0.99/samples/binding-echo/binding-echo.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo/binding-echo.png
diff --git a/branches/sca-java-0.99/samples/binding-echo/binding-echo.svg b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo/binding-echo.svg
index 5b5051bef5..5b5051bef5 100644
--- a/branches/sca-java-0.99/samples/binding-echo/binding-echo.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo/binding-echo.svg
diff --git a/branches/sca-java-0.99/samples/binding-echo/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo/build.xml
index 7689ef3a54..7689ef3a54 100644
--- a/branches/sca-java-0.99/samples/binding-echo/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo/build.xml
diff --git a/branches/sca-java-0.99/samples/binding-echo/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo/pom.xml
index ed85cf6c47..ed85cf6c47 100644
--- a/branches/sca-java-0.99/samples/binding-echo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo/pom.xml
diff --git a/branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/Echo.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/Echo.java
index 1d5e973f33..1d5e973f33 100644
--- a/branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/Echo.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/Echo.java
diff --git a/branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/EchoBindingClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
index 21bdff4011..21bdff4011 100644
--- a/branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
diff --git a/branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
index ba68dfe908..ba68dfe908 100644
--- a/branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-java-0.99/samples/binding-echo/src/main/resources/EchoBinding.composite b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo/src/main/resources/EchoBinding.composite
index 94612fb325..94612fb325 100644
--- a/branches/sca-java-0.99/samples/binding-echo/src/main/resources/EchoBinding.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo/src/main/resources/EchoBinding.composite
diff --git a/branches/sca-java-0.99/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
index 1a597fc80f..1a597fc80f 100644
--- a/branches/sca-java-0.99/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/README b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/README
index eb3322cf9b..eb3322cf9b 100644
--- a/branches/sca-java-0.99/samples/binding-notification-broker/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/README
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/binding-notification-broker.png b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/binding-notification-broker.png
index 49030650f2..49030650f2 100644
--- a/branches/sca-java-0.99/samples/binding-notification-broker/binding-notification-broker.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/binding-notification-broker.png
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/pom.xml
index d002219743..d002219743 100644
--- a/branches/sca-java-0.99/samples/binding-notification-broker/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/pom.xml
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
index 35fa1a9ee9..35fa1a9ee9 100644
--- a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
index d5bc8fbb50..d5bc8fbb50 100644
--- a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
index a89fa8a913..a89fa8a913 100644
--- a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
index 8caefaf1d2..8caefaf1d2 100644
--- a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
index 430e9d6db7..430e9d6db7 100644
--- a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
index 031f6aafd0..031f6aafd0 100644
--- a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
index 1a369d880d..1a369d880d 100644
--- a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
index b823bbebcc..b823bbebcc 100644
--- a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/branches/sca-java-0.99/samples/binding-notification-consumer/README b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-consumer/README
index 00340765e2..00340765e2 100644
--- a/branches/sca-java-0.99/samples/binding-notification-consumer/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-consumer/README
diff --git a/branches/sca-java-0.99/samples/binding-notification-consumer/binding-notification-consumer.png b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-consumer/binding-notification-consumer.png
index 33e1966c3e..33e1966c3e 100644
--- a/branches/sca-java-0.99/samples/binding-notification-consumer/binding-notification-consumer.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-consumer/binding-notification-consumer.png
diff --git a/branches/sca-java-0.99/samples/binding-notification-consumer/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-consumer/pom.xml
index 677c96e5e1..677c96e5e1 100644
--- a/branches/sca-java-0.99/samples/binding-notification-consumer/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-consumer/pom.xml
diff --git a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
index 0efd1195bc..0efd1195bc 100644
--- a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
diff --git a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
index 6b88389d0c..6b88389d0c 100644
--- a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
diff --git a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
index 0f4e037df9..0f4e037df9 100644
--- a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
diff --git a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
index 031f6aafd0..031f6aafd0 100644
--- a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
index e6ef9ee09a..e6ef9ee09a 100644
--- a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
index b823bbebcc..b823bbebcc 100644
--- a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/README b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/README
index 6fb124bf9b..6fb124bf9b 100644
--- a/branches/sca-java-0.99/samples/binding-notification-producer/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/README
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/binding-notification-producer.png b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/binding-notification-producer.png
index 34c347c893..34c347c893 100644
--- a/branches/sca-java-0.99/samples/binding-notification-producer/binding-notification-producer.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/binding-notification-producer.png
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/pom.xml
index b172f56305..b172f56305 100644
--- a/branches/sca-java-0.99/samples/binding-notification-producer/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/pom.xml
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
index be80e71249..be80e71249 100644
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
index 39f06d5dde..39f06d5dde 100644
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
index 7d49b00607..7d49b00607 100644
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
index 235b180be8..235b180be8 100644
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
index 031f6aafd0..031f6aafd0 100644
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
index 3f8436cb24..3f8436cb24 100644
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
index b823bbebcc..b823bbebcc 100644
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
index e01175cfeb..e01175cfeb 100644
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/TrafficAdvisoryNotification.componentType
index 031f6aafd0..031f6aafd0 100644
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/TrafficAdvisoryNotification.componentType
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/TrafficAdvisoryNotification.composite
index f4b4f2d5f2..f4b4f2d5f2 100644
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/TrafficAdvisoryNotification.composite
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/wsdl/TrafficAdvisory.wsdl b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/wsdl/TrafficAdvisory.wsdl
index b823bbebcc..b823bbebcc 100644
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/wsdl/TrafficAdvisory.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/README b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/README
index 81dd0c64e6..81dd0c64e6 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/README
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/build.xml
index 96c79607ca..96c79607ca 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/build.xml
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/calculator-distributed.png b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/calculator-distributed.png
index 7c0e175664..7c0e175664 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/calculator-distributed.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/calculator-distributed.png
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/calculator-distributed.svg b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/calculator-distributed.svg
index be5a4b8185..be5a4b8185 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/calculator-distributed.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/calculator-distributed.svg
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/pom.xml
index 51f0f3cbe8..51f0f3cbe8 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/pom.xml
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/AddService.java
index d7dc4473ad..d7dc4473ad 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
index e9b7e254e5..e9b7e254e5 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
index da869e00fd..da869e00fd 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
index 78ab9c6ee0..78ab9c6ee0 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
index 1010207154..1010207154 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/node/CalculatorNode.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/node/CalculatorNode.java
index bb939816bb..bb939816bb 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/node/CalculatorNode.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/node/CalculatorNode.java
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/node/DomainNode.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/node/DomainNode.java
index 9abfc03606..9abfc03606 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/node/DomainNode.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/node/DomainNode.java
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/META-INF/sca-contribution.xml
index 3f9ed8024b..3f9ed8024b 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/domain.composite b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/domain.composite
index a11d94aa93..a11d94aa93 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/domain.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/domain.composite
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/META-INF/sca-contribution.xml
index b73217ebb8..b73217ebb8 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/management.composite b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/management.composite
index 68f466344a..68f466344a 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/management.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/management.composite
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
index a111dfd064..a111dfd064 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
index 3f9ed8024b..3f9ed8024b 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
index bf226d9109..bf226d9109 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 3f9ed8024b..3f9ed8024b 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
index 4ef4c5ddb6..4ef4c5ddb6 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
index 3f9ed8024b..3f9ed8024b 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java
index a6d47115a6..a6d47115a6 100644
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/README b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/README
index 837b5ce75f..837b5ce75f 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/README
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/build.xml
index 30817fe6f0..30817fe6f0 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/build.xml
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/calculator-rmi-reference.png b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/calculator-rmi-reference.png
index 8c76b77a9f..8c76b77a9f 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/calculator-rmi-reference.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/calculator-rmi-reference.png
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/calculator-rmi-reference.svg b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/calculator-rmi-reference.svg
index ba802e6717..ba802e6717 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/calculator-rmi-reference.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/calculator-rmi-reference.svg
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/pom.xml
index 80b5252cdb..80b5252cdb 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/pom.xml
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
index cd1076c3f1..cd1076c3f1 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
index d310dad4b1..d310dad4b1 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
index f28f0ca179..f28f0ca179 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
index a5a6e1cd29..a5a6e1cd29 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 15e00f5946..15e00f5946 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/README b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/README
index 454cdc0d37..454cdc0d37 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/README
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/build.xml
index f98f35e4b0..f98f35e4b0 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/build.xml
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/calculator-rmi-service.png b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/calculator-rmi-service.png
index 574f5eb14b..574f5eb14b 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/calculator-rmi-service.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/calculator-rmi-service.png
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/calculator-rmi-service.svg b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/calculator-rmi-service.svg
index 9253110f98..9253110f98 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/calculator-rmi-service.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/calculator-rmi-service.svg
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/pom.xml
index fc1ca5f734..fc1ca5f734 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/pom.xml
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
index b698163c1b..b698163c1b 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
index 3ddcef61df..3ddcef61df 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
index f28f0ca179..f28f0ca179 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
index 86322c248c..86322c248c 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 8943dd24f6..8943dd24f6 100644
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/branches/sca-java-0.99/samples/calculator-script/README b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/README
index ab1dda13df..ab1dda13df 100644
--- a/branches/sca-java-0.99/samples/calculator-script/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/README
diff --git a/branches/sca-java-0.99/samples/calculator-script/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/build.xml
index 429d638ca5..429d638ca5 100644
--- a/branches/sca-java-0.99/samples/calculator-script/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/build.xml
diff --git a/branches/sca-java-0.99/samples/calculator-script/calculator-script.png b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/calculator-script.png
index d3f8c491c3..d3f8c491c3 100644
--- a/branches/sca-java-0.99/samples/calculator-script/calculator-script.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/calculator-script.png
diff --git a/branches/sca-java-0.99/samples/calculator-script/calculator-script.svg b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/calculator-script.svg
index 16939f9310..16939f9310 100644
--- a/branches/sca-java-0.99/samples/calculator-script/calculator-script.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/calculator-script.svg
diff --git a/branches/sca-java-0.99/samples/calculator-script/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/pom.xml
index 0178233717..0178233717 100644
--- a/branches/sca-java-0.99/samples/calculator-script/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/pom.xml
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
index 243d1562dc..243d1562dc 100644
--- a/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/resources/Calculator.composite
index 8a765e6153..8a765e6153 100644
--- a/branches/sca-java-0.99/samples/calculator-script/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
index 1d4d221364..1d4d221364 100644
--- a/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
index d6f27ca7f5..d6f27ca7f5 100644
--- a/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
index 132a1d13b0..132a1d13b0 100644
--- a/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
index fea8f62110..fea8f62110 100644
--- a/branches/sca-java-0.99/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/README b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/README
index 0e97f4de33..0e97f4de33 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/README
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/build.xml
index 7c54e9607d..7c54e9607d 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/build.xml
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/calculator-web.png b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/calculator-web.png
index f482b8d1c8..f482b8d1c8 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/calculator-web.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/calculator-web.png
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/calculator-web.svg b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/calculator-web.svg
index cccb797ba4..cccb797ba4 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/calculator-web.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/calculator-web.svg
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/pom.xml
index 0b89ecbfa6..0b89ecbfa6 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/pom.xml
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/AddService.java
index c3c789e745..c3c789e745 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/AddServiceImpl.java
index a7049729f7..a7049729f7 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorClient.java
index 4787b728f4..4787b728f4 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorServiceImpl.java
index bf3b0303ec..bf3b0303ec 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/resources/Calculator.composite
index ce64b086ca..ce64b086ca 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/resources/wsdl/add.wsdl b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/resources/wsdl/add.wsdl
index 40a3d873d3..40a3d873d3 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/resources/wsdl/add.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/resources/wsdl/add.wsdl
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/META-INF/sca-contribution.xml
index fe09ab2e1b..fe09ab2e1b 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/WEB-INF/web.xml
index c9cde16f84..c9cde16f84 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/calc.jsp
index 375116e5de..375116e5de 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/README b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/README
index c88b92b206..c88b92b206 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/README
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/build.xml
index 3a39fe015c..3a39fe015c 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/build.xml
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/calculator-web.png b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/calculator-web.png
index 896ddc4093..896ddc4093 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp/calculator-web.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/calculator-web.png
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/calculator-web.svg b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/calculator-web.svg
index 00ed27556f..00ed27556f 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp/calculator-web.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/calculator-web.svg
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/pom.xml
index b851144656..b851144656 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/pom.xml
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
index 4787b728f4..4787b728f4 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index bf3b0303ec..bf3b0303ec 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/resources/Calculator.composite
index 50c23af0b2..50c23af0b2 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
index fe09ab2e1b..fe09ab2e1b 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
index a37b430860..a37b430860 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/calc.jsp
index 375116e5de..375116e5de 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
index 4ce3acf46a..4ce3acf46a 100644
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-0.99/samples/calculator/README b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/README
index ceb532faed..ceb532faed 100644
--- a/branches/sca-java-0.99/samples/calculator/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/README
diff --git a/branches/sca-java-0.99/samples/calculator/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/build.xml
index c4b755ef94..c4b755ef94 100644
--- a/branches/sca-java-0.99/samples/calculator/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/build.xml
diff --git a/branches/sca-java-0.99/samples/calculator/calculator.png b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-java-0.99/samples/calculator/calculator.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/calculator.png
diff --git a/branches/sca-java-0.99/samples/calculator/calculator.svg b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/calculator.svg
index 0615925c50..0615925c50 100644
--- a/branches/sca-java-0.99/samples/calculator/calculator.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/calculator.svg
diff --git a/branches/sca-java-0.99/samples/calculator/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/pom.xml
index 0d652f5622..0d652f5622 100644
--- a/branches/sca-java-0.99/samples/calculator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/pom.xml
diff --git a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/CalculatorClient.java
index 9d180bf52e..9d180bf52e 100644
--- a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/calculator/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/resources/Calculator.composite
index 90872041b0..90872041b0 100644
--- a/branches/sca-java-0.99/samples/calculator/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-0.99/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
index a5735a8701..a5735a8701 100644
--- a/branches/sca-java-0.99/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-0.99/samples/chat-webapp/README b/sca-java-1.x/branches/sca-java-0.99/samples/chat-webapp/README
index dddd7e3f94..dddd7e3f94 100644
--- a/branches/sca-java-0.99/samples/chat-webapp/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/chat-webapp/README
diff --git a/branches/sca-java-0.99/samples/chat-webapp/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/chat-webapp/build.xml
index 1fba79520f..1fba79520f 100644
--- a/branches/sca-java-0.99/samples/chat-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/chat-webapp/build.xml
diff --git a/branches/sca-java-0.99/samples/chat-webapp/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/chat-webapp/pom.xml
index 7b749de6ae..7b749de6ae 100644
--- a/branches/sca-java-0.99/samples/chat-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/chat-webapp/pom.xml
diff --git a/branches/sca-java-0.99/samples/chat-webapp/src/main/java/sample/ChatService.java b/sca-java-1.x/branches/sca-java-0.99/samples/chat-webapp/src/main/java/sample/ChatService.java
index 1fb9d292cd..1fb9d292cd 100644
--- a/branches/sca-java-0.99/samples/chat-webapp/src/main/java/sample/ChatService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/chat-webapp/src/main/java/sample/ChatService.java
diff --git a/branches/sca-java-0.99/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
index 7d0bfb3307..7d0bfb3307 100644
--- a/branches/sca-java-0.99/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/chat-webapp/src/main/resources/chat.composite b/sca-java-1.x/branches/sca-java-0.99/samples/chat-webapp/src/main/resources/chat.composite
index c9ce95e2dc..c9ce95e2dc 100644
--- a/branches/sca-java-0.99/samples/chat-webapp/src/main/resources/chat.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/chat-webapp/src/main/resources/chat.composite
diff --git a/branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 897849ff8d..897849ff8d 100644
--- a/branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
index 65d486a215..65d486a215 100644
--- a/branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/chat.html b/sca-java-1.x/branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/chat.html
index fc80921e48..fc80921e48 100644
--- a/branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/chat.html
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/chat.html
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/build.xml
index feef76481b..feef76481b 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/build.xml
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/db.lck b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/db.lck
index 9f6b4b3d4b..9f6b4b3d4b 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/db.lck
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/db.lck
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/log/log.ctrl b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/log/log.ctrl
index edbd775299..edbd775299 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/log/log.ctrl
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/log/log.ctrl
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/log/log1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/log/log1.dat
index 7e85ac8e8f..7e85ac8e8f 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/log/log1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/log/log1.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/log/logmirror.ctrl b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/log/logmirror.ctrl
index edbd775299..edbd775299 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/log/logmirror.ctrl
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/log/logmirror.ctrl
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c10.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c10.dat
index 5d8ecaa10f..5d8ecaa10f 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c10.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c10.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c101.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c101.dat
index 0f79fa7574..0f79fa7574 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c101.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c101.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c111.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c111.dat
index 39d49e3d19..39d49e3d19 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c111.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c111.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c121.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c121.dat
index 2a4311779b..2a4311779b 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c121.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c121.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c130.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c130.dat
index 64e3c18d62..64e3c18d62 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c130.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c130.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c141.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c141.dat
index 0632d04164..0632d04164 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c141.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c141.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c150.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c150.dat
index d7541026f6..d7541026f6 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c150.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c150.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c161.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c161.dat
index 6673bf1873..6673bf1873 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c161.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c161.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c171.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c171.dat
index c2a753cc5d..c2a753cc5d 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c171.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c171.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c180.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c180.dat
index cb9391aed1..cb9391aed1 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c180.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c180.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c191.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c191.dat
index d3cf1d6364..d3cf1d6364 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c191.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c191.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1a1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1a1.dat
index a7a2d536e9..a7a2d536e9 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1a1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1a1.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1b1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1b1.dat
index 19097e69e7..19097e69e7 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1b1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1b1.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1c0.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1c0.dat
index 359525a31a..359525a31a 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1c0.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1c0.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1d1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1d1.dat
index 9f257df932..9f257df932 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1d1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1d1.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1e0.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1e0.dat
index e43e52fb7f..e43e52fb7f 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1e0.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1e0.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1f1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1f1.dat
index 7e6ee3b1e0..7e6ee3b1e0 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1f1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1f1.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c20.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c20.dat
index 1be6390f06..1be6390f06 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c20.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c20.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c200.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c200.dat
index b15d56855c..b15d56855c 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c200.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c200.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c211.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c211.dat
index 84b0022312..84b0022312 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c211.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c211.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c221.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c221.dat
index 63106a9523..63106a9523 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c221.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c221.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c230.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c230.dat
index 9975f27c1f..9975f27c1f 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c230.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c230.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c241.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c241.dat
index 835c645a16..835c645a16 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c241.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c241.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c251.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c251.dat
index d3d6adf4fb..d3d6adf4fb 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c251.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c251.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c260.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c260.dat
index 8d7333df7d..8d7333df7d 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c260.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c260.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c271.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c271.dat
index af722f7d73..af722f7d73 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c271.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c271.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c281.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c281.dat
index 3972983c2e..3972983c2e 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c281.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c281.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c290.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c290.dat
index 31577b8124..31577b8124 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c290.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c290.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2a1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2a1.dat
index 0f700d13a7..0f700d13a7 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2a1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2a1.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2b1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2b1.dat
index 1d6382fb3d..1d6382fb3d 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2b1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2b1.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2c1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2c1.dat
index 3bc60d886b..3bc60d886b 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2c1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2c1.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2d0.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2d0.dat
index c542d3c91c..c542d3c91c 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2d0.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2d0.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2e1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2e1.dat
index 16abd20b5f..16abd20b5f 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2e1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2e1.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2f0.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2f0.dat
index eb26be5932..eb26be5932 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2f0.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2f0.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c300.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c300.dat
index 1214f1df4b..1214f1df4b 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c300.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c300.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c31.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c31.dat
index 18c16f1123..18c16f1123 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c31.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c31.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c311.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c311.dat
index 926cbf25b5..926cbf25b5 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c311.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c311.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c320.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c320.dat
index 07e7bc023c..07e7bc023c 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c320.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c320.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c331.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c331.dat
index fd827f9dc2..fd827f9dc2 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c331.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c331.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c340.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c340.dat
index ca70319886..ca70319886 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c340.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c340.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c351.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c351.dat
index 8fbe2a527c..8fbe2a527c 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c351.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c351.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c360.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c360.dat
index dcf9c746e1..dcf9c746e1 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c360.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c360.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c371.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c371.dat
index 6f21a840ea..6f21a840ea 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c371.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c371.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c380.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c380.dat
index b512e8065f..b512e8065f 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c380.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c380.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c391.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c391.dat
index 27006e95a1..27006e95a1 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c391.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c391.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3a0.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3a0.dat
index 565dca97ac..565dca97ac 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3a0.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3a0.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3b1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3b1.dat
index 36894c9818..36894c9818 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3b1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3b1.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3c0.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3c0.dat
index d0c538aede..d0c538aede 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3c0.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3c0.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3d1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3d1.dat
index 65bcec5527..65bcec5527 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3d1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3d1.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3e0.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3e0.dat
index bdab359420..bdab359420 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3e0.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3e0.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3f1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3f1.dat
index dc2d278b57..dc2d278b57 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3f1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3f1.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c400.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c400.dat
index 3072709cec..3072709cec 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c400.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c400.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c41.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c41.dat
index 61086690f2..61086690f2 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c41.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c41.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c411.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c411.dat
index ca551d8249..ca551d8249 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c411.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c411.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c420.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c420.dat
index f04de0840e..f04de0840e 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c420.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c420.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c431.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c431.dat
index 398b1672cc..398b1672cc 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c431.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c431.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c440.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c440.dat
index af259d0872..af259d0872 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c440.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c440.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c451.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c451.dat
index 772a18c658..772a18c658 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c451.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c451.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c460.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c460.dat
index 505428362d..505428362d 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c460.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c460.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c471.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c471.dat
index 484d0df42d..484d0df42d 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c471.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c471.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c481.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c481.dat
index faac073076..faac073076 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c481.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c481.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c490.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c490.dat
index 7585319d21..7585319d21 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c490.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c490.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c4a1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c4a1.dat
index 4fe8b786e3..4fe8b786e3 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c4a1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c4a1.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c51.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c51.dat
index 7fc7937b15..7fc7937b15 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c51.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c51.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c60.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c60.dat
index d1fb08c946..d1fb08c946 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c60.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c60.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c71.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c71.dat
index d4c2090a3b..d4c2090a3b 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c71.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c71.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c81.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c81.dat
index 38b6ea6520..38b6ea6520 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c81.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c81.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c90.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c90.dat
index a607a5969c..a607a5969c 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c90.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c90.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/ca1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/ca1.dat
index 19b4c9e340..19b4c9e340 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/ca1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/ca1.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cb1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cb1.dat
index 73dc986572..73dc986572 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cb1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cb1.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cc0.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cc0.dat
index d1eef3bb56..d1eef3bb56 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cc0.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cc0.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cd1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cd1.dat
index c7e6db3ef7..c7e6db3ef7 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cd1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cd1.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/ce1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/ce1.dat
index 8fd3bf17a8..8fd3bf17a8 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/ce1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/ce1.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cf0.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cf0.dat
index 332b3d9a8a..332b3d9a8a 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cf0.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cf0.dat
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/service.properties b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/service.properties
index af9511d9c7..af9511d9c7 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/service.properties
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/dastest/service.properties
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/pom.xml
index db6a6426cc..db6a6426cc 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/pom.xml
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/readme.html b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/readme.html
index 65a50de320..65a50de320 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/readme.html
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/readme.html
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASService.java b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASService.java
index 0387341b87..0387341b87 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASService.java
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASServiceException.java b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASServiceException.java
index e62201a4de..e62201a4de 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASServiceException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASServiceException.java
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASServiceImpl.java
index 70d9e379ef..70d9e379ef 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/CompanyConfig.xml b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/CompanyConfig.xml
index 3d20054c12..3d20054c12 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/CompanyConfig.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/CompanyConfig.xml
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/dasservice.composite b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/dasservice.composite
index 54c4af61ee..54c4af61ee 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/dasservice.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/dasservice.composite
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/log4j.properties b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/log4j.properties
index c5c2868aaa..c5c2868aaa 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/log4j.properties
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/log4j.properties
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/Company.jsp b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/Company.jsp
index 0a156de1c7..0a156de1c7 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/Company.jsp
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/Company.jsp
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/META-INF/context.xml b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/META-INF/context.xml
index 0e90eb0a83..0e90eb0a83 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/META-INF/context.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/META-INF/context.xml
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 25849fa6b9..25849fa6b9 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/WEB-INF/web.xml
index 67a782269e..67a782269e 100644
--- a/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-0.99/samples/company-das/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/pom.xml
index ce1858c19c..ce1858c19c 100644
--- a/branches/sca-java-0.99/samples/company-das/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/pom.xml
diff --git a/branches/sca-java-0.99/samples/company-das/readme.html b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/readme.html
index ec6b492b72..ec6b492b72 100644
--- a/branches/sca-java-0.99/samples/company-das/readme.html
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/readme.html
diff --git a/branches/sca-java-0.99/samples/company-das/src/main/java/das/DASService.java b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/main/java/das/DASService.java
index 0387341b87..0387341b87 100644
--- a/branches/sca-java-0.99/samples/company-das/src/main/java/das/DASService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/main/java/das/DASService.java
diff --git a/branches/sca-java-0.99/samples/company-das/src/main/java/das/DASServiceException.java b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/main/java/das/DASServiceException.java
index e62201a4de..e62201a4de 100644
--- a/branches/sca-java-0.99/samples/company-das/src/main/java/das/DASServiceException.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/main/java/das/DASServiceException.java
diff --git a/branches/sca-java-0.99/samples/company-das/src/main/java/das/DASServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/main/java/das/DASServiceImpl.java
index 70d9e379ef..70d9e379ef 100644
--- a/branches/sca-java-0.99/samples/company-das/src/main/java/das/DASServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/main/java/das/DASServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/company-das/src/main/resources/dasservice.composite b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/main/resources/dasservice.composite
index 42ac52a756..42ac52a756 100644
--- a/branches/sca-java-0.99/samples/company-das/src/main/resources/dasservice.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/main/resources/dasservice.composite
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/java/das/DASServiceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/java/das/DASServiceTestCase.java
index 38acde3eb0..38acde3eb0 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/java/das/DASServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/java/das/DASServiceTestCase.java
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/CompanyConfig.xml b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/CompanyConfig.xml
index 912e81e9f6..912e81e9f6 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/CompanyConfig.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/CompanyConfig.xml
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/db.lck b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/db.lck
index 9f6b4b3d4b..9f6b4b3d4b 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/db.lck
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/db.lck
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/log.ctrl b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/log.ctrl
index edbd775299..edbd775299 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/log.ctrl
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/log.ctrl
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/log1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/log1.dat
index 7e85ac8e8f..7e85ac8e8f 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/log1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/log1.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/logmirror.ctrl b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/logmirror.ctrl
index edbd775299..edbd775299 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/logmirror.ctrl
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/logmirror.ctrl
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c10.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c10.dat
index 5d8ecaa10f..5d8ecaa10f 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c10.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c10.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c101.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c101.dat
index 0f79fa7574..0f79fa7574 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c101.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c101.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c111.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c111.dat
index 39d49e3d19..39d49e3d19 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c111.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c111.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c121.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c121.dat
index 2a4311779b..2a4311779b 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c121.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c121.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c130.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c130.dat
index 64e3c18d62..64e3c18d62 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c130.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c130.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c141.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c141.dat
index 0632d04164..0632d04164 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c141.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c141.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c150.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c150.dat
index d7541026f6..d7541026f6 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c150.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c150.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c161.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c161.dat
index 6673bf1873..6673bf1873 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c161.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c161.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c171.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c171.dat
index c2a753cc5d..c2a753cc5d 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c171.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c171.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c180.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c180.dat
index cb9391aed1..cb9391aed1 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c180.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c180.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c191.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c191.dat
index d3cf1d6364..d3cf1d6364 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c191.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c191.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1a1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1a1.dat
index a7a2d536e9..a7a2d536e9 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1a1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1a1.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1b1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1b1.dat
index 19097e69e7..19097e69e7 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1b1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1b1.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1c0.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1c0.dat
index 359525a31a..359525a31a 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1c0.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1c0.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1d1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1d1.dat
index 9f257df932..9f257df932 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1d1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1d1.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1e0.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1e0.dat
index e43e52fb7f..e43e52fb7f 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1e0.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1e0.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1f1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1f1.dat
index 7e6ee3b1e0..7e6ee3b1e0 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1f1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1f1.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c20.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c20.dat
index 1be6390f06..1be6390f06 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c20.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c20.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c200.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c200.dat
index b15d56855c..b15d56855c 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c200.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c200.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c211.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c211.dat
index 84b0022312..84b0022312 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c211.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c211.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c221.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c221.dat
index 63106a9523..63106a9523 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c221.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c221.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c230.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c230.dat
index 9975f27c1f..9975f27c1f 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c230.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c230.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c241.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c241.dat
index 835c645a16..835c645a16 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c241.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c241.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c251.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c251.dat
index d3d6adf4fb..d3d6adf4fb 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c251.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c251.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c260.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c260.dat
index 8d7333df7d..8d7333df7d 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c260.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c260.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c271.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c271.dat
index af722f7d73..af722f7d73 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c271.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c271.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c281.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c281.dat
index 3972983c2e..3972983c2e 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c281.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c281.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c290.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c290.dat
index 31577b8124..31577b8124 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c290.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c290.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2a1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2a1.dat
index 0f700d13a7..0f700d13a7 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2a1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2a1.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2b1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2b1.dat
index 1d6382fb3d..1d6382fb3d 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2b1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2b1.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2c1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2c1.dat
index 3bc60d886b..3bc60d886b 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2c1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2c1.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2d0.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2d0.dat
index c542d3c91c..c542d3c91c 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2d0.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2d0.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2e1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2e1.dat
index 16abd20b5f..16abd20b5f 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2e1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2e1.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2f0.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2f0.dat
index eb26be5932..eb26be5932 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2f0.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2f0.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c300.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c300.dat
index 1214f1df4b..1214f1df4b 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c300.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c300.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c31.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c31.dat
index 18c16f1123..18c16f1123 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c31.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c31.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c311.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c311.dat
index 926cbf25b5..926cbf25b5 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c311.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c311.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c320.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c320.dat
index 07e7bc023c..07e7bc023c 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c320.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c320.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c331.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c331.dat
index fd827f9dc2..fd827f9dc2 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c331.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c331.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c340.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c340.dat
index ca70319886..ca70319886 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c340.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c340.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c351.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c351.dat
index 8fbe2a527c..8fbe2a527c 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c351.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c351.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c360.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c360.dat
index dcf9c746e1..dcf9c746e1 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c360.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c360.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c371.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c371.dat
index 6f21a840ea..6f21a840ea 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c371.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c371.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c380.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c380.dat
index b512e8065f..b512e8065f 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c380.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c380.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c391.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c391.dat
index 27006e95a1..27006e95a1 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c391.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c391.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3a0.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3a0.dat
index 565dca97ac..565dca97ac 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3a0.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3a0.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3b1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3b1.dat
index 36894c9818..36894c9818 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3b1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3b1.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3c0.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3c0.dat
index d0c538aede..d0c538aede 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3c0.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3c0.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3d1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3d1.dat
index 65bcec5527..65bcec5527 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3d1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3d1.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3e0.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3e0.dat
index bdab359420..bdab359420 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3e0.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3e0.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3f1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3f1.dat
index dc2d278b57..dc2d278b57 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3f1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3f1.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c400.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c400.dat
index 3072709cec..3072709cec 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c400.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c400.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c41.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c41.dat
index 61086690f2..61086690f2 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c41.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c41.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c411.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c411.dat
index ca551d8249..ca551d8249 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c411.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c411.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c420.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c420.dat
index f04de0840e..f04de0840e 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c420.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c420.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c431.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c431.dat
index 398b1672cc..398b1672cc 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c431.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c431.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c440.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c440.dat
index af259d0872..af259d0872 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c440.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c440.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c451.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c451.dat
index 772a18c658..772a18c658 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c451.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c451.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c460.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c460.dat
index 505428362d..505428362d 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c460.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c460.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c471.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c471.dat
index 484d0df42d..484d0df42d 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c471.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c471.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c481.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c481.dat
index faac073076..faac073076 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c481.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c481.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c490.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c490.dat
index 7585319d21..7585319d21 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c490.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c490.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c4a1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c4a1.dat
index 4fe8b786e3..4fe8b786e3 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c4a1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c4a1.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c51.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c51.dat
index 7fc7937b15..7fc7937b15 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c51.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c51.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c60.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c60.dat
index d1fb08c946..d1fb08c946 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c60.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c60.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c71.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c71.dat
index d4c2090a3b..d4c2090a3b 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c71.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c71.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c81.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c81.dat
index 38b6ea6520..38b6ea6520 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c81.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c81.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c90.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c90.dat
index a607a5969c..a607a5969c 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c90.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c90.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/ca1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/ca1.dat
index 19b4c9e340..19b4c9e340 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/ca1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/ca1.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cb1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cb1.dat
index 73dc986572..73dc986572 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cb1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cb1.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cc0.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cc0.dat
index d1eef3bb56..d1eef3bb56 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cc0.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cc0.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cd1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cd1.dat
index c7e6db3ef7..c7e6db3ef7 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cd1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cd1.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/ce1.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/ce1.dat
index 8fd3bf17a8..8fd3bf17a8 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/ce1.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/ce1.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cf0.dat b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cf0.dat
index 332b3d9a8a..332b3d9a8a 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cf0.dat
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cf0.dat
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/service.properties b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/service.properties
index af9511d9c7..af9511d9c7 100644
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/service.properties
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/service.properties
diff --git a/branches/sca-java-0.99/samples/databinding-echo/README b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/README
index 67c1aa32d5..67c1aa32d5 100644
--- a/branches/sca-java-0.99/samples/databinding-echo/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/README
diff --git a/branches/sca-java-0.99/samples/databinding-echo/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/build.xml
index 22fc41228b..22fc41228b 100644
--- a/branches/sca-java-0.99/samples/databinding-echo/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/build.xml
diff --git a/branches/sca-java-0.99/samples/databinding-echo/databinding-echo.png b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/databinding-echo.png
index afbbfff285..afbbfff285 100644
--- a/branches/sca-java-0.99/samples/databinding-echo/databinding-echo.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/databinding-echo.png
diff --git a/branches/sca-java-0.99/samples/databinding-echo/databinding-echo.svg b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/databinding-echo.svg
index 87964abf86..87964abf86 100644
--- a/branches/sca-java-0.99/samples/databinding-echo/databinding-echo.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/databinding-echo.svg
diff --git a/branches/sca-java-0.99/samples/databinding-echo/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/pom.xml
index f90b1204a7..f90b1204a7 100644
--- a/branches/sca-java-0.99/samples/databinding-echo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/pom.xml
diff --git a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
index 5679614164..5679614164 100644
--- a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
diff --git a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
index ff8968837d..ff8968837d 100644
--- a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
diff --git a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Echo.java b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Echo.java
index 25ecc90454..25ecc90454 100644
--- a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Echo.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Echo.java
diff --git a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
index 9ec3819899..9ec3819899 100644
--- a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
diff --git a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Interface1.java b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Interface1.java
index 70b450e358..70b450e358 100644
--- a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Interface1.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Interface1.java
diff --git a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Interface2.java b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Interface2.java
index b62f1f425d..b62f1f425d 100644
--- a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Interface2.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Interface2.java
diff --git a/branches/sca-java-0.99/samples/databinding-echo/src/main/resources/EchoDataBinding.composite b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
index 2f042b8e34..2f042b8e34 100644
--- a/branches/sca-java-0.99/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
diff --git a/branches/sca-java-0.99/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
index ef2308aa73..ef2308aa73 100644
--- a/branches/sca-java-0.99/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
diff --git a/branches/sca-java-0.99/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
index 43434d8cee..43434d8cee 100644
--- a/branches/sca-java-0.99/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
diff --git a/branches/sca-java-0.99/samples/feed-aggregator/README b/sca-java-1.x/branches/sca-java-0.99/samples/feed-aggregator/README
index ed47d4cb22..ed47d4cb22 100644
--- a/branches/sca-java-0.99/samples/feed-aggregator/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/feed-aggregator/README
diff --git a/branches/sca-java-0.99/samples/feed-aggregator/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/feed-aggregator/build.xml
index 2118e13db7..2118e13db7 100644
--- a/branches/sca-java-0.99/samples/feed-aggregator/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/feed-aggregator/build.xml
diff --git a/branches/sca-java-0.99/samples/feed-aggregator/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/feed-aggregator/pom.xml
index eadcd22691..eadcd22691 100644
--- a/branches/sca-java-0.99/samples/feed-aggregator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/feed-aggregator/pom.xml
diff --git a/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
index 6d15b5426b..6d15b5426b 100644
--- a/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
diff --git a/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/SampleServer.java b/sca-java-1.x/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/SampleServer.java
index 05961a315c..05961a315c 100644
--- a/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/SampleServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/SampleServer.java
diff --git a/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/Sort.java b/sca-java-1.x/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/Sort.java
index db26ad9350..db26ad9350 100644
--- a/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/Sort.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/Sort.java
diff --git a/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/SortImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/SortImpl.java
index 62d90bfa3b..62d90bfa3b 100644
--- a/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/SortImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/SortImpl.java
diff --git a/branches/sca-java-0.99/samples/feed-aggregator/src/main/resources/FeedAggregator.composite b/sca-java-1.x/branches/sca-java-0.99/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
index df02ba8536..df02ba8536 100644
--- a/branches/sca-java-0.99/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/README b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/README
index cc25b50192..cc25b50192 100644
--- a/branches/sca-java-0.99/samples/helloworld-dojo/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/README
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/build-dojo.xml b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/build-dojo.xml
index 335a10817a..335a10817a 100644
--- a/branches/sca-java-0.99/samples/helloworld-dojo/build-dojo.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/build-dojo.xml
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/build.xml
index 261d55c540..261d55c540 100644
--- a/branches/sca-java-0.99/samples/helloworld-dojo/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/build.xml
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/helloworld-jsonrpc.png b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/helloworld-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/branches/sca-java-0.99/samples/helloworld-dojo/helloworld-jsonrpc.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/helloworld-jsonrpc.png
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/helloworld-jsonrpc.svg b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/helloworld-jsonrpc.svg
index 5c5cb91157..5c5cb91157 100644
--- a/branches/sca-java-0.99/samples/helloworld-dojo/helloworld-jsonrpc.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/helloworld-jsonrpc.svg
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/pom.xml
index 16f33de216..16f33de216 100644
--- a/branches/sca-java-0.99/samples/helloworld-dojo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/pom.xml
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldService.java
index 3d8ea24f04..3d8ea24f04 100644
--- a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldService.java
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
index 35fd00fabd..35fd00fabd 100644
--- a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/resources/jsonrpc.composite b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/src/main/resources/jsonrpc.composite
index e895ab455d..e895ab455d 100644
--- a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/resources/jsonrpc.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/src/main/resources/jsonrpc.composite
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/HelloWorldJSONRPC.html
index e8aa2b6615..e8aa2b6615 100644
--- a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/HelloWorldJSONRPC.html
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/META-INF/sca-contribution.xml
index 2c178c1ddc..2c178c1ddc 100644
--- a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/WEB-INF/web.xml
index 52117b1dce..52117b1dce 100644
--- a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/style.css b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/style.css
index 1071583264..1071583264 100644
--- a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/style.css
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/style.css
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/README b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/README
index 93a2c703ac..93a2c703ac 100644
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/README
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/build.xml
index dd3d5e6512..dd3d5e6512 100644
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/build.xml
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/helloworld-jsonrpc.png b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/helloworld-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/helloworld-jsonrpc.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/helloworld-jsonrpc.png
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/helloworld-jsonrpc.svg b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/helloworld-jsonrpc.svg
index fe966d8c17..fe966d8c17 100644
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/helloworld-jsonrpc.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/helloworld-jsonrpc.svg
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/pom.xml
index e7c0f37e99..e7c0f37e99 100644
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/pom.xml
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldService.java
index 3d8ea24f04..3d8ea24f04 100644
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldService.java
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
index 35fd00fabd..35fd00fabd 100644
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/resources/jsonrpc.composite b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/resources/jsonrpc.composite
index e895ab455d..e895ab455d 100644
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/resources/jsonrpc.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/resources/jsonrpc.composite
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html
index 98853189db..98853189db 100644
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/META-INF/sca-contribution.xml
index c8246e15a7..c8246e15a7 100644
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/WEB-INF/web.xml
index 52117b1dce..52117b1dce 100644
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/style.css b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/style.css
index 1071583264..1071583264 100644
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/style.css
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/style.css
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/README b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/README
index 8ee8dd7ff5..8ee8dd7ff5 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/README
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/build.xml
index 71ee66b31e..71ee66b31e 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/build.xml
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/helloworld-ws-reference.png b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/helloworld-ws-reference.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/helloworld-ws-reference.png
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/helloworld-ws-reference.svg b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/helloworld-ws-reference.svg
index 354ffbae8f..354ffbae8f 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/helloworld-ws-reference.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/helloworld-ws-reference.svg
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/pom.xml
index e2729e1815..e2729e1815 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/pom.xml
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
index 4559b282fe..4559b282fe 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
index 433a98fd7f..433a98fd7f 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
index 0dee19550b..0dee19550b 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
index 899ad5ce35..899ad5ce35 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/logging.properties b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/logging.properties
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/logging.properties
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
index 1e468bc9ca..1e468bc9ca 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
index 7ce89179c2..7ce89179c2 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
index 4b0c40dafd..4b0c40dafd 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/README b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/README
index 3689f79149..3689f79149 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/README
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/build.xml
index 401315d424..401315d424 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/build.xml
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/helloworld-ws-sdo.png b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
index 333ad53e0a..333ad53e0a 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/pom.xml
index bd0d513a86..bd0d513a86 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/pom.xml
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
index de4795ceaf..de4795ceaf 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
index c950f7df04..c950f7df04 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
index e9e39aa1dc..e9e39aa1dc 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
index 711eef63b5..711eef63b5 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
index e8f45d2901..e8f45d2901 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
index 34db47e04d..34db47e04d 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/logging.properties b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/logging.properties
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/logging.properties
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
index 2ecc0bea43..2ecc0bea43 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
index 11564c370f..11564c370f 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
index 4b0c40dafd..4b0c40dafd 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-service/README b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/README
index b82d5bd329..b82d5bd329 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/README
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-service/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/build.xml
index 46678febc3..46678febc3 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/build.xml
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-service/helloworld-ws-service.png b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/helloworld-ws-service.png
index 6f7d9dd450..6f7d9dd450 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/helloworld-ws-service.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/helloworld-ws-service.png
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-service/helloworld-ws-service.svg b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/helloworld-ws-service.svg
index 3305faeed8..3305faeed8 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/helloworld-ws-service.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/helloworld-ws-service.svg
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-service/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/pom.xml
index 501d212aeb..501d212aeb 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/pom.xml
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
index bd527ff8e2..bd527ff8e2 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/resources/helloworldws.composite
index 76ccf71fb8..76ccf71fb8 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
index 454763410c..454763410c 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
index 99c1f4d799..99c1f4d799 100644
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
diff --git a/branches/sca-java-0.99/samples/implementation-composite/README b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/README
index 27de00e8ef..27de00e8ef 100644
--- a/branches/sca-java-0.99/samples/implementation-composite/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/README
diff --git a/branches/sca-java-0.99/samples/implementation-composite/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/build.xml
index 7aa31aab8b..7aa31aab8b 100644
--- a/branches/sca-java-0.99/samples/implementation-composite/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/build.xml
diff --git a/branches/sca-java-0.99/samples/implementation-composite/implementation-composite.png b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/implementation-composite.png
index 4c6d71bc03..4c6d71bc03 100644
--- a/branches/sca-java-0.99/samples/implementation-composite/implementation-composite.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/implementation-composite.png
diff --git a/branches/sca-java-0.99/samples/implementation-composite/implementation-composite.svg b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/implementation-composite.svg
index 0e60354aab..0e60354aab 100644
--- a/branches/sca-java-0.99/samples/implementation-composite/implementation-composite.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/implementation-composite.svg
diff --git a/branches/sca-java-0.99/samples/implementation-composite/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/pom.xml
index 8b041e3ed2..8b041e3ed2 100644
--- a/branches/sca-java-0.99/samples/implementation-composite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/pom.xml
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/CompositeClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/CompositeClient.java
index bf743e1797..bf743e1797 100644
--- a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/CompositeClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/CompositeClient.java
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/Source.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/Source.java
index d0efcc1df1..d0efcc1df1 100644
--- a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/Source.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/Source.java
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/SourceCallback.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/SourceCallback.java
index baa95a8e39..baa95a8e39 100644
--- a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/SourceCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/SourceCallback.java
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/SourceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/SourceImpl.java
index b9a0c7ff74..b9a0c7ff74 100644
--- a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/SourceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/SourceImpl.java
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/Target.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/Target.java
index 9a8f68a7fa..9a8f68a7fa 100644
--- a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/Target.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/Target.java
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/TargetImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/TargetImpl.java
index 86686e9233..86686e9233 100644
--- a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/TargetImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/TargetImpl.java
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/InnerComposite.composite b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/InnerComposite.composite
index 3376ac8ff5..3376ac8ff5 100644
--- a/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/InnerComposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/InnerComposite.composite
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/InnerComposite2.composite b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/InnerComposite2.composite
index c9eff4fa9d..c9eff4fa9d 100644
--- a/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/InnerComposite2.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/InnerComposite2.composite
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
index e675fd3624..e675fd3624 100644
--- a/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/OuterComposite.composite b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/OuterComposite.composite
index cb1c1e13d4..cb1c1e13d4 100644
--- a/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/OuterComposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/OuterComposite.composite
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
index 9e9a4b44a4..9e9a4b44a4 100644
--- a/branches/sca-java-0.99/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/README b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/README
index 5e8190648f..5e8190648f 100644
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/README
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/build.xml
index 88d308e6fc..88d308e6fc 100644
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/build.xml
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/pom.xml
index bd126c8f27..bd126c8f27 100644
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/pom.xml
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUD.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
index b23d85887b..b23d85887b 100644
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
index 5cb2bd2b1c..5cb2bd2b1c 100644
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
index fa83c63c1b..fa83c63c1b 100644
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
index cc0795a735..cc0795a735 100644
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
index 7f9f8da674..7f9f8da674 100644
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
index 383a035e69..383a035e69 100644
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
index f37d9f0c1d..f37d9f0c1d 100644
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
index 93930d5dfe..93930d5dfe 100644
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
index d0166d649b..d0166d649b 100644
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
index 3cf5de5fa1..3cf5de5fa1 100644
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 6ce605197a..6ce605197a 100644
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
index 999ec4bdb6..999ec4bdb6 100644
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/test/resources/crud.composite b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/test/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/test/resources/crud.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud-extension/src/test/resources/crud.composite
diff --git a/branches/sca-java-0.99/samples/implementation-crud/README b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud/README
index 50da631c04..50da631c04 100644
--- a/branches/sca-java-0.99/samples/implementation-crud/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud/README
diff --git a/branches/sca-java-0.99/samples/implementation-crud/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud/build.xml
index 10b26b5a94..10b26b5a94 100644
--- a/branches/sca-java-0.99/samples/implementation-crud/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud/build.xml
diff --git a/branches/sca-java-0.99/samples/implementation-crud/implementation-crud.png b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud/implementation-crud.png
index a292037e7a..a292037e7a 100644
--- a/branches/sca-java-0.99/samples/implementation-crud/implementation-crud.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud/implementation-crud.png
diff --git a/branches/sca-java-0.99/samples/implementation-crud/implementation-crud.svg b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud/implementation-crud.svg
index dbb37be208..dbb37be208 100644
--- a/branches/sca-java-0.99/samples/implementation-crud/implementation-crud.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud/implementation-crud.svg
diff --git a/branches/sca-java-0.99/samples/implementation-crud/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud/pom.xml
index c27996539e..c27996539e 100644
--- a/branches/sca-java-0.99/samples/implementation-crud/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud/pom.xml
diff --git a/branches/sca-java-0.99/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
index e349f30fb9..e349f30fb9 100644
--- a/branches/sca-java-0.99/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
diff --git a/branches/sca-java-0.99/samples/implementation-crud/src/main/resources/crud.composite b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud/src/main/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/branches/sca-java-0.99/samples/implementation-crud/src/main/resources/crud.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud/src/main/resources/crud.composite
diff --git a/branches/sca-java-0.99/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
index 171ddbaed3..171ddbaed3 100644
--- a/branches/sca-java-0.99/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
diff --git a/branches/sca-java-0.99/samples/implementation-notification/README b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-notification/README
index 9a3e74a3a2..9a3e74a3a2 100644
--- a/branches/sca-java-0.99/samples/implementation-notification/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-notification/README
diff --git a/branches/sca-java-0.99/samples/implementation-notification/implementation-notification.png b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-notification/implementation-notification.png
index 0b7ee34bf7..0b7ee34bf7 100644
--- a/branches/sca-java-0.99/samples/implementation-notification/implementation-notification.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-notification/implementation-notification.png
diff --git a/branches/sca-java-0.99/samples/implementation-notification/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-notification/pom.xml
index 7ac4866728..7ac4866728 100644
--- a/branches/sca-java-0.99/samples/implementation-notification/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-notification/pom.xml
diff --git a/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
index bf8c72e0ce..bf8c72e0ce 100644
--- a/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
diff --git a/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
index 7bbfda2122..7bbfda2122 100644
--- a/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
diff --git a/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
index 2aaae596be..2aaae596be 100644
--- a/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
diff --git a/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
index a0bb02e846..a0bb02e846 100644
--- a/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
diff --git a/branches/sca-java-0.99/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
index 719141c94b..719141c94b 100644
--- a/branches/sca-java-0.99/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
diff --git a/branches/sca-java-0.99/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
index 873e200613..873e200613 100644
--- a/branches/sca-java-0.99/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
diff --git a/branches/sca-java-0.99/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
index bbf2281352..bbf2281352 100644
--- a/branches/sca-java-0.99/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/README b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/README
index 3b201779e1..3b201779e1 100644
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/README
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/build.xml
index 78bae79859..78bae79859 100644
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/build.xml
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/pom.xml
index 18482be6e6..18482be6e6 100644
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/pom.xml
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
index 7c2f5d236f..7c2f5d236f 100644
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
index bbcfb3d0dc..bbcfb3d0dc 100644
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
index 0dad270a6c..0dad270a6c 100644
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
index b5682673f6..b5682673f6 100644
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
index 51480d5de5..51480d5de5 100644
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
index dbe956b8c6..dbe956b8c6 100644
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
index b764148b67..b764148b67 100644
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
index ce135b64cf..ce135b64cf 100644
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
diff --git a/branches/sca-java-0.99/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-0.99/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-0.99/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-0.99/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index b30ea3b9cf..b30ea3b9cf 100644
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
index 075af98240..075af98240 100644
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
index cc32929f09..cc32929f09 100644
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
index 0580e30aba..0580e30aba 100644
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
index 69ab1f567e..69ab1f567e 100644
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
index b2a676be49..b2a676be49 100644
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
index a92c5ab8db..a92c5ab8db 100644
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
index c38094dfc9..c38094dfc9 100644
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-java-0.99/samples/loanapplication/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/loanapplication/pom.xml
index 96485ba8ad..96485ba8ad 100644
--- a/branches/sca-java-0.99/samples/loanapplication/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/loanapplication/pom.xml
diff --git a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java b/sca-java-1.x/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
index 4fedb70782..4fedb70782 100644
--- a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
diff --git a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
index 5183ece867..5183ece867 100644
--- a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
diff --git a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
index 7e4438bbff..7e4438bbff 100644
--- a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
diff --git a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
index b06d9465a2..b06d9465a2 100644
--- a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
diff --git a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanService.java b/sca-java-1.x/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanService.java
index 9dfd8b42fe..9dfd8b42fe 100644
--- a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanService.java
diff --git a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
index 76a53323bd..76a53323bd 100644
--- a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/loanapplication/src/main/resources/loanapplication.composite b/sca-java-1.x/branches/sca-java-0.99/samples/loanapplication/src/main/resources/loanapplication.composite
index 3aa8d030b7..3aa8d030b7 100644
--- a/branches/sca-java-0.99/samples/loanapplication/src/main/resources/loanapplication.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/loanapplication/src/main/resources/loanapplication.composite
diff --git a/branches/sca-java-0.99/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
index e88e48a53a..e88e48a53a 100644
--- a/branches/sca-java-0.99/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/pom.xml
index 991935e07b..991935e07b 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/account/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/pom.xml
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/account/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/account/AccountServiceImpl.java
index 74baa636f5..74baa636f5 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/account/AccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/account/AccountServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
index 884127cd9e..884127cd9e 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java
index c346a3221f..c346a3221f 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
index 5e08cf634f..5e08cf634f 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
index b355a09008..b355a09008 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java
index 1225c95f84..1225c95f84 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerDataServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerDataServiceImpl.java
index 2360344cd1..2360344cd1 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerDataServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerService.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerService.java
index b9b2821d38..b9b2821d38 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerService.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java
index 8919aad311..8919aad311 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuote.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuote.java
index c7498f093d..c7498f093d 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuote.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuote.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteService.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteService.java
index 9d5c243f9a..9d5c243f9a 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteServiceImpl.java
index b0c31d4d81..b0c31d4d81 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java
index 053f9d7f16..053f9d7f16 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/DasAccountConfiguration.xml b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/DasAccountConfiguration.xml
index ed1553eb40..ed1553eb40 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/DasAccountConfiguration.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/DasAccountConfiguration.xml
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/wsdl/AccountService.wsdl b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/wsdl/AccountService.wsdl
index 5e8ced28e0..5e8ced28e0 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/wsdl/stockquotes.webservicex.wsdl b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/wsdl/stockquotes.webservicex.wsdl
index 16c980a30e..16c980a30e 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/wsdl/stockquotes.webservicex.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/wsdl/stockquotes.webservicex.wsdl
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/webapp/WEB-INF/default.scdl b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/webapp/WEB-INF/default.scdl
index 7c83a1a648..7c83a1a648 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/webapp/WEB-INF/default.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/webapp/WEB-INF/default.scdl
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/webapp/WEB-INF/web.xml
index 509e5a052d..509e5a052d 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/test/java/bigbank/account/client/AccountClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/test/java/bigbank/account/client/AccountClient.java
index 28f9e762f0..28f9e762f0 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/test/java/bigbank/account/client/AccountClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/account/src/test/java/bigbank/account/client/AccountClient.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/docs/Show.Image.html b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/docs/Show.Image.html
index 9b18679abf..9b18679abf 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/docs/Show.Image.html
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/docs/Show.Image.html
diff --git a/branches/sca-java-0.99/samples/old/bigbank/docs/accountfiles.png b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/docs/accountfiles.png
index 9fc46488a0..9fc46488a0 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/docs/accountfiles.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/docs/accountfiles.png
diff --git a/branches/sca-java-0.99/samples/old/bigbank/docs/accountmodule.png b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/docs/accountmodule.png
index d4209a01e3..d4209a01e3 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/docs/accountmodule.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/docs/accountmodule.png
diff --git a/branches/sca-java-0.99/samples/old/bigbank/docs/modualoverview.png b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/docs/modualoverview.png
index 7e6d7ba25e..7e6d7ba25e 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/docs/modualoverview.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/docs/modualoverview.png
diff --git a/branches/sca-java-0.99/samples/old/bigbank/docs/webclientfiles.png b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/docs/webclientfiles.png
index b951ed2e5e..b951ed2e5e 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/docs/webclientfiles.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/docs/webclientfiles.png
diff --git a/branches/sca-java-0.99/samples/old/bigbank/docs/webclientmodule.png b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/docs/webclientmodule.png
index dfd3a34bfb..dfd3a34bfb 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/docs/webclientmodule.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/docs/webclientmodule.png
diff --git a/branches/sca-java-0.99/samples/old/bigbank/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/pom.xml
index b69e5dd06a..b69e5dd06a 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/pom.xml
diff --git a/branches/sca-java-0.99/samples/old/bigbank/readme.html b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/readme.html
index b5e90bb08f..b5e90bb08f 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/readme.html
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/readme.html
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/pom.xml
index 40e146685a..40e146685a 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/pom.xml
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/account/AccountServiceComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/account/AccountServiceComponentImpl.java
index a0f98f14f3..a0f98f14f3 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/account/AccountServiceComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/account/AccountServiceComponentImpl.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/AccountLoginServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/AccountLoginServiceImpl.java
index d6c40e8dda..d6c40e8dda 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/AccountLoginServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/AccountLoginServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java
index c688df2597..c688df2597 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileService.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileService.java
index 551d80c935..551d80c935 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileService.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileServiceImpl.java
index 5385a7c3fc..5385a7c3fc 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/SimpleLoginServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/SimpleLoginServiceImpl.java
index 711c6ba0b9..711c6ba0b9 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/SimpleLoginServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/SimpleLoginServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountLogTag.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountLogTag.java
index 08751bdc3d..08751bdc3d 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountLogTag.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountLogTag.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountStatusTag.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountStatusTag.java
index 3733cc84dd..3733cc84dd 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountStatusTag.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountStatusTag.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockLogTag.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockLogTag.java
index ea2df8aa55..ea2df8aa55 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockLogTag.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockLogTag.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockStatusTag.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockStatusTag.java
index b2c61193e7..b2c61193e7 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockStatusTag.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockStatusTag.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/LoginBarrierTag.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/LoginBarrierTag.java
index 6c50595d0f..6c50595d0f 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/LoginBarrierTag.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/LoginBarrierTag.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/ServiceTag.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/ServiceTag.java
index d1263377c2..d1263377c2 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/ServiceTag.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/ServiceTag.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/ui/FormServlet.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/ui/FormServlet.java
index 3acdbee845..3acdbee845 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/ui/FormServlet.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/ui/FormServlet.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/ui/LoginServlet.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/ui/LoginServlet.java
index 784cc4fb40..784cc4fb40 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/ui/LoginServlet.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/ui/LoginServlet.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl
index 980c0cf279..980c0cf279 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/CustomerProfile.jsp b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/CustomerProfile.jsp
index 2dc17a8867..2dc17a8867 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/CustomerProfile.jsp
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/CustomerProfile.jsp
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/bigbank-tags.tld b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/bigbank-tags.tld
index a3d92a2e46..a3d92a2e46 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/bigbank-tags.tld
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/bigbank-tags.tld
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/default.scdl b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/default.scdl
index cf42086edb..cf42086edb 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/default.scdl
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/default.scdl
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/web.xml
index 398767e345..398767e345 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/accountLog.jsp b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/accountLog.jsp
index 6e91a14dcc..6e91a14dcc 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/accountLog.jsp
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/accountLog.jsp
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/accountTransaction.jsp b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/accountTransaction.jsp
index 4017834867..4017834867 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/accountTransaction.jsp
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/accountTransaction.jsp
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/login.html b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/login.html
index a1a5440a4f..a1a5440a4f 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/login.html
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/login.html
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/purchaseStock.jsp b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/purchaseStock.jsp
index 90c3a813b6..90c3a813b6 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/purchaseStock.jsp
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/purchaseStock.jsp
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/stockSale.jsp b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/stockSale.jsp
index a2b08f4352..a2b08f4352 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/stockSale.jsp
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/stockSale.jsp
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/summary.jsp b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/summary.jsp
index f31ded242f..f31ded242f 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/summary.jsp
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/summary.jsp
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/test/java/bigbank/webclient/client/TestAccountService.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/test/java/bigbank/webclient/client/TestAccountService.java
index d5ece151de..d5ece151de 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/test/java/bigbank/webclient/client/TestAccountService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/test/java/bigbank/webclient/client/TestAccountService.java
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/test/java/bigbank/webclient/client/TestLoginService.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/test/java/bigbank/webclient/client/TestLoginService.java
index 9af80e99db..9af80e99db 100644
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/test/java/bigbank/webclient/client/TestLoginService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/bigbank/webclient/src/test/java/bigbank/webclient/client/TestLoginService.java
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/README b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/README
index 65077c5881..65077c5881 100644
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/README
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/build.xml
index cfbdb1e1d6..cfbdb1e1d6 100644
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/build.xml
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/pom.xml
index 8d0f31dd23..8d0f31dd23 100644
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/pom.xml
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBinding.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBinding.java
index d6439bfa13..d6439bfa13 100644
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBinding.java
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBindingInvoker.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBindingInvoker.java
index 70a6e4a43a..70a6e4a43a 100644
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBindingInvoker.java
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBindingProviderFactory.java
index f750641d1d..f750641d1d 100644
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBindingProviderFactory.java
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoReferenceBindingProvider.java
index 27659f79a6..27659f79a6 100644
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoReferenceBindingProvider.java
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoServiceBindingProvider.java
index 65ba66b5a6..65ba66b5a6 100644
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoServiceBindingProvider.java
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/server/EchoServer.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/server/EchoServer.java
index fff8ad564f..fff8ad564f 100644
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/server/EchoServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/server/EchoServer.java
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/server/EchoServiceListener.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/server/EchoServiceListener.java
index c0010c4ccf..c0010c4ccf 100644
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/server/EchoServiceListener.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/server/EchoServiceListener.java
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 6671e5d9aa..6671e5d9aa 100644
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index e487bf98da..e487bf98da 100644
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/Echo.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/Echo.java
index 4dbe0f9539..4dbe0f9539 100644
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/Echo.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/Echo.java
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoComponentImpl.java
index 83b2db8064..83b2db8064 100644
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoComponentImpl.java
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoReferenceTestCase.java
index e9a9e1590f..e9a9e1590f 100644
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoReferenceTestCase.java
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoServiceTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoServiceTestCase.java
index 077c4fb51d..077c4fb51d 100644
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoServiceTestCase.java
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/resources/EchoBinding.composite b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/resources/EchoBinding.composite
index ebd79c736d..ebd79c736d 100644
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/resources/EchoBinding.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/resources/EchoBinding.composite
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/README b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/README
index 973c13d00c..973c13d00c 100644
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/README
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/build.xml
index 0f1a0a2270..0f1a0a2270 100644
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/build.xml
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/pom.xml
index 3bc75bfd58..3bc75bfd58 100644
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/pom.xml
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/CRUD.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/CRUD.java
index 49ed376809..49ed376809 100644
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/CRUD.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/CRUD.java
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/backend/ResourceManager.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/backend/ResourceManager.java
index aa94cd55b6..aa94cd55b6 100644
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/backend/ResourceManager.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/backend/ResourceManager.java
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementation.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementation.java
index 0887a98df6..0887a98df6 100644
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementation.java
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationInvoker.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationInvoker.java
index 3040dac612..3040dac612 100644
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationInvoker.java
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationProvider.java
index 1135ce75cf..1135ce75cf 100644
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationProvider.java
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationProviderFactory.java
index a4d92ccedd..a4d92ccedd 100644
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationProviderFactory.java
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 4b922f4d28..4b922f4d28 100644
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 5ac1827889..5ac1827889 100644
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/test/java/crud2/CRUDTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/test/java/crud2/CRUDTestCase.java
index 3bc86cef80..3bc86cef80 100644
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/test/java/crud2/CRUDTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/test/java/crud2/CRUDTestCase.java
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/test/resources/crud2.composite b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/test/resources/crud2.composite
index 5aa4b3c7d6..5aa4b3c7d6 100644
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/test/resources/crud2.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/test/resources/crud2.composite
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/build-bundles.xml b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/build-bundles.xml
index 7a31e6016b..7a31e6016b 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/build-bundles.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/build-bundles.xml
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/pom.xml
index 6cfa54796e..6cfa54796e 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/pom.xml
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/readme.htm b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/readme.htm
index f6948ab471..f6948ab471 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/readme.htm
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/readme.htm
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
index d357c622c3..d357c622c3 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
index 64814487cb..64814487cb 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
index 225dce0236..225dce0236 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 447efbae6e..447efbae6e 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index 580e1289b7..580e1289b7 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index e1557bc6d8..e1557bc6d8 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index 7a8caaafe3..7a8caaafe3 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index 2112043613..2112043613 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index f8f86b418c..f8f86b418c 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index d0fb30fc04..d0fb30fc04 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index 8278e2957f..8278e2957f 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index 4eaa14e4db..4eaa14e4db 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index bf153b481c..bf153b481c 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 63e5725a43..63e5725a43 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index 27f95c1752..27f95c1752 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Customer.componentType b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Customer.componentType
index 5c61a0961c..5c61a0961c 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Customer.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Customer.componentType
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/NOTICE
index d83ebbe236..d83ebbe236 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/README.txt
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Retailer.componentType b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Retailer.componentType
index 15185f2bf9..15185f2bf9 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Retailer.componentType
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Shipper.componentType b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Shipper.componentType
index 675597d80b..675597d80b 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Shipper.componentType
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Warehouse.componentType b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
index 6e1ac3e5a9..6e1ac3e5a9 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
index 88d79e5219..88d79e5219 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
index d95ef5d582..d95ef5d582 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
index de7ac7ec7a..de7ac7ec7a 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
index 21241a6899..21241a6899 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
index b5c5a862be..b5c5a862be 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
index 961b22b3c7..961b22b3c7 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
index 47897d16ca..47897d16ca 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
index dc4c39b549..dc4c39b549 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
index f5333c7caa..f5333c7caa 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
index b05f23c7cc..b05f23c7cc 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
index 6166549e5a..6166549e5a 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
index dcbbc2b543..dcbbc2b543 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/supplychain.composite b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/supplychain.composite
index 3afcb88c58..3afcb88c58 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/supplychain.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/supplychain.composite
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
index 72ea783ea7..72ea783ea7 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
index ba166cea00..ba166cea00 100644
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/branches/sca-java-0.99/samples/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/pom.xml
index 1ecf20384f..1ecf20384f 100644
--- a/branches/sca-java-0.99/samples/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/pom.xml
diff --git a/branches/sca-java-0.99/samples/quote-xquery/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/pom.xml
index 387a25eaea..387a25eaea 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/pom.xml
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
index 146939c190..146939c190 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
index ac55c02efa..ac55c02efa 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
index 2715be19a9..2715be19a9 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
index 84abb5c520..84abb5c520 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
index a8bfc6ca1f..a8bfc6ca1f 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
index cbd71f6279..cbd71f6279 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
index c95c979c64..c95c979c64 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
index 3a70f619a0..3a70f619a0 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
index 0b90c9fb0f..0b90c9fb0f 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
index 34fd24fbe5..34fd24fbe5 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
index fd16c4b4c5..fd16c4b4c5 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
index 5d1c7066fe..5d1c7066fe 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
index 2eff74fbc1..2eff74fbc1 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/TestHelper.java b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/TestHelper.java
index 65b4df0468..65b4df0468 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/TestHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/TestHelper.java
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
index 9c521ae67b..9c521ae67b 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
index d6c6356080..d6c6356080 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
index 62275b41f8..62275b41f8 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
index e7f3e67068..e7f3e67068 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
index 4c437586ef..4c437586ef 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
index 4f64850056..4f64850056 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/availquoteprovider.wsdl b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/availquoteprovider.wsdl
index f4744c8a14..f4744c8a14 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/availquoteprovider.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/availquoteprovider.wsdl
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
index b48dc2117b..b48dc2117b 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/xqueryquotews.composite b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/xqueryquotews.composite
index fc360d7d6f..fc360d7d6f 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/xqueryquotews.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/xqueryquotews.composite
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
index dbdf2b677c..dbdf2b677c 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
index 97febf65e9..97febf65e9 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
index cc78f4103b..cc78f4103b 100644
--- a/branches/sca-java-0.99/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/README b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/README
index 8a8d616857..8a8d616857 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/README
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/build.xml
index ecc2596d71..ecc2596d71 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/build.xml
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/pom.xml
index fd8a0a2546..fd8a0a2546 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/pom.xml
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/simple-bigbank-spring.png b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/simple-bigbank-spring.png
index 593c047f6a..593c047f6a 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/simple-bigbank-spring.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/simple-bigbank-spring.png
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/simple-bigbank-spring.svg b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/simple-bigbank-spring.svg
index c64f6de6b9..c64f6de6b9 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/simple-bigbank-spring.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/simple-bigbank-spring.svg
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
index 1625ff5b65..1625ff5b65 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
index 7c9082b944..7c9082b944 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
index ae9071445d..ae9071445d 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java
index a5ae7b3955..a5ae7b3955 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.java
index c354de387b..c354de387b 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
index 000acb935c..000acb935c 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.java
index 11bdff757e..11bdff757e 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.java
index b791024076..b791024076 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.java
index 86246a3f84..86246a3f84 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
index edbf910d37..edbf910d37 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 0512d40b0b..0512d40b0b 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
index 2d97b57066..2d97b57066 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml
index 2d882472fb..2d882472fb 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/BigBank.composite b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
index 727327ef30..727327ef30 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite
index 26bdc59075..26bdc59075 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
index ba6c1dd797..ba6c1dd797 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/README b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/README
index 55170005d3..55170005d3 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/README
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/build.xml
index a814014eae..a814014eae 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/build.xml
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/pom.xml
index a1e0307c41..a1e0307c41 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/pom.xml
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/simple-bigbank.png b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/simple-bigbank.png
index 593c047f6a..593c047f6a 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank/simple-bigbank.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/simple-bigbank.png
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/simple-bigbank.svg b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/simple-bigbank.svg
index c64f6de6b9..c64f6de6b9 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank/simple-bigbank.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/simple-bigbank.svg
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
index 1625ff5b65..1625ff5b65 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
index 7c9082b944..7c9082b944 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
index fa85f309c0..fa85f309c0 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
index a5ae7b3955..a5ae7b3955 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
index c354de387b..c354de387b 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
index 000acb935c..000acb935c 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
index 11bdff757e..11bdff757e 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
index b791024076..b791024076 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
index 86246a3f84..86246a3f84 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
index edbf910d37..edbf910d37 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 0512d40b0b..0512d40b0b 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
index 7961279352..7961279352 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/Account.composite b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/Account.composite
index e71615e27e..e71615e27e 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/Account.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/Account.composite
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/BigBank.composite b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/BigBank.composite
index c870f39cab..c870f39cab 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/BigBank.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/BigBank.composite
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/StockQuote.composite b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/StockQuote.composite
index 4f29c14851..4f29c14851 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/StockQuote.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/StockQuote.composite
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
index ba6c1dd797..ba6c1dd797 100644
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/README b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/README
index 85cd90afef..85cd90afef 100644
--- a/branches/sca-java-0.99/samples/simple-callback-ws/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/README
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/build.xml
index 10b69bd395..10b69bd395 100644
--- a/branches/sca-java-0.99/samples/simple-callback-ws/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/build.xml
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/pom.xml
index 8e0e8195a3..8e0e8195a3 100644
--- a/branches/sca-java-0.99/samples/simple-callback-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/pom.xml
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/simple-callback-ws.png b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/simple-callback-ws.png
index 1b6353f5cf..1b6353f5cf 100644
--- a/branches/sca-java-0.99/samples/simple-callback-ws/simple-callback-ws.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/simple-callback-ws.png
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/simple-callback-ws.svg b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/simple-callback-ws.svg
index 7d9e3de510..7d9e3de510 100644
--- a/branches/sca-java-0.99/samples/simple-callback-ws/simple-callback-ws.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/simple-callback-ws.svg
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
index 4cc00d6d0f..4cc00d6d0f 100644
--- a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
index b9479324ec..b9479324ec 100644
--- a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
index 48acc0e94f..48acc0e94f 100644
--- a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
index 66cfb2bc8a..66cfb2bc8a 100644
--- a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
index 3817eb15b0..3817eb15b0 100644
--- a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
index eeb0e52163..eeb0e52163 100644
--- a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/resources/simplecallback.composite b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/src/main/resources/simplecallback.composite
index 8bc5bddfe2..8bc5bddfe2 100644
--- a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/resources/simplecallback.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/src/main/resources/simplecallback.composite
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
index 243737dd70..243737dd70 100644
--- a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
index 413737346e..413737346e 100644
--- a/branches/sca-java-0.99/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/branches/sca-java-0.99/samples/simple-callback/README b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/README
index 719376f254..719376f254 100644
--- a/branches/sca-java-0.99/samples/simple-callback/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/README
diff --git a/branches/sca-java-0.99/samples/simple-callback/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/build.xml
index 47d1ea4bc1..47d1ea4bc1 100644
--- a/branches/sca-java-0.99/samples/simple-callback/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/build.xml
diff --git a/branches/sca-java-0.99/samples/simple-callback/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/pom.xml
index 52b4bf621f..52b4bf621f 100644
--- a/branches/sca-java-0.99/samples/simple-callback/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/pom.xml
diff --git a/branches/sca-java-0.99/samples/simple-callback/simple-callback.png b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/simple-callback.png
index 1b6353f5cf..1b6353f5cf 100644
--- a/branches/sca-java-0.99/samples/simple-callback/simple-callback.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/simple-callback.png
diff --git a/branches/sca-java-0.99/samples/simple-callback/simple-callback.svg b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/simple-callback.svg
index 484b65df9d..484b65df9d 100644
--- a/branches/sca-java-0.99/samples/simple-callback/simple-callback.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/simple-callback.svg
diff --git a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyClient.java
index 4cc00d6d0f..4cc00d6d0f 100644
--- a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyClient.java
diff --git a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
index 3e2a1df5a5..3e2a1df5a5 100644
--- a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
diff --git a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyService.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyService.java
index e78ad6f68f..e78ad6f68f 100644
--- a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyService.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyService.java
diff --git a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
index b27eea44f5..b27eea44f5 100644
--- a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
index fc5e31d14e..fc5e31d14e 100644
--- a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
index b8987fcd07..b8987fcd07 100644
--- a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/branches/sca-java-0.99/samples/simple-callback/src/main/resources/simplecallback.composite b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/src/main/resources/simplecallback.composite
index 33e6f60601..33e6f60601 100644
--- a/branches/sca-java-0.99/samples/simple-callback/src/main/resources/simplecallback.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/src/main/resources/simplecallback.composite
diff --git a/branches/sca-java-0.99/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
index cbaab8af83..cbaab8af83 100644
--- a/branches/sca-java-0.99/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/branches/sca-java-0.99/samples/spi-implementation-pojo/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/spi-implementation-pojo/pom.xml
index 1bb4983999..1bb4983999 100644
--- a/branches/sca-java-0.99/samples/spi-implementation-pojo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/spi-implementation-pojo/pom.xml
diff --git a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java b/sca-java-1.x/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
index 73104c3166..73104c3166 100644
--- a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
diff --git a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java b/sca-java-1.x/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
index 43efae32ca..43efae32ca 100644
--- a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
diff --git a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java b/sca-java-1.x/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
index d65d4c8e4a..d65d4c8e4a 100644
--- a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
diff --git a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java b/sca-java-1.x/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
index 198befa928..198befa928 100644
--- a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
diff --git a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator b/sca-java-1.x/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
index 95ee37c1aa..95ee37c1aa 100644
--- a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
diff --git a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
index cc32929f09..cc32929f09 100644
--- a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
index 02af1ccf22..02af1ccf22 100644
--- a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
index 5813fda330..5813fda330 100644
--- a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite b/sca-java-1.x/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
index fa9cecc160..fa9cecc160 100644
--- a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-java-0.99/samples/supplychain/README b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/README
index ea4493fdd4..ea4493fdd4 100644
--- a/branches/sca-java-0.99/samples/supplychain/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/README
diff --git a/branches/sca-java-0.99/samples/supplychain/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/build.xml
index 506180b8b1..506180b8b1 100644
--- a/branches/sca-java-0.99/samples/supplychain/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/build.xml
diff --git a/branches/sca-java-0.99/samples/supplychain/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/pom.xml
index 85087e016a..85087e016a 100644
--- a/branches/sca-java-0.99/samples/supplychain/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/pom.xml
diff --git a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Customer.java b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Customer.java
index 8088001898..8088001898 100644
--- a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Customer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Customer.java
diff --git a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
index 7a1e8553ec..7a1e8553ec 100644
--- a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
diff --git a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Retailer.java b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Retailer.java
index 1add63fb4e..1add63fb4e 100644
--- a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Retailer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Retailer.java
diff --git a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
index f622052cf8..f622052cf8 100644
--- a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
diff --git a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Shipper.java b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Shipper.java
index d4d49a922b..d4d49a922b 100644
--- a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Shipper.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Shipper.java
diff --git a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
index 4ae52a12a2..4ae52a12a2 100644
--- a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
diff --git a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
index 7072f582d1..7072f582d1 100644
--- a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Warehouse.java b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Warehouse.java
index 0be499f569..0be499f569 100644
--- a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Warehouse.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Warehouse.java
diff --git a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
index b5e256a1e0..b5e256a1e0 100644
--- a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
diff --git a/branches/sca-java-0.99/samples/supplychain/src/main/resources/supplychain.composite b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/main/resources/supplychain.composite
index 301efcaf1f..301efcaf1f 100644
--- a/branches/sca-java-0.99/samples/supplychain/src/main/resources/supplychain.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/main/resources/supplychain.composite
diff --git a/branches/sca-java-0.99/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
index 88e0eb7ab8..88e0eb7ab8 100644
--- a/branches/sca-java-0.99/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/branches/sca-java-0.99/samples/supplychain/supplychain.png b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/supplychain.png
index 51a384e827..51a384e827 100644
--- a/branches/sca-java-0.99/samples/supplychain/supplychain.png
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/supplychain.png
diff --git a/branches/sca-java-0.99/samples/supplychain/supplychain.svg b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/supplychain.svg
index f72e77acab..f72e77acab 100644
--- a/branches/sca-java-0.99/samples/supplychain/supplychain.svg
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/supplychain/supplychain.svg
diff --git a/branches/sca-java-0.99/samples/web-resource/README b/sca-java-1.x/branches/sca-java-0.99/samples/web-resource/README
index 616cfc6af8..616cfc6af8 100644
--- a/branches/sca-java-0.99/samples/web-resource/README
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/web-resource/README
diff --git a/branches/sca-java-0.99/samples/web-resource/build.xml b/sca-java-1.x/branches/sca-java-0.99/samples/web-resource/build.xml
index e337acb215..e337acb215 100644
--- a/branches/sca-java-0.99/samples/web-resource/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/web-resource/build.xml
diff --git a/branches/sca-java-0.99/samples/web-resource/pom.xml b/sca-java-1.x/branches/sca-java-0.99/samples/web-resource/pom.xml
index dc6be5c6a0..dc6be5c6a0 100644
--- a/branches/sca-java-0.99/samples/web-resource/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/web-resource/pom.xml
diff --git a/branches/sca-java-0.99/samples/web-resource/src/main/java/web/resource/SampleServer.java b/sca-java-1.x/branches/sca-java-0.99/samples/web-resource/src/main/java/web/resource/SampleServer.java
index 9410de08c4..9410de08c4 100644
--- a/branches/sca-java-0.99/samples/web-resource/src/main/java/web/resource/SampleServer.java
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/web-resource/src/main/java/web/resource/SampleServer.java
diff --git a/branches/sca-java-0.99/samples/web-resource/src/main/resources/WebResource.composite b/sca-java-1.x/branches/sca-java-0.99/samples/web-resource/src/main/resources/WebResource.composite
index 2376e79bf0..2376e79bf0 100644
--- a/branches/sca-java-0.99/samples/web-resource/src/main/resources/WebResource.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/web-resource/src/main/resources/WebResource.composite
diff --git a/branches/sca-java-0.99/samples/web-resource/src/main/resources/myContent/index.html b/sca-java-1.x/branches/sca-java-0.99/samples/web-resource/src/main/resources/myContent/index.html
index c6ea59af55..c6ea59af55 100644
--- a/branches/sca-java-0.99/samples/web-resource/src/main/resources/myContent/index.html
+++ b/sca-java-1.x/branches/sca-java-0.99/samples/web-resource/src/main/resources/myContent/index.html
diff --git a/branches/sca-java-0.99/tools/pom.xml b/sca-java-1.x/branches/sca-java-0.99/tools/pom.xml
index ec3751697d..ec3751697d 100644
--- a/branches/sca-java-0.99/tools/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/tools/pom.xml
diff --git a/branches/sca-java-0.99/tools/registry-inspector/pom.xml b/sca-java-1.x/branches/sca-java-0.99/tools/registry-inspector/pom.xml
index 2e9322d52c..2e9322d52c 100644
--- a/branches/sca-java-0.99/tools/registry-inspector/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.99/tools/registry-inspector/pom.xml
diff --git a/branches/sca-java-0.99/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/extension/RegistryInspectorModuleActivator.java b/sca-java-1.x/branches/sca-java-0.99/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/extension/RegistryInspectorModuleActivator.java
index 39f6f2691b..39f6f2691b 100644
--- a/branches/sca-java-0.99/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/extension/RegistryInspectorModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.99/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/extension/RegistryInspectorModuleActivator.java
diff --git a/branches/sca-java-0.99/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/inspector/ExtensionPointRegistryInspector.java b/sca-java-1.x/branches/sca-java-0.99/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/inspector/ExtensionPointRegistryInspector.java
index 2456af6387..2456af6387 100644
--- a/branches/sca-java-0.99/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/inspector/ExtensionPointRegistryInspector.java
+++ b/sca-java-1.x/branches/sca-java-0.99/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/inspector/ExtensionPointRegistryInspector.java
diff --git a/branches/sca-java-0.99/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/inspector/ExtensionPointRegistryInspectorImpl.java b/sca-java-1.x/branches/sca-java-0.99/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/inspector/ExtensionPointRegistryInspectorImpl.java
index 0b1b279103..0b1b279103 100644
--- a/branches/sca-java-0.99/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/inspector/ExtensionPointRegistryInspectorImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.99/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/inspector/ExtensionPointRegistryInspectorImpl.java
diff --git a/branches/sca-java-0.99/tools/registry-inspector/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.99/tools/registry-inspector/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 0c286d5974..0c286d5974 100644
--- a/branches/sca-java-0.99/tools/registry-inspector/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.99/tools/registry-inspector/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.99/tools/registry-inspector/src/main/resources/registryinspector.composite b/sca-java-1.x/branches/sca-java-0.99/tools/registry-inspector/src/main/resources/registryinspector.composite
index a4f0f9caef..a4f0f9caef 100644
--- a/branches/sca-java-0.99/tools/registry-inspector/src/main/resources/registryinspector.composite
+++ b/sca-java-1.x/branches/sca-java-0.99/tools/registry-inspector/src/main/resources/registryinspector.composite
diff --git a/branches/sca-java-0.99/tools/registry-inspector/src/test/java/org/apache/tuscany/sca/tools/registryinspector/RegistryInspectorTestCase.java b/sca-java-1.x/branches/sca-java-0.99/tools/registry-inspector/src/test/java/org/apache/tuscany/sca/tools/registryinspector/RegistryInspectorTestCase.java
index 9360f187e7..9360f187e7 100644
--- a/branches/sca-java-0.99/tools/registry-inspector/src/test/java/org/apache/tuscany/sca/tools/registryinspector/RegistryInspectorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.99/tools/registry-inspector/src/test/java/org/apache/tuscany/sca/tools/registryinspector/RegistryInspectorTestCase.java