Moving 1.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835139 13f79535-47bb-0310-9956-ffa450edef68

166 files changed, 0 insertions, 0 deletions

diff --git a/branches/java-M1/java/samples/sca/build.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/build.xml
index 3df88aeeeb..3df88aeeeb 100644
--- a/branches/java-M1/java/samples/sca/build.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/build.xml
diff --git a/branches/java-M1/java/samples/sca/calculator/build.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/build.xml
index 91e143311b..91e143311b 100644
--- a/branches/java-M1/java/samples/sca/calculator/build.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/build.xml
diff --git a/branches/java-M1/java/samples/sca/calculator/pom.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/pom.xml
index 2a6e6864d8..2a6e6864d8 100644
--- a/branches/java-M1/java/samples/sca/calculator/pom.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/pom.xml
diff --git a/branches/java-M1/java/samples/sca/calculator/readme.htm b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/readme.htm
index 8ae5ca6488..8ae5ca6488 100644
--- a/branches/java-M1/java/samples/sca/calculator/readme.htm
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/readme.htm
diff --git a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/AddService.java
index 34a3edeb0e..34a3edeb0e 100644
--- a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/AddService.java
diff --git a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/AddServiceImpl.java
index 02cddd08db..02cddd08db 100644
--- a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/CalculatorClient.java
index ee1c138940..ee1c138940 100644
--- a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/CalculatorService.java
index ff39e0b57a..ff39e0b57a 100644
--- a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/CalculatorServiceImpl.java
index b81a6f00fd..b81a6f00fd 100644
--- a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/DivideService.java
index 664ba2ba61..664ba2ba61 100644
--- a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/DivideServiceImpl.java
index 12d0c65ed2..12d0c65ed2 100644
--- a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/MultiplyService.java
index fcb274dc8a..fcb274dc8a 100644
--- a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/MultiplyServiceImpl.java
index c274d1a6d1..c274d1a6d1 100644
--- a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/SubtractService.java
index 2e0fcb2b36..2e0fcb2b36 100644
--- a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/SubtractServiceImpl.java
index 62103906fa..62103906fa 100644
--- a/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/java-M1/java/samples/sca/calculator/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/java-M1/java/samples/sca/calculator/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/java-M1/java/samples/sca/calculator/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/java-M1/java/samples/sca/calculator/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/resources/META-INF/NOTICE
diff --git a/branches/java-M1/java/samples/sca/calculator/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/java-M1/java/samples/sca/calculator/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/resources/META-INF/README.txt
diff --git a/branches/java-M1/java/samples/sca/calculator/src/main/resources/logging.properties b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/resources/logging.properties
index 58407bd5a9..58407bd5a9 100644
--- a/branches/java-M1/java/samples/sca/calculator/src/main/resources/logging.properties
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/resources/logging.properties
diff --git a/branches/java-M1/java/samples/sca/calculator/src/main/resources/sca.module b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/resources/sca.module
index d37fc3f659..d37fc3f659 100644
--- a/branches/java-M1/java/samples/sca/calculator/src/main/resources/sca.module
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/main/resources/sca.module
diff --git a/branches/java-M1/java/samples/sca/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/test/java/calculator/CalculatorTestCase.java
index f6b5d5f24d..f6b5d5f24d 100644
--- a/branches/java-M1/java/samples/sca/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/java-M1/java/samples/sca/customerinfo/build.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/build.xml
index c35e86f885..c35e86f885 100644
--- a/branches/java-M1/java/samples/sca/customerinfo/build.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/build.xml
diff --git a/branches/java-M1/java/samples/sca/customerinfo/pom.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/pom.xml
index b299059dfe..b299059dfe 100644
--- a/branches/java-M1/java/samples/sca/customerinfo/pom.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/pom.xml
diff --git a/branches/java-M1/java/samples/sca/customerinfo/readme.htm b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/readme.htm
index 5619733093..5619733093 100644
--- a/branches/java-M1/java/samples/sca/customerinfo/readme.htm
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/readme.htm
diff --git a/branches/java-M1/java/samples/sca/customerinfo/src/main/java/customerinfo/CustomerInfoClient.java b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/src/main/java/customerinfo/CustomerInfoClient.java
index 7f97c36625..7f97c36625 100644
--- a/branches/java-M1/java/samples/sca/customerinfo/src/main/java/customerinfo/CustomerInfoClient.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/src/main/java/customerinfo/CustomerInfoClient.java
diff --git a/branches/java-M1/java/samples/sca/customerinfo/src/main/java/customerinfo/CustomerInfoServiceImpl.java b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/src/main/java/customerinfo/CustomerInfoServiceImpl.java
index 090076aa0d..090076aa0d 100644
--- a/branches/java-M1/java/samples/sca/customerinfo/src/main/java/customerinfo/CustomerInfoServiceImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/src/main/java/customerinfo/CustomerInfoServiceImpl.java
diff --git a/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/META-INF/NOTICE
diff --git a/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/META-INF/README.txt
diff --git a/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/logging.properties b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/logging.properties
index 58407bd5a9..58407bd5a9 100644
--- a/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/logging.properties
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/logging.properties
diff --git a/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/sca.module b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/sca.module
index 8d6a38197a..8d6a38197a 100644
--- a/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/sca.module
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/sca.module
diff --git a/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/wsdl/customer.xsd b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/wsdl/customer.xsd
index 4d8aeff0b0..4d8aeff0b0 100644
--- a/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/wsdl/customer.xsd
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/wsdl/customer.xsd
diff --git a/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/wsdl/customerinfo.wsdl b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/wsdl/customerinfo.wsdl
index 58978aad0e..58978aad0e 100644
--- a/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/wsdl/customerinfo.wsdl
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/src/main/resources/wsdl/customerinfo.wsdl
diff --git a/branches/java-M1/java/samples/sca/customerinfo/src/test/java/customerinfo/CustomerInfoTestCase.java b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/src/test/java/customerinfo/CustomerInfoTestCase.java
index 08b1e701d1..08b1e701d1 100644
--- a/branches/java-M1/java/samples/sca/customerinfo/src/test/java/customerinfo/CustomerInfoTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/customerinfo/src/test/java/customerinfo/CustomerInfoTestCase.java
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/client/build.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/build.xml
index 38d8bd2d1f..38d8bd2d1f 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/client/build.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/build.xml
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/client/pom.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/pom.xml
index ea6d570a06..ea6d570a06 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/client/pom.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/pom.xml
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/client/readme.htm b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/readme.htm
index 8449aace44..8449aace44 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/client/readme.htm
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/readme.htm
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/java/helloworld/HelloWorldClient.java
index be121bc63b..be121bc63b 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/java/helloworld/HelloWorldService.java
index 1f87f17d74..1f87f17d74 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/META-INF/NOTICE
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/META-INF/README.txt
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/logging.properties b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/logging.properties
index 58407bd5a9..58407bd5a9 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/logging.properties
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/logging.properties
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/sca.module b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/sca.module
index cf6a8f675c..cf6a8f675c 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/sca.module
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/sca.module
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/wsdl/helloworld.wsdl
index cc9fc6a529..cc9fc6a529 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/client/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/pom.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/pom.xml
index 8d34ad5696..8d34ad5696 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/pom.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/pom.xml
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/server/activemq.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/activemq.xml
index 7ba4e94a60..7ba4e94a60 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/server/activemq.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/activemq.xml
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/server/build.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/build.xml
index 058d1f3909..058d1f3909 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/server/build.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/build.xml
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/server/pom.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/pom.xml
index 042189b5ec..042189b5ec 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/server/pom.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/pom.xml
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/server/readme.htm b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/readme.htm
index a069618b38..a069618b38 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/server/readme.htm
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/readme.htm
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/java/helloworld/HelloWorldImpl.java
index bf7209e7a8..bf7209e7a8 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/java/helloworld/HelloWorldServer.java
index e6290b3f37..e6290b3f37 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/java/helloworld/HelloWorldService.java
index 1f87f17d74..1f87f17d74 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/resources/META-INF/NOTICE
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/resources/META-INF/README.txt
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/resources/sca.module b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/resources/sca.module
index 460faf4ef0..460faf4ef0 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/resources/sca.module
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/resources/sca.module
diff --git a/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/resources/wsdl/helloworld.wsdl
index 09459bb209..09459bb209 100644
--- a/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld-jms/server/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/java-M1/java/samples/sca/helloworld/build.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/build.xml
index 1c9843ff2c..1c9843ff2c 100644
--- a/branches/java-M1/java/samples/sca/helloworld/build.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/build.xml
diff --git a/branches/java-M1/java/samples/sca/helloworld/pom.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/pom.xml
index 9a936abe29..9a936abe29 100644
--- a/branches/java-M1/java/samples/sca/helloworld/pom.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/pom.xml
diff --git a/branches/java-M1/java/samples/sca/helloworld/readme.htm b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/readme.htm
index 82de419b1c..82de419b1c 100644
--- a/branches/java-M1/java/samples/sca/helloworld/readme.htm
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/readme.htm
diff --git a/branches/java-M1/java/samples/sca/helloworld/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/src/main/java/helloworld/HelloWorldClient.java
index da46402b05..da46402b05 100644
--- a/branches/java-M1/java/samples/sca/helloworld/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/java-M1/java/samples/sca/helloworld/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/src/main/java/helloworld/HelloWorldImpl.java
index bf7209e7a8..bf7209e7a8 100644
--- a/branches/java-M1/java/samples/sca/helloworld/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/java-M1/java/samples/sca/helloworld/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/src/main/java/helloworld/HelloWorldService.java
index 1f87f17d74..1f87f17d74 100644
--- a/branches/java-M1/java/samples/sca/helloworld/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/java-M1/java/samples/sca/helloworld/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/java-M1/java/samples/sca/helloworld/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/java-M1/java/samples/sca/helloworld/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/java-M1/java/samples/sca/helloworld/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/src/main/resources/META-INF/NOTICE
diff --git a/branches/java-M1/java/samples/sca/helloworld/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/java-M1/java/samples/sca/helloworld/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/src/main/resources/META-INF/README.txt
diff --git a/branches/java-M1/java/samples/sca/helloworld/src/main/resources/sca.module b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/src/main/resources/sca.module
index 22d319a165..22d319a165 100644
--- a/branches/java-M1/java/samples/sca/helloworld/src/main/resources/sca.module
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/src/main/resources/sca.module
diff --git a/branches/java-M1/java/samples/sca/helloworld/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
index 1a1c906ca8..1a1c906ca8 100644
--- a/branches/java-M1/java/samples/sca/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/java-M1/java/samples/sca/helloworlde4xws/build.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/build.xml
index 5c72a1784e..5c72a1784e 100644
--- a/branches/java-M1/java/samples/sca/helloworlde4xws/build.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/build.xml
diff --git a/branches/java-M1/java/samples/sca/helloworlde4xws/pom.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/pom.xml
index 8f806cc986..8f806cc986 100644
--- a/branches/java-M1/java/samples/sca/helloworlde4xws/pom.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/pom.xml
diff --git a/branches/java-M1/java/samples/sca/helloworlde4xws/readme.htm b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/readme.htm
index 53bc323d1f..53bc323d1f 100644
--- a/branches/java-M1/java/samples/sca/helloworlde4xws/readme.htm
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/readme.htm
diff --git a/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/META-INF/NOTICE
diff --git a/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/META-INF/README.txt
diff --git a/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/helloworld/HelloWorldImpl.componentType b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/helloworld/HelloWorldImpl.componentType
index 54462091f5..54462091f5 100644
--- a/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/helloworld/HelloWorldImpl.componentType
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/helloworld/HelloWorldImpl.componentType
diff --git a/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/helloworld/HelloWorldImpl.js b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/helloworld/HelloWorldImpl.js
index 1529784c0f..1529784c0f 100644
--- a/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/helloworld/HelloWorldImpl.js
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/helloworld/HelloWorldImpl.js
diff --git a/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/sca.module b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/sca.module
index 4f5724d64b..4f5724d64b 100644
--- a/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/sca.module
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/sca.module
diff --git a/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/wsdl/helloworld.wsdl
index cbc15f58eb..cbc15f58eb 100644
--- a/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/webapp/WEB-INF/web.xml
index 37c6d8e249..37c6d8e249 100644
--- a/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworlde4xws/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/java-M1/java/samples/sca/helloworldjsclient/build.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsclient/build.xml
index cd35274ff1..cd35274ff1 100644
--- a/branches/java-M1/java/samples/sca/helloworldjsclient/build.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsclient/build.xml
diff --git a/branches/java-M1/java/samples/sca/helloworldjsclient/pom.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsclient/pom.xml
index f9a710d444..f9a710d444 100644
--- a/branches/java-M1/java/samples/sca/helloworldjsclient/pom.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsclient/pom.xml
diff --git a/branches/java-M1/java/samples/sca/helloworldjsclient/readme.htm b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsclient/readme.htm
index 5aa9dbc3d5..5aa9dbc3d5 100644
--- a/branches/java-M1/java/samples/sca/helloworldjsclient/readme.htm
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsclient/readme.htm
diff --git a/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/resources/META-INF/NOTICE
diff --git a/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/resources/META-INF/README.txt
diff --git a/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/resources/sca.module b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/resources/sca.module
index f73adafbd5..f73adafbd5 100644
--- a/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/resources/sca.module
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/resources/sca.module
diff --git a/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/resources/wsdl/helloworld.wsdl
index cbc15f58eb..cbc15f58eb 100644
--- a/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/webapp/HelloWorldClient.html b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/webapp/HelloWorldClient.html
index 98d76dc25e..98d76dc25e 100644
--- a/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/webapp/HelloWorldClient.html
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/webapp/HelloWorldClient.html
diff --git a/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/webapp/WEB-INF/web.xml
index 9757e60124..9757e60124 100644
--- a/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsclient/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/java-M1/java/samples/sca/helloworldjsonrpc/build.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/build.xml
index 2f655f9965..2f655f9965 100644
--- a/branches/java-M1/java/samples/sca/helloworldjsonrpc/build.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/build.xml
diff --git a/branches/java-M1/java/samples/sca/helloworldjsonrpc/pom.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/pom.xml
index 1949d593e0..1949d593e0 100644
--- a/branches/java-M1/java/samples/sca/helloworldjsonrpc/pom.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/pom.xml
diff --git a/branches/java-M1/java/samples/sca/helloworldjsonrpc/readme.htm b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/readme.htm
index 51c3dd2249..51c3dd2249 100644
--- a/branches/java-M1/java/samples/sca/helloworldjsonrpc/readme.htm
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/readme.htm
diff --git a/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/java/org/apache/tuscany/samples/helloworldjsonrpc/HelloWorldService.java b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/java/org/apache/tuscany/samples/helloworldjsonrpc/HelloWorldService.java
index f5d3ef6066..f5d3ef6066 100644
--- a/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/java/org/apache/tuscany/samples/helloworldjsonrpc/HelloWorldService.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/java/org/apache/tuscany/samples/helloworldjsonrpc/HelloWorldService.java
diff --git a/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/java/org/apache/tuscany/samples/helloworldjsonrpc/HelloWorldServiceComponentImpl.java b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/java/org/apache/tuscany/samples/helloworldjsonrpc/HelloWorldServiceComponentImpl.java
index 3eb259f90e..3eb259f90e 100644
--- a/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/java/org/apache/tuscany/samples/helloworldjsonrpc/HelloWorldServiceComponentImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/java/org/apache/tuscany/samples/helloworldjsonrpc/HelloWorldServiceComponentImpl.java
diff --git a/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/resources/META-INF/NOTICE
diff --git a/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/resources/META-INF/README.txt
diff --git a/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/resources/sca.module b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/resources/sca.module
index 0ad0131754..0ad0131754 100644
--- a/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/resources/sca.module
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/resources/sca.module
diff --git a/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/webapp/HelloWorldJSONRPC.html
index 9e5357a847..9e5357a847 100644
--- a/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/webapp/HelloWorldJSONRPC.html
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/webapp/WEB-INF/web.xml
index 547153dd0e..547153dd0e 100644
--- a/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldjsonrpc/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/java-M1/java/samples/sca/helloworldweb/build.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/build.xml
index 077ea72dd1..077ea72dd1 100644
--- a/branches/java-M1/java/samples/sca/helloworldweb/build.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/build.xml
diff --git a/branches/java-M1/java/samples/sca/helloworldweb/pom.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/pom.xml
index fdc9629d9e..fdc9629d9e 100644
--- a/branches/java-M1/java/samples/sca/helloworldweb/pom.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/pom.xml
diff --git a/branches/java-M1/java/samples/sca/helloworldweb/readme.htm b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/readme.htm
index 037b1d70f8..037b1d70f8 100644
--- a/branches/java-M1/java/samples/sca/helloworldweb/readme.htm
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/readme.htm
diff --git a/branches/java-M1/java/samples/sca/helloworldweb/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/src/main/java/helloworld/HelloWorldImpl.java
index bf7209e7a8..bf7209e7a8 100644
--- a/branches/java-M1/java/samples/sca/helloworldweb/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/java-M1/java/samples/sca/helloworldweb/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/src/main/java/helloworld/HelloWorldService.java
index 1f87f17d74..1f87f17d74 100644
--- a/branches/java-M1/java/samples/sca/helloworldweb/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/java-M1/java/samples/sca/helloworldweb/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/java-M1/java/samples/sca/helloworldweb/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/java-M1/java/samples/sca/helloworldweb/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/java-M1/java/samples/sca/helloworldweb/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/src/main/resources/META-INF/NOTICE
diff --git a/branches/java-M1/java/samples/sca/helloworldweb/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/java-M1/java/samples/sca/helloworldweb/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/src/main/resources/META-INF/README.txt
diff --git a/branches/java-M1/java/samples/sca/helloworldweb/src/main/resources/sca.module b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/src/main/resources/sca.module
index ec329b8a23..ec329b8a23 100644
--- a/branches/java-M1/java/samples/sca/helloworldweb/src/main/resources/sca.module
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/src/main/resources/sca.module
diff --git a/branches/java-M1/java/samples/sca/helloworldweb/src/main/webapp/HelloWorldWeb.jsp b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/src/main/webapp/HelloWorldWeb.jsp
index 5ebc111dd6..5ebc111dd6 100644
--- a/branches/java-M1/java/samples/sca/helloworldweb/src/main/webapp/HelloWorldWeb.jsp
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/src/main/webapp/HelloWorldWeb.jsp
diff --git a/branches/java-M1/java/samples/sca/helloworldweb/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/src/main/webapp/WEB-INF/web.xml
index e79a53705f..e79a53705f 100644
--- a/branches/java-M1/java/samples/sca/helloworldweb/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/java-M1/java/samples/sca/helloworldweb/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/src/test/java/helloworld/HelloWorldTestCase.java
index b74323fe2a..b74323fe2a 100644
--- a/branches/java-M1/java/samples/sca/helloworldweb/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldweb/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/java-M1/java/samples/sca/helloworldws-celtix/build.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/build.xml
index 6cdc29cf7d..6cdc29cf7d 100644
--- a/branches/java-M1/java/samples/sca/helloworldws-celtix/build.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/build.xml
diff --git a/branches/java-M1/java/samples/sca/helloworldws-celtix/pom.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/pom.xml
index b16d3b17c8..b16d3b17c8 100644
--- a/branches/java-M1/java/samples/sca/helloworldws-celtix/pom.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/pom.xml
diff --git a/branches/java-M1/java/samples/sca/helloworldws-celtix/readme.htm b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/readme.htm
index 9b6b360892..9b6b360892 100644
--- a/branches/java-M1/java/samples/sca/helloworldws-celtix/readme.htm
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/readme.htm
diff --git a/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/java/helloworld/HelloWorldImpl.java
index bf7209e7a8..bf7209e7a8 100644
--- a/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/java/helloworld/HelloWorldServer.java
index e6290b3f37..e6290b3f37 100644
--- a/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/java/helloworld/HelloWorldService.java
index 1f87f17d74..1f87f17d74 100644
--- a/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/resources/META-INF/NOTICE
diff --git a/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/resources/META-INF/README.txt
diff --git a/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/resources/sca.module b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/resources/sca.module
index e16c62129a..e16c62129a 100644
--- a/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/resources/sca.module
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/resources/sca.module
diff --git a/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/resources/wsdl/helloworld.wsdl
index 5e89bb071d..5e89bb071d 100644
--- a/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws-celtix/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/java-M1/java/samples/sca/helloworldws/build.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/build.xml
index 2ec1f34959..2ec1f34959 100644
--- a/branches/java-M1/java/samples/sca/helloworldws/build.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/build.xml
diff --git a/branches/java-M1/java/samples/sca/helloworldws/pom.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/pom.xml
index 32086e1074..32086e1074 100644
--- a/branches/java-M1/java/samples/sca/helloworldws/pom.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/pom.xml
diff --git a/branches/java-M1/java/samples/sca/helloworldws/readme.htm b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/readme.htm
index af3620aa9f..af3620aa9f 100644
--- a/branches/java-M1/java/samples/sca/helloworldws/readme.htm
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/readme.htm
diff --git a/branches/java-M1/java/samples/sca/helloworldws/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/src/main/java/helloworld/HelloWorldImpl.java
index bf7209e7a8..bf7209e7a8 100644
--- a/branches/java-M1/java/samples/sca/helloworldws/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/java-M1/java/samples/sca/helloworldws/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/src/main/java/helloworld/HelloWorldService.java
index 1f87f17d74..1f87f17d74 100644
--- a/branches/java-M1/java/samples/sca/helloworldws/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/java-M1/java/samples/sca/helloworldws/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/java-M1/java/samples/sca/helloworldws/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/java-M1/java/samples/sca/helloworldws/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/java-M1/java/samples/sca/helloworldws/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/src/main/resources/META-INF/NOTICE
diff --git a/branches/java-M1/java/samples/sca/helloworldws/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/java-M1/java/samples/sca/helloworldws/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/src/main/resources/META-INF/README.txt
diff --git a/branches/java-M1/java/samples/sca/helloworldws/src/main/resources/sca.module b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/src/main/resources/sca.module
index 20139fced7..20139fced7 100644
--- a/branches/java-M1/java/samples/sca/helloworldws/src/main/resources/sca.module
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/src/main/resources/sca.module
diff --git a/branches/java-M1/java/samples/sca/helloworldws/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/src/main/resources/wsdl/helloworld.wsdl
index cbc15f58eb..cbc15f58eb 100644
--- a/branches/java-M1/java/samples/sca/helloworldws/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/java-M1/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/web.xml
index 603eebabb1..603eebabb1 100644
--- a/branches/java-M1/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/java-M1/java/samples/sca/helloworldwsclient/build.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/build.xml
index 80258a4c81..80258a4c81 100644
--- a/branches/java-M1/java/samples/sca/helloworldwsclient/build.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/build.xml
diff --git a/branches/java-M1/java/samples/sca/helloworldwsclient/pom.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/pom.xml
index 9291bb5e47..9291bb5e47 100644
--- a/branches/java-M1/java/samples/sca/helloworldwsclient/pom.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/pom.xml
diff --git a/branches/java-M1/java/samples/sca/helloworldwsclient/readme.htm b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/readme.htm
index 5a69727ad2..5a69727ad2 100644
--- a/branches/java-M1/java/samples/sca/helloworldwsclient/readme.htm
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/readme.htm
diff --git a/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/java/helloworld/HelloWorldClient.java
index be121bc63b..be121bc63b 100644
--- a/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/java/helloworld/HelloWorldService.java
index 1f87f17d74..1f87f17d74 100644
--- a/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/META-INF/NOTICE
diff --git a/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/META-INF/README.txt
diff --git a/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/logging.properties b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/logging.properties
index 58407bd5a9..58407bd5a9 100644
--- a/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/logging.properties
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/logging.properties
diff --git a/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/sca.module b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/sca.module
index 3247636e91..3247636e91 100644
--- a/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/sca.module
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/sca.module
diff --git a/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl
index cbc15f58eb..cbc15f58eb 100644
--- a/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/java-M1/java/samples/sca/pom.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/pom.xml
index ae04924f5e..ae04924f5e 100644
--- a/branches/java-M1/java/samples/sca/pom.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/pom.xml
diff --git a/branches/java-M1/java/samples/sca/readme.htm b/sca-java-1.x/branches/java-M1/java/samples/sca/readme.htm
index 2e3af5de93..2e3af5de93 100644
--- a/branches/java-M1/java/samples/sca/readme.htm
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/readme.htm
diff --git a/branches/java-M1/java/samples/sca/supplychain/build.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/build.xml
index 8311b1708b..8311b1708b 100644
--- a/branches/java-M1/java/samples/sca/supplychain/build.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/build.xml
diff --git a/branches/java-M1/java/samples/sca/supplychain/pom.xml b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/pom.xml
index 3ee6f1e9f1..3ee6f1e9f1 100644
--- a/branches/java-M1/java/samples/sca/supplychain/pom.xml
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/pom.xml
diff --git a/branches/java-M1/java/samples/sca/supplychain/readme.htm b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/readme.htm
index d7e2d92c53..d7e2d92c53 100644
--- a/branches/java-M1/java/samples/sca/supplychain/readme.htm
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/readme.htm
diff --git a/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/Customer.java b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/Customer.java
index 5d35802833..5d35802833 100644
--- a/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/Customer.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/Customer.java
diff --git a/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/CustomerComponentImpl.java b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
index 2ec01ebbc8..2ec01ebbc8 100644
--- a/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
diff --git a/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/Retailer.java b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/Retailer.java
index 9496e730f5..9496e730f5 100644
--- a/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/Retailer.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/Retailer.java
diff --git a/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/RetailerComponentImpl.java b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
index 4079bd2aea..4079bd2aea 100644
--- a/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
diff --git a/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/Shipper.java b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/Shipper.java
index 94d60d99a2..94d60d99a2 100644
--- a/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/Shipper.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/Shipper.java
diff --git a/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/ShipperComponentImpl.java b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
index 4283bed795..4283bed795 100644
--- a/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
diff --git a/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/SupplyChainClient.java b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/SupplyChainClient.java
index de30da9428..de30da9428 100644
--- a/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/Warehouse.java b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/Warehouse.java
index de52e71c1e..de52e71c1e 100644
--- a/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/Warehouse.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/Warehouse.java
diff --git a/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
index 96e0f2795b..96e0f2795b 100644
--- a/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
diff --git a/branches/java-M1/java/samples/sca/supplychain/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/java-M1/java/samples/sca/supplychain/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/java-M1/java/samples/sca/supplychain/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/java-M1/java/samples/sca/supplychain/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/resources/META-INF/NOTICE
diff --git a/branches/java-M1/java/samples/sca/supplychain/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/java-M1/java/samples/sca/supplychain/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/resources/META-INF/README.txt
diff --git a/branches/java-M1/java/samples/sca/supplychain/src/main/resources/logging.properties b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/resources/logging.properties
index 58407bd5a9..58407bd5a9 100644
--- a/branches/java-M1/java/samples/sca/supplychain/src/main/resources/logging.properties
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/resources/logging.properties
diff --git a/branches/java-M1/java/samples/sca/supplychain/src/main/resources/sca.module b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/resources/sca.module
index e44798b89f..e44798b89f 100644
--- a/branches/java-M1/java/samples/sca/supplychain/src/main/resources/sca.module
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/main/resources/sca.module
diff --git a/branches/java-M1/java/samples/sca/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
index ecc3b17985..ecc3b17985 100644
--- a/branches/java-M1/java/samples/sca/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/samples/sca/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java