337 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-M2/samples/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/LICENSE.txt
index 9ee90786ef..9ee90786ef 100644
--- a/branches/sca-java-M2/samples/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/NOTICE.txt
index 5b5354fd50..5b5354fd50 100644
--- a/branches/sca-java-M2/samples/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/STATUS.txt b/sca-java-1.x/branches/sca-java-M2/samples/STATUS.txt
index 7514d9eb05..7514d9eb05 100644
--- a/branches/sca-java-M2/samples/STATUS.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/STATUS.txt
diff --git a/branches/sca-java-M2/samples/applications/bigbank/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/applications/bigbank/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/.pmd b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/.pmd
index ffc4fe2bbb..ffc4fe2bbb 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/.pmd
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/.pmd
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/.ruleset b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/.ruleset
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/.ruleset
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/pom.xml
index b42e49baa6..b42e49baa6 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/pom.xml
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/account/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/account/AccountServiceImpl.java
index 74baa636f5..74baa636f5 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/account/AccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/account/AccountServiceImpl.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
index 884127cd9e..884127cd9e 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java
index c346a3221f..c346a3221f 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
index 5e08cf634f..5e08cf634f 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
index b355a09008..b355a09008 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java
index 1225c95f84..1225c95f84 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerDataServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerDataServiceImpl.java
index 2360344cd1..2360344cd1 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerDataServiceImpl.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerService.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerService.java
index b9b2821d38..b9b2821d38 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerService.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java
index 8919aad311..8919aad311 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuote.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuote.java
index c7498f093d..c7498f093d 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuote.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuote.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteService.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteService.java
index 9d5c243f9a..9d5c243f9a 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteServiceImpl.java
index b0c31d4d81..b0c31d4d81 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteServiceImpl.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java
index 9e103f3738..9e103f3738 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/resources/DasAccountConfiguration.xml b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/resources/DasAccountConfiguration.xml
index dba87e91d0..dba87e91d0 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/resources/DasAccountConfiguration.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/resources/DasAccountConfiguration.xml
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/resources/META-INF/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/resources/wsdl/AccountService.wsdl b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/resources/wsdl/AccountService.wsdl
index 9acb92664d..9acb92664d 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/resources/wsdl/stockquotes.webservicex.wsdl b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/resources/wsdl/stockquotes.webservicex.wsdl
index 16c980a30e..16c980a30e 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/resources/wsdl/stockquotes.webservicex.wsdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/resources/wsdl/stockquotes.webservicex.wsdl
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/webapp/WEB-INF/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/webapp/WEB-INF/default.scdl
index 7c83a1a648..7c83a1a648 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/webapp/WEB-INF/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/webapp/WEB-INF/default.scdl
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/webapp/WEB-INF/web.xml
index 0f685b2581..0f685b2581 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-M2/samples/applications/bigbank/account/src/test/java/bigbank/account/client/AccountClient.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/test/java/bigbank/account/client/AccountClient.java
index 28f9e762f0..28f9e762f0 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/account/src/test/java/bigbank/account/client/AccountClient.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/account/src/test/java/bigbank/account/client/AccountClient.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/docs/Show.Image.html b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/docs/Show.Image.html
index 9b18679abf..9b18679abf 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/docs/Show.Image.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/docs/Show.Image.html
diff --git a/branches/sca-java-M2/samples/applications/bigbank/docs/accountfiles.png b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/docs/accountfiles.png
index 9fc46488a0..9fc46488a0 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/docs/accountfiles.png
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/docs/accountfiles.png
diff --git a/branches/sca-java-M2/samples/applications/bigbank/docs/accountmodule.png b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/docs/accountmodule.png
index d4209a01e3..d4209a01e3 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/docs/accountmodule.png
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/docs/accountmodule.png
diff --git a/branches/sca-java-M2/samples/applications/bigbank/docs/modualoverview.png b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/docs/modualoverview.png
index 7e6d7ba25e..7e6d7ba25e 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/docs/modualoverview.png
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/docs/modualoverview.png
diff --git a/branches/sca-java-M2/samples/applications/bigbank/docs/webclientfiles.png b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/docs/webclientfiles.png
index b951ed2e5e..b951ed2e5e 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/docs/webclientfiles.png
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/docs/webclientfiles.png
diff --git a/branches/sca-java-M2/samples/applications/bigbank/docs/webclientmodule.png b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/docs/webclientmodule.png
index dfd3a34bfb..dfd3a34bfb 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/docs/webclientmodule.png
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/docs/webclientmodule.png
diff --git a/branches/sca-java-M2/samples/applications/bigbank/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/pom.xml
index 2099340f77..2099340f77 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/pom.xml
diff --git a/branches/sca-java-M2/samples/applications/bigbank/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/readme.html
index b5e90bb08f..b5e90bb08f 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/readme.html
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/.pmd b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/.pmd
index ffc4fe2bbb..ffc4fe2bbb 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/.pmd
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/.pmd
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/.ruleset b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/.ruleset
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/.ruleset
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/pom.xml
index a4b5087149..a4b5087149 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/pom.xml
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/account/AccountServiceComponentImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/account/AccountServiceComponentImpl.java
index a0f98f14f3..a0f98f14f3 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/account/AccountServiceComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/account/AccountServiceComponentImpl.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/AccountLoginServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/AccountLoginServiceImpl.java
index b03f533aba..b03f533aba 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/AccountLoginServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/AccountLoginServiceImpl.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java
index c688df2597..c688df2597 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileService.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileService.java
index 551d80c935..551d80c935 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileService.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileServiceImpl.java
index 5385a7c3fc..5385a7c3fc 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileServiceImpl.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/SimpleLoginServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/SimpleLoginServiceImpl.java
index 711c6ba0b9..711c6ba0b9 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/SimpleLoginServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/SimpleLoginServiceImpl.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountLogTag.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountLogTag.java
index 08751bdc3d..08751bdc3d 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountLogTag.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountLogTag.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountStatusTag.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountStatusTag.java
index 3733cc84dd..3733cc84dd 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountStatusTag.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountStatusTag.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockLogTag.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockLogTag.java
index ea2df8aa55..ea2df8aa55 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockLogTag.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockLogTag.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockStatusTag.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockStatusTag.java
index b2c61193e7..b2c61193e7 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockStatusTag.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockStatusTag.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/LoginBarrierTag.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/LoginBarrierTag.java
index 6c50595d0f..6c50595d0f 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/LoginBarrierTag.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/LoginBarrierTag.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/ServiceTag.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/ServiceTag.java
index d1263377c2..d1263377c2 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/ServiceTag.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/ServiceTag.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/ui/FormServlet.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/ui/FormServlet.java
index 3acdbee845..3acdbee845 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/ui/FormServlet.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/ui/FormServlet.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/ui/LoginServlet.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/ui/LoginServlet.java
index 784cc4fb40..784cc4fb40 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/ui/LoginServlet.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/java/bigbank/webclient/ui/LoginServlet.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/resources/META-INF/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl
index 124db9ac04..124db9ac04 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/CustomerProfile.jsp b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/CustomerProfile.jsp
index 2dc17a8867..2dc17a8867 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/CustomerProfile.jsp
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/CustomerProfile.jsp
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/WEB-INF/bigbank-tags.tld b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/WEB-INF/bigbank-tags.tld
index a3d92a2e46..a3d92a2e46 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/WEB-INF/bigbank-tags.tld
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/WEB-INF/bigbank-tags.tld
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/WEB-INF/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/WEB-INF/default.scdl
index 31708af810..31708af810 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/WEB-INF/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/WEB-INF/default.scdl
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/WEB-INF/web.xml
index a0ebdf18b0..a0ebdf18b0 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/accountLog.jsp b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/accountLog.jsp
index 6e91a14dcc..6e91a14dcc 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/accountLog.jsp
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/accountLog.jsp
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/accountTransaction.jsp b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/accountTransaction.jsp
index 4017834867..4017834867 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/accountTransaction.jsp
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/accountTransaction.jsp
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/login.html b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/login.html
index a1a5440a4f..a1a5440a4f 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/login.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/login.html
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/purchaseStock.jsp b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/purchaseStock.jsp
index 90c3a813b6..90c3a813b6 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/purchaseStock.jsp
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/purchaseStock.jsp
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/stockSale.jsp b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/stockSale.jsp
index a2b08f4352..a2b08f4352 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/stockSale.jsp
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/stockSale.jsp
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/summary.jsp b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/summary.jsp
index f31ded242f..f31ded242f 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/summary.jsp
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/main/webapp/summary.jsp
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/test/java/bigbank/webclient/client/TestAccountService.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/test/java/bigbank/webclient/client/TestAccountService.java
index 0f43400348..0f43400348 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/test/java/bigbank/webclient/client/TestAccountService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/test/java/bigbank/webclient/client/TestAccountService.java
diff --git a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/test/java/bigbank/webclient/client/TestLoginService.java b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/test/java/bigbank/webclient/client/TestLoginService.java
index bafc1716f1..bafc1716f1 100644
--- a/branches/sca-java-M2/samples/applications/bigbank/webclient/src/test/java/bigbank/webclient/client/TestLoginService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/applications/bigbank/webclient/src/test/java/bigbank/webclient/client/TestLoginService.java
diff --git a/branches/sca-java-M2/samples/css/base.css b/sca-java-1.x/branches/sca-java-M2/samples/css/base.css
index 9394b3a7be..9394b3a7be 100644
--- a/branches/sca-java-M2/samples/css/base.css
+++ b/sca-java-1.x/branches/sca-java-M2/samples/css/base.css
diff --git a/branches/sca-java-M2/samples/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/pom.xml
index de1f2d1070..de1f2d1070 100644
--- a/branches/sca-java-M2/samples/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/pom.xml
diff --git a/branches/sca-java-M2/samples/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/readme.html
index d0eddde525..d0eddde525 100644
--- a/branches/sca-java-M2/samples/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/readme.html
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/pom.xml
index 6bcb1e62ad..6bcb1e62ad 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/pom.xml
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/readme.html
index f8b33b440d..f8b33b440d 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/readme.html
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/AddService.java
index 6392676e76..6392676e76 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/AddServiceImpl.java
index 39e9be92e6..39e9be92e6 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/CalculatorService.java
index d17650ec3f..d17650ec3f 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/CalculatorServiceImpl.java
index 0953eae036..0953eae036 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/DivideService.java
index 3158458b5e..3158458b5e 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/DivideServiceImpl.java
index 6363068cfd..6363068cfd 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/MultiplyService.java
index 62db05175e..62db05175e 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/MultiplyServiceImpl.java
index 7276bb6964..7276bb6964 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/SubtractService.java
index 309f88f098..309f88f098 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/SubtractServiceImpl.java
index 3c3388f4cd..3c3388f4cd 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/client/CalculatorClient.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/client/CalculatorClient.java
index c02c284007..c02c284007 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/client/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/client/CalculatorClient.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorService.java
index ef36007eb6..ef36007eb6 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorServiceImpl.java
index b1aba993a7..b1aba993a7 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SqrtService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SqrtService.java
index d9027b5616..d9027b5616 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SqrtService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SqrtService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/LICENSE.txt
index 517cda22ca..517cda22ca 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/NOTICE
index 11c564eb19..11c564eb19 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/default.scdl
index 73c0fb48cf..73c0fb48cf 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/sci_calc.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/sci_calc.scdl
index d753a66774..d753a66774 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/sci_calc.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/sci_calc.scdl
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/Sqrt.componentType b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/Sqrt.componentType
index 1880164f29..1880164f29 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/Sqrt.componentType
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/Sqrt.componentType
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/Sqrt.js b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/Sqrt.js
index b0e2ef81d4..b0e2ef81d4 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/Sqrt.js
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/Sqrt.js
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/SubtractImpl.componentType b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/SubtractImpl.componentType
index 94bd4549d6..94bd4549d6 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/SubtractImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/SubtractImpl.componentType
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/SubtractImpl.rb b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/SubtractImpl.rb
index 1f949e933e..1f949e933e 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/SubtractImpl.rb
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/SubtractImpl.rb
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/wsdl/calculator.wsdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/wsdl/calculator.wsdl
index 46928e7055..46928e7055 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/wsdl/calculator.wsdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/wsdl/calculator.wsdl
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/test/java/calculator/CalculatorTestClient.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/test/java/calculator/CalculatorTestClient.java
index 61a9f0f699..61a9f0f699 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/test/java/calculator/CalculatorTestClient.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/test/java/calculator/CalculatorTestClient.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/calculator/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/standalone/calculator/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/pom.xml
index 4efd818037..4efd818037 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/pom.xml
diff --git a/branches/sca-java-M2/samples/standalone/calculator/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/readme.html
index 5d4e2cfcfb..5d4e2cfcfb 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/readme.html
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/AddService.java
index 4eeb30a9c2..4eeb30a9c2 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/AddServiceImpl.java
index da6a530052..da6a530052 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorClient.java
index cb4edeac7e..cb4edeac7e 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorServiceImpl.java
index efb49ead63..efb49ead63 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/DivideService.java
index 131c5a8014..131c5a8014 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/DivideServiceImpl.java
index 535298d31d..535298d31d 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/MultiplyService.java
index a917896aeb..a917896aeb 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/MultiplyServiceImpl.java
index e1d491beee..e1d491beee 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/SubtractService.java
index e328f024ea..e328f024ea 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/SubtractServiceImpl.java
index 053f323627..053f323627 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/resources/META-INF/sca/default.scdl
index 3ac67d4b44..3ac67d4b44 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/test/java/calculator/CalculatorTestCase.java
index f33d7abb02..f33d7abb02 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/pom.xml
index 97176810dc..97176810dc 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/pom.xml
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/readme.html
index bebe69ec8b..bebe69ec8b 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/readme.html
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/AddService.java
index 6392676e76..6392676e76 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/AddServiceImpl.java
index 39e9be92e6..39e9be92e6 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/CalculatorService.java
index f1185a2494..f1185a2494 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/CalculatorServiceImpl.java
index d72c0d30c3..d72c0d30c3 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/DivideService.java
index 3158458b5e..3158458b5e 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/DivideServiceImpl.java
index 159ca463c9..159ca463c9 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MathService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MathService.java
index 42e8e5ca67..42e8e5ca67 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MathService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MathService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MathServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MathServiceImpl.java
index 76caace7bb..76caace7bb 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MathServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MathServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MultiplyService.java
index 62db05175e..62db05175e 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MultiplyServiceImpl.java
index 2c9053f61a..2c9053f61a 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/SubtractService.java
index 309f88f098..309f88f098 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/SubtractServiceImpl.java
index 3c3388f4cd..3c3388f4cd 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/server/CalculatorRMIServer.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/server/CalculatorRMIServer.java
index 3608d6b92a..3608d6b92a 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/server/CalculatorRMIServer.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/server/CalculatorRMIServer.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/LICENSE.txt
index 517cda22ca..517cda22ca 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/NOTICE
index 11c564eb19..11c564eb19 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/sca/default.scdl
index bc12412818..bc12412818 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/test/java/calculator/server/CalculatorRMITestServer.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/test/java/calculator/server/CalculatorRMITestServer.java
index 0f3408129a..0f3408129a 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/test/java/calculator/server/CalculatorRMITestServer.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/test/java/calculator/server/CalculatorRMITestServer.java
diff --git a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/LICENSE.txt
index 517cda22ca..517cda22ca 100644
--- a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/NOTICE.txt
index e445fc9ae5..e445fc9ae5 100644
--- a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/pom.xml
index b799db3738..b799db3738 100644
--- a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/pom.xml
diff --git a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/readme.html
index 3201794102..3201794102 100644
--- a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/readme.html
diff --git a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/java/greeter/GreeterClient.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/java/greeter/GreeterClient.java
index 1aa3dce320..1aa3dce320 100644
--- a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/java/greeter/GreeterClient.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/java/greeter/GreeterClient.java
diff --git a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/java/greeter/GreeterImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/java/greeter/GreeterImpl.java
index 39ca24aadd..39ca24aadd 100644
--- a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/java/greeter/GreeterImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/java/greeter/GreeterImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/java/greeter/GreeterLocal.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/java/greeter/GreeterLocal.java
index 7cf650f73b..7cf650f73b 100644
--- a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/java/greeter/GreeterLocal.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/java/greeter/GreeterLocal.java
diff --git a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/java/greeter/GreeterService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/java/greeter/GreeterService.java
index 57279b8a7c..57279b8a7c 100644
--- a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/java/greeter/GreeterService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/java/greeter/GreeterService.java
diff --git a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/resources/META-INF/sca/default.scdl
index c450e10408..c450e10408 100644
--- a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/resources/wsdl/greeter.wsdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/resources/wsdl/greeter.wsdl
index f96b24bae6..f96b24bae6 100644
--- a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/resources/wsdl/greeter.wsdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/main/resources/wsdl/greeter.wsdl
diff --git a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/test/java/greeter/GreeterWSOneWayClient.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/test/java/greeter/GreeterWSOneWayClient.java
index 1f017744de..1f017744de 100644
--- a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/test/java/greeter/GreeterWSOneWayClient.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/test/java/greeter/GreeterWSOneWayClient.java
diff --git a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/test/resources/META-INF/tuscany/test-extensions.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/test/resources/META-INF/tuscany/test-extensions.scdl
index ec3643cf00..ec3643cf00 100644
--- a/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/test/resources/META-INF/tuscany/test-extensions.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/src/test/resources/META-INF/tuscany/test-extensions.scdl
diff --git a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/pom.xml
index d8184fc5b6..d8184fc5b6 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/pom.xml
diff --git a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/readme.html
index bf10f0caa9..bf10f0caa9 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/readme.html
diff --git a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/java/helloworld/HelloWorldClient.java
index 257270f65a..257270f65a 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/java/helloworld/HelloWorldService.java
index bfea460664..bfea460664 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/resources/HelloWorld.componentType b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/resources/HelloWorld.componentType
index 2b18d7f75d..2b18d7f75d 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/resources/HelloWorld.componentType
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/resources/HelloWorld.componentType
diff --git a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/resources/HelloWorld.js b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/resources/HelloWorld.js
index 520153329e..520153329e 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/resources/HelloWorld.js
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/resources/HelloWorld.js
diff --git a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/resources/META-INF/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/resources/META-INF/sca/default.scdl
index 03209cb450..03209cb450 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/test/java/helloworld/HelloWorldTestCase.java
index 77a51bb7e3..77a51bb7e3 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldJavaScript/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/pom.xml
index 41fda4bb3c..41fda4bb3c 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/pom.xml
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/readme.html
index c6dae4784c..c6dae4784c 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/readme.html
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/java/helloworld/HelloWorldImpl.java
index b024f28b54..b024f28b54 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/java/helloworld/HelloWorldRmiClient.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/java/helloworld/HelloWorldRmiClient.java
index cfb0d3eee0..cfb0d3eee0 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/java/helloworld/HelloWorldRmiClient.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/java/helloworld/HelloWorldRmiClient.java
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/java/helloworld/HelloWorldService.java
index bed93eec99..bed93eec99 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/resources/HelloWorldImpl.componentType b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/resources/HelloWorldImpl.componentType
index 7f886c850b..7f886c850b 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/resources/HelloWorldImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/resources/HelloWorldImpl.componentType
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/resources/META-INF/LICENSE.txt
index 517cda22ca..517cda22ca 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/resources/META-INF/NOTICE
index 11c564eb19..11c564eb19 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/resources/META-INF/sca/default.scdl
index 72ec35ed96..72ec35ed96 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIReference/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIService/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIService/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIService/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIService/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIService/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/pom.xml
index 15ffd280af..15ffd280af 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIService/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/pom.xml
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIService/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/readme.html
index 93b19f8e88..93b19f8e88 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIService/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/readme.html
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/java/helloworld/HelloWorldImpl.java
index 55982b38b9..55982b38b9 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/java/helloworld/HelloWorldRmiServer.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/java/helloworld/HelloWorldRmiServer.java
index e423f4e068..e423f4e068 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/java/helloworld/HelloWorldRmiServer.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/java/helloworld/HelloWorldRmiServer.java
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/java/helloworld/HelloWorldService.java
index 0384344c2d..0384344c2d 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/resources/HelloWorldImpl.componentType b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/resources/HelloWorldImpl.componentType
index 6f90076a96..6f90076a96 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/resources/HelloWorldImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/resources/HelloWorldImpl.componentType
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/resources/META-INF/LICENSE.txt
index 517cda22ca..517cda22ca 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/resources/META-INF/NOTICE
index 11c564eb19..11c564eb19 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/resources/META-INF/sca/default.scdl
index d5ab91e428..d5ab91e428 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRMIService/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRuby/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRuby/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRuby/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRuby/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRuby/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/pom.xml
index 94a9480dc4..94a9480dc4 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRuby/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/pom.xml
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRuby/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/readme.html
index ce05039861..ce05039861 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRuby/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/readme.html
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/java/helloworld/HelloWorldClient.java
index 719a967230..719a967230 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/java/helloworld/HelloWorldService.java
index fd126a197a..fd126a197a 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/resources/HelloWorld.componentType b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/resources/HelloWorld.componentType
index f3ae71779e..f3ae71779e 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/resources/HelloWorld.componentType
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/resources/HelloWorld.componentType
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/resources/HelloWorld.rb b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/resources/HelloWorld.rb
index d9e54620f0..d9e54620f0 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/resources/HelloWorld.rb
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/resources/HelloWorld.rb
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/resources/META-INF/LICENSE.txt
index 517cda22ca..517cda22ca 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/resources/META-INF/NOTICE
index 3fd1599f79..3fd1599f79 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/resources/META-INF/sca/default.scdl
index 0cd9855b7a..0cd9855b7a 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/sca-java-M2/samples/standalone/helloworldRuby/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/src/test/java/helloworld/HelloWorldTestCase.java
index 65d36d714b..65d36d714b 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldRuby/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldRuby/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/pom.xml
index 787fa56681..787fa56681 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/pom.xml
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/readme.html
index 163d8b16a2..163d8b16a2 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/readme.html
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/java/helloworld/HelloWorldCallback.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/java/helloworld/HelloWorldCallback.java
index adc48e85a4..adc48e85a4 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/java/helloworld/HelloWorldCallback.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/java/helloworld/HelloWorldCallback.java
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/java/helloworld/HelloWorldClient.java
index f59c409f45..f59c409f45 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/java/helloworld/HelloWorldLocal.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/java/helloworld/HelloWorldLocal.java
index a5b9074af0..a5b9074af0 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/java/helloworld/HelloWorldLocal.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/java/helloworld/HelloWorldLocal.java
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/java/helloworld/HelloWorldService.java
index fc64f62a7b..fc64f62a7b 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/java/helloworld/HelloWorldServiceComponent.java
index af5a21f5a1..af5a21f5a1 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/META-INF/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/META-INF/NOTICE
index 11c564eb19..11c564eb19 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/META-INF/sca/default.scdl
index 2f52a1fae7..2f52a1fae7 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/logging.properties b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/logging.properties
index 78e24f1633..78e24f1633 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/logging.properties
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/logging.properties
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/wsdl/helloworld.wsdl
index 179e6319f2..179e6319f2 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/test/java/helloworld/HelloWorldWSAsyncClient.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/test/java/helloworld/HelloWorldWSAsyncClient.java
index 294e83a582..294e83a582 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/test/java/helloworld/HelloWorldWSAsyncClient.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/test/java/helloworld/HelloWorldWSAsyncClient.java
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/test/resources/META-INF/tuscany/test-extensions.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/test/resources/META-INF/tuscany/test-extensions.scdl
index ec3643cf00..ec3643cf00 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/test/resources/META-INF/tuscany/test-extensions.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient-async/src/test/resources/META-INF/tuscany/test-extensions.scdl
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/pom.xml
index 11f1c6100a..11f1c6100a 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/pom.xml
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/readme.html
index 1545270c5a..1545270c5a 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/readme.html
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/java/helloworld/HelloWorldClient.java
index 9951f89959..9951f89959 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/java/helloworld/HelloWorldService.java
index e5894e1ef1..e5894e1ef1 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/java/helloworld/HelloWorldServiceComponent.java
index e04f200499..e04f200499 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/resources/META-INF/LICENSE.txt
index 517cda22ca..517cda22ca 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/resources/META-INF/NOTICE
index 11c564eb19..11c564eb19 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/resources/META-INF/sca/default.scdl
index 8e2c4b920d..8e2c4b920d 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl
index 92a42f231b..92a42f231b 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/test/java/helloworld/HelloWorldWSClient.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/test/java/helloworld/HelloWorldWSClient.java
index 63e5f9e854..63e5f9e854 100644
--- a/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/test/java/helloworld/HelloWorldWSClient.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/helloworldwsclient/src/test/java/helloworld/HelloWorldWSClient.java
diff --git a/branches/sca-java-M2/samples/standalone/inner.composite/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/standalone/inner.composite/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/inner.composite/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/standalone/inner.composite/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/standalone/inner.composite/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/pom.xml
index c3514e2269..c3514e2269 100644
--- a/branches/sca-java-M2/samples/standalone/inner.composite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/pom.xml
diff --git a/branches/sca-java-M2/samples/standalone/inner.composite/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/readme.html
index 1b8ece4396..1b8ece4396 100644
--- a/branches/sca-java-M2/samples/standalone/inner.composite/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/readme.html
diff --git a/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/InnerCompositeClient.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/InnerCompositeClient.java
index 0a2fb3f74e..0a2fb3f74e 100644
--- a/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/InnerCompositeClient.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/InnerCompositeClient.java
diff --git a/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/Source.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/Source.java
index ceceb79360..ceceb79360 100644
--- a/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/Source.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/Source.java
diff --git a/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/SourceCallback.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/SourceCallback.java
index 0807d455a6..0807d455a6 100644
--- a/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/SourceCallback.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/SourceCallback.java
diff --git a/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/SourceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/SourceImpl.java
index 90d231ab14..90d231ab14 100644
--- a/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/SourceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/SourceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/Target.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/Target.java
index 4f67262ae4..4f67262ae4 100644
--- a/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/Target.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/Target.java
diff --git a/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/TargetImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/TargetImpl.java
index a416086dae..a416086dae 100644
--- a/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/TargetImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/src/main/java/innercomposite/TargetImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/inner.composite/src/main/resources/META-INF/sca/InnerComposite.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/src/main/resources/META-INF/sca/InnerComposite.scdl
index f7d7b55e10..f7d7b55e10 100644
--- a/branches/sca-java-M2/samples/standalone/inner.composite/src/main/resources/META-INF/sca/InnerComposite.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/src/main/resources/META-INF/sca/InnerComposite.scdl
diff --git a/branches/sca-java-M2/samples/standalone/inner.composite/src/main/resources/META-INF/sca/InnerComposite2.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/src/main/resources/META-INF/sca/InnerComposite2.scdl
index a5ad0abd46..a5ad0abd46 100644
--- a/branches/sca-java-M2/samples/standalone/inner.composite/src/main/resources/META-INF/sca/InnerComposite2.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/src/main/resources/META-INF/sca/InnerComposite2.scdl
diff --git a/branches/sca-java-M2/samples/standalone/inner.composite/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/src/main/resources/META-INF/sca/default.scdl
index cd525d8175..cd525d8175 100644
--- a/branches/sca-java-M2/samples/standalone/inner.composite/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/sca-java-M2/samples/standalone/inner.composite/src/test/java/innercomposite/InnerCompositeTestCase.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/src/test/java/innercomposite/InnerCompositeTestCase.java
index 5c5b5bdd9d..5c5b5bdd9d 100644
--- a/branches/sca-java-M2/samples/standalone/inner.composite/src/test/java/innercomposite/InnerCompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/inner.composite/src/test/java/innercomposite/InnerCompositeTestCase.java
diff --git a/branches/sca-java-M2/samples/standalone/simplecallback/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/standalone/simplecallback/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/simplecallback/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/standalone/simplecallback/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/standalone/simplecallback/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/pom.xml
index 72dd8f2863..72dd8f2863 100644
--- a/branches/sca-java-M2/samples/standalone/simplecallback/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/pom.xml
diff --git a/branches/sca-java-M2/samples/standalone/simplecallback/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/readme.html
index f70eb732c1..f70eb732c1 100644
--- a/branches/sca-java-M2/samples/standalone/simplecallback/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/readme.html
diff --git a/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/MyClient.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/MyClient.java
index 4cc00d6d0f..4cc00d6d0f 100644
--- a/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/MyClient.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/MyClient.java
diff --git a/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/MyClientImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/MyClientImpl.java
index 016ee8d3df..016ee8d3df 100644
--- a/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/MyClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/MyClientImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/MyService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/MyService.java
index 3b12a95b70..3b12a95b70 100644
--- a/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/MyService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/MyService.java
diff --git a/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/MyServiceCallback.java
index b27eea44f5..b27eea44f5 100644
--- a/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/MyServiceCallback.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/MyServiceImpl.java
index a903c36180..a903c36180 100644
--- a/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/SimpleCallbackClient.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/SimpleCallbackClient.java
index 4e421730e9..4e421730e9 100644
--- a/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/SimpleCallbackClient.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/branches/sca-java-M2/samples/standalone/simplecallback/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/src/main/resources/META-INF/sca/default.scdl
index 1d4016ef44..1d4016ef44 100644
--- a/branches/sca-java-M2/samples/standalone/simplecallback/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/sca-java-M2/samples/standalone/simplecallback/src/test/java/simplecallback/SimpleCallbackTestCase.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/src/test/java/simplecallback/SimpleCallbackTestCase.java
index 6ce600ad79..6ce600ad79 100644
--- a/branches/sca-java-M2/samples/standalone/simplecallback/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/simplecallback/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/branches/sca-java-M2/samples/standalone/supplychain/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/standalone/supplychain/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/supplychain/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/standalone/supplychain/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/standalone/supplychain/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/pom.xml
index ebd605b3d8..ebd605b3d8 100644
--- a/branches/sca-java-M2/samples/standalone/supplychain/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/pom.xml
diff --git a/branches/sca-java-M2/samples/standalone/supplychain/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/readme.html
index b2af9f3c75..b2af9f3c75 100644
--- a/branches/sca-java-M2/samples/standalone/supplychain/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/readme.html
diff --git a/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/Customer.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/Customer.java
index 8088001898..8088001898 100644
--- a/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/Customer.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/Customer.java
diff --git a/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/CustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
index b718af89ed..b718af89ed 100644
--- a/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/Retailer.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/Retailer.java
index 1add63fb4e..1add63fb4e 100644
--- a/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/Retailer.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/Retailer.java
diff --git a/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/RetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
index 0cb30c4199..0cb30c4199 100644
--- a/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/Shipper.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/Shipper.java
index d4d49a922b..d4d49a922b 100644
--- a/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/Shipper.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/Shipper.java
diff --git a/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/ShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
index b36f0352c9..b36f0352c9 100644
--- a/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/SupplyChainClient.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/SupplyChainClient.java
index 990381e2f5..990381e2f5 100644
--- a/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/Warehouse.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/Warehouse.java
index 0be499f569..0be499f569 100644
--- a/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/Warehouse.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/Warehouse.java
diff --git a/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
index e994f4bc0d..e994f4bc0d 100644
--- a/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/supplychain/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/resources/META-INF/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/standalone/supplychain/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/supplychain/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/sca-java-M2/samples/standalone/supplychain/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-M2/samples/standalone/supplychain/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/resources/META-INF/sca/default.scdl
index 0633be84a5..0633be84a5 100644
--- a/branches/sca-java-M2/samples/standalone/supplychain/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/sca-java-M2/samples/standalone/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
index 85c6c5eece..85c6c5eece 100644
--- a/branches/sca-java-M2/samples/standalone/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/branches/sca-java-M2/samples/webapp/calculatorws/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/webapp/calculatorws/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/webapp/calculatorws/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/webapp/calculatorws/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/webapp/calculatorws/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/pom.xml
index bd5998a29e..bd5998a29e 100644
--- a/branches/sca-java-M2/samples/webapp/calculatorws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/pom.xml
diff --git a/branches/sca-java-M2/samples/webapp/calculatorws/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/readme.html
index 5ddd8c58b7..5ddd8c58b7 100644
--- a/branches/sca-java-M2/samples/webapp/calculatorws/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/readme.html
diff --git a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/AddService.java
index 6392676e76..6392676e76 100644
--- a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/AddServiceImpl.java
index 39e9be92e6..39e9be92e6 100644
--- a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/CalculatorService.java
index f1185a2494..f1185a2494 100644
--- a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/CalculatorServiceImpl.java
index d72c0d30c3..d72c0d30c3 100644
--- a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/DivideService.java
index 3158458b5e..3158458b5e 100644
--- a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/DivideServiceImpl.java
index 159ca463c9..159ca463c9 100644
--- a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/MathService.java b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/MathService.java
index 42e8e5ca67..42e8e5ca67 100644
--- a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/MathService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/MathService.java
diff --git a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/MathServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/MathServiceImpl.java
index 76caace7bb..76caace7bb 100644
--- a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/MathServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/MathServiceImpl.java
diff --git a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/MultiplyService.java
index 62db05175e..62db05175e 100644
--- a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/MultiplyServiceImpl.java
index 7276bb6964..7276bb6964 100644
--- a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/SubtractService.java
index 309f88f098..309f88f098 100644
--- a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/SubtractServiceImpl.java
index 3c3388f4cd..3c3388f4cd 100644
--- a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/resources/META-INF/LICENSE.txt
index 517cda22ca..517cda22ca 100644
--- a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/resources/META-INF/NOTICE
index 11c564eb19..11c564eb19 100644
--- a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/resources/wsdl/calculator.wsdl b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/resources/wsdl/calculator.wsdl
index 46928e7055..46928e7055 100644
--- a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/resources/wsdl/calculator.wsdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/resources/wsdl/calculator.wsdl
diff --git a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/webapp/WEB-INF/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/webapp/WEB-INF/default.scdl
index f54aa81dd4..f54aa81dd4 100644
--- a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/webapp/WEB-INF/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/webapp/WEB-INF/default.scdl
diff --git a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/webapp/WEB-INF/web.xml
index eab2430d04..eab2430d04 100644
--- a/branches/sca-java-M2/samples/webapp/calculatorws/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/calculatorws/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-M2/samples/webapp/greeterws-oneway/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/webapp/greeterws-oneway/LICENSE.txt
index 517cda22ca..517cda22ca 100644
--- a/branches/sca-java-M2/samples/webapp/greeterws-oneway/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/greeterws-oneway/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/webapp/greeterws-oneway/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/webapp/greeterws-oneway/NOTICE.txt
index e445fc9ae5..e445fc9ae5 100644
--- a/branches/sca-java-M2/samples/webapp/greeterws-oneway/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/greeterws-oneway/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/webapp/greeterws-oneway/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/webapp/greeterws-oneway/pom.xml
index 4ed2d8f6eb..4ed2d8f6eb 100644
--- a/branches/sca-java-M2/samples/webapp/greeterws-oneway/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/greeterws-oneway/pom.xml
diff --git a/branches/sca-java-M2/samples/webapp/greeterws-oneway/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/webapp/greeterws-oneway/readme.html
index c0ee8490de..c0ee8490de 100644
--- a/branches/sca-java-M2/samples/webapp/greeterws-oneway/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/greeterws-oneway/readme.html
diff --git a/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/java/greeter/GreeterImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/java/greeter/GreeterImpl.java
index 16cd96dbe3..16cd96dbe3 100644
--- a/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/java/greeter/GreeterImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/java/greeter/GreeterImpl.java
diff --git a/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/java/greeter/GreeterService.java b/sca-java-1.x/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/java/greeter/GreeterService.java
index fef29e17e5..fef29e17e5 100644
--- a/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/java/greeter/GreeterService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/java/greeter/GreeterService.java
diff --git a/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/resources/wsdl/greeter.wsdl b/sca-java-1.x/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/resources/wsdl/greeter.wsdl
index 1ee877fbef..1ee877fbef 100644
--- a/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/resources/wsdl/greeter.wsdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/resources/wsdl/greeter.wsdl
diff --git a/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/webapp/WEB-INF/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/webapp/WEB-INF/default.scdl
index b1dbb078c6..b1dbb078c6 100644
--- a/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/webapp/WEB-INF/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/webapp/WEB-INF/default.scdl
diff --git a/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/webapp/WEB-INF/web.xml
index 0498cb266c..0498cb266c 100644
--- a/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws-async/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws-async/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws-async/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws-async/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws-async/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/pom.xml
index 1648201f0a..1648201f0a 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws-async/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/pom.xml
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws-async/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/readme.html
index 33dd6d6123..33dd6d6123 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws-async/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/readme.html
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/java/helloworld/HelloWorldCallback.java b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/java/helloworld/HelloWorldCallback.java
index adc48e85a4..adc48e85a4 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/java/helloworld/HelloWorldCallback.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/java/helloworld/HelloWorldCallback.java
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/java/helloworld/HelloWorldImpl.java
index 3fadda95de..3fadda95de 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/java/helloworld/HelloWorldService.java
index 3db3b0cae4..3db3b0cae4 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/resources/META-INF/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/resources/META-INF/NOTICE
index 11c564eb19..11c564eb19 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/resources/wsdl/helloworld.wsdl
index b753706977..b753706977 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/sca/default.scdl
index 8d619ea894..8d619ea894 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/sca/default.scdl
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/tuscany/binding.axis2.scdl b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/tuscany/binding.axis2.scdl
index 852f36e10d..852f36e10d 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/tuscany/binding.axis2.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/tuscany/binding.axis2.scdl
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/tuscany/databinding.axiom.scdl b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/tuscany/databinding.axiom.scdl
index 49e8926aab..49e8926aab 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/tuscany/databinding.axiom.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/tuscany/databinding.axiom.scdl
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/tuscany/databinding.sdo.scdl b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/tuscany/databinding.sdo.scdl
index 8c1c36d466..8c1c36d466 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/tuscany/databinding.sdo.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/tuscany/databinding.sdo.scdl
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/tuscany/interface.wsdl.scdl b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/tuscany/interface.wsdl.scdl
index 9a15675f9f..9a15675f9f 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/tuscany/interface.wsdl.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/tuscany/interface.wsdl.scdl
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/tuscany/webapp.scdl b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/tuscany/webapp.scdl
index 3111557013..3111557013 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/tuscany/webapp.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/tuscany/webapp.scdl
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/WEB-INF/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/WEB-INF/default.scdl
index 3539ece4d1..3539ece4d1 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/WEB-INF/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/WEB-INF/default.scdl
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/WEB-INF/web.xml
index fc1ec3353b..fc1ec3353b 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/pom.xml
index 84a293f22d..84a293f22d 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/pom.xml
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/readme.html
index ef32023531..ef32023531 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/readme.html
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/src/main/java/helloworld/HelloWorldImpl.java
index b1de782f3a..b1de782f3a 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/src/main/java/helloworld/HelloWorldService.java
index 89ef9423d1..89ef9423d1 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/src/main/resources/META-INF/LICENSE.txt
index 517cda22ca..517cda22ca 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/src/main/resources/META-INF/NOTICE
index 11c564eb19..11c564eb19 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/src/main/resources/wsdl/helloworld.wsdl
index df5aafd567..df5aafd567 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws/src/main/webapp/WEB-INF/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/src/main/webapp/WEB-INF/default.scdl
index dd3a99141d..dd3a99141d 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws/src/main/webapp/WEB-INF/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/src/main/webapp/WEB-INF/default.scdl
diff --git a/branches/sca-java-M2/samples/webapp/helloworldws/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/src/main/webapp/WEB-INF/web.xml
index 1e8736d865..1e8736d865 100644
--- a/branches/sca-java-M2/samples/webapp/helloworldws/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/helloworldws/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-M2/samples/webapp/webapp/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/webapp/webapp/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/webapp/webapp/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/webapp/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/webapp/webapp/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/webapp/webapp/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/webapp/webapp/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/webapp/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/webapp/webapp/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/webapp/webapp/pom.xml
index 5539955b63..5539955b63 100644
--- a/branches/sca-java-M2/samples/webapp/webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/webapp/pom.xml
diff --git a/branches/sca-java-M2/samples/webapp/webapp/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/webapp/webapp/readme.html
index 1f7cde1bbb..1f7cde1bbb 100644
--- a/branches/sca-java-M2/samples/webapp/webapp/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/webapp/readme.html
diff --git a/branches/sca-java-M2/samples/webapp/webapp/src/main/webapp/WEB-INF/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/webapp/webapp/src/main/webapp/WEB-INF/default.scdl
index 81a4503be3..81a4503be3 100644
--- a/branches/sca-java-M2/samples/webapp/webapp/src/main/webapp/WEB-INF/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/webapp/src/main/webapp/WEB-INF/default.scdl
diff --git a/branches/sca-java-M2/samples/webapp/webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-M2/samples/webapp/webapp/src/main/webapp/WEB-INF/web.xml
index ac8231faac..ac8231faac 100644
--- a/branches/sca-java-M2/samples/webapp/webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-M2/samples/webapp/webapp/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-M2/samples/webapp/webapp/src/main/webapp/calc.jsp
index 7122eca852..7122eca852 100644
--- a/branches/sca-java-M2/samples/webapp/webapp/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/branches/sca-java-M2/samples/webapp/webapp/src/main/webapp/calc.jsp