Moving 2.x branches

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

191 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-2.0-M2/samples/README b/sca-java-2.x/branches/sca-java-2.0-M2/samples/README
index 4ccefa3695..4ccefa3695 100644
--- a/branches/sca-java-2.0-M2/samples/README
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/README
diff --git a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/README b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/README
index fb5afcc7ec..fb5afcc7ec 100644
--- a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/README
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/README
diff --git a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/build.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/build.xml
index e13ec494b0..e13ec494b0 100644
--- a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/build.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/build.xml
diff --git a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/calculator.png b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/calculator.png
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/calculator.png
diff --git a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/calculator.svg b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/calculator.svg
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/calculator.svg
diff --git a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/pom.xml
index 39921ef40e..39921ef40e 100644
--- a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/pom.xml
diff --git a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/AddService.java
index dd7ecb827d..dd7ecb827d 100644
--- a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClientImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClientImpl.java
index 7e5ff160f0..7e5ff160f0 100644
--- a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClientImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClientImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/sample/SampleClient.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/sample/SampleClient.java
index 6620f6a5e7..6620f6a5e7 100644
--- a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/sample/SampleClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/sample/SampleClient.java
diff --git a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/sample/SampleClientImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/sample/SampleClientImpl.java
index 3f6ecfdb03..3f6ecfdb03 100644
--- a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/sample/SampleClientImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/java/sample/SampleClientImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/resources/Calculator.composite
index 29dd7e3b6f..29dd7e3b6f 100644
--- a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
index 27a1ee74e4..27a1ee74e4 100644
--- a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
index bc90f0e566..bc90f0e566 100644
--- a/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-2.0-M2/samples/build-common.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/build-common.xml
index 5768912726..5768912726 100644
--- a/branches/sca-java-2.0-M2/samples/build-common.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/build-common.xml
diff --git a/branches/sca-java-2.0-M2/samples/calculator-equinox/README b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/README
index 7f76542622..7f76542622 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-equinox/README
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/README
diff --git a/branches/sca-java-2.0-M2/samples/calculator-equinox/build.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/build.xml
index 75c4839cfa..75c4839cfa 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-equinox/build.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/build.xml
diff --git a/branches/sca-java-2.0-M2/samples/calculator-equinox/calculator.png b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-equinox/calculator.png
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/calculator.png
diff --git a/branches/sca-java-2.0-M2/samples/calculator-equinox/calculator.svg b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-equinox/calculator.svg
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/calculator.svg
diff --git a/branches/sca-java-2.0-M2/samples/calculator-equinox/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/pom.xml
index 7c77c1e7ef..7c77c1e7ef 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-equinox/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/pom.xml
diff --git a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
index 84c98d7f70..84c98d7f70 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/resources/Calculator.composite
index 9450558145..9450558145 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
index b49e1da130..b49e1da130 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/META-INF/MANIFEST.MF
index 56d59b05ff..56d59b05ff 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-osgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M2/samples/calculator-osgi/README b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/README
index 332526d43a..332526d43a 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-osgi/README
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/README
diff --git a/branches/sca-java-2.0-M2/samples/calculator-osgi/build.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/build.xml
index 46522211f9..46522211f9 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-osgi/build.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/build.xml
diff --git a/branches/sca-java-2.0-M2/samples/calculator-osgi/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/pom.xml
index 2d77fc9e01..2d77fc9e01 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-osgi/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/pom.xml
diff --git a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
index 4408568629..4408568629 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
index afd5ea48fc..afd5ea48fc 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
index 39f55ca31f..39f55ca31f 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/resources/Calculator.composite
index 9450558145..9450558145 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
index 9d9b0a9ffb..9d9b0a9ffb 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/README b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/README
index 07b6dd9713..07b6dd9713 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/README
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/README
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/build.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/build.xml
index 16d94c3b0b..16d94c3b0b 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/build.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/build.xml
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/calculator-rmi-reference.png b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/calculator-rmi-reference.png
index 8c76b77a9f..8c76b77a9f 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/calculator-rmi-reference.png
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/calculator-rmi-reference.png
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/calculator-rmi-reference.svg b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/calculator-rmi-reference.svg
index ba802e6717..ba802e6717 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/calculator-rmi-reference.svg
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/calculator-rmi-reference.svg
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/pom.xml
index 187dddb261..187dddb261 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/pom.xml
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
index 3ee36be233..3ee36be233 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
index 0bac3da45c..0bac3da45c 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
index 675350860e..675350860e 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
index a5510954e0..a5510954e0 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index b7aa70f122..b7aa70f122 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/README b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/README
index 144881134b..144881134b 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/README
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/README
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/build.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/build.xml
index a0889ccc8a..a0889ccc8a 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/build.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/build.xml
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/calculator-rmi-service.png b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/calculator-rmi-service.png
index 574f5eb14b..574f5eb14b 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/calculator-rmi-service.png
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/calculator-rmi-service.png
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/calculator-rmi-service.svg b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/calculator-rmi-service.svg
index 9253110f98..9253110f98 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/calculator-rmi-service.svg
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/calculator-rmi-service.svg
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/pom.xml
index 2fd9914660..2fd9914660 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/pom.xml
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
index ffa40d0234..ffa40d0234 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
index b0a46b6dd0..b0a46b6dd0 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
index 675350860e..675350860e 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
index 02614ad6e1..02614ad6e1 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml
index 10140b7bc1..10140b7bc1 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index eb824679a8..eb824679a8 100644
--- a/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator/README b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/README
index 56c22d9c89..56c22d9c89 100644
--- a/branches/sca-java-2.0-M2/samples/calculator/README
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/README
diff --git a/branches/sca-java-2.0-M2/samples/calculator/build.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/build.xml
index 4411cae659..4411cae659 100644
--- a/branches/sca-java-2.0-M2/samples/calculator/build.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/build.xml
diff --git a/branches/sca-java-2.0-M2/samples/calculator/calculator.png b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-java-2.0-M2/samples/calculator/calculator.png
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/calculator.png
diff --git a/branches/sca-java-2.0-M2/samples/calculator/calculator.svg b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/calculator.svg
index 0615925c50..0615925c50 100644
--- a/branches/sca-java-2.0-M2/samples/calculator/calculator.svg
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/calculator.svg
diff --git a/branches/sca-java-2.0-M2/samples/calculator/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/pom.xml
index a9b2bfe9e2..a9b2bfe9e2 100644
--- a/branches/sca-java-2.0-M2/samples/calculator/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/pom.xml
diff --git a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/CalculatorClient.java
index 03fc56ceb3..03fc56ceb3 100644
--- a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/calculator/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/resources/Calculator.composite
index f67b212d99..f67b212d99 100644
--- a/branches/sca-java-2.0-M2/samples/calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-2.0-M2/samples/calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/resources/META-INF/sca-contribution.xml
index 10140b7bc1..10140b7bc1 100644
--- a/branches/sca-java-2.0-M2/samples/calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-2.0-M2/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
index 27a424b1cc..27a424b1cc 100644
--- a/branches/sca-java-2.0-M2/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-2.0-M2/samples/helloworld-bpel/README b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/README
index bf5f500ef3..bf5f500ef3 100644
--- a/branches/sca-java-2.0-M2/samples/helloworld-bpel/README
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/README
diff --git a/branches/sca-java-2.0-M2/samples/helloworld-bpel/build.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/build.xml
index 890a6427b8..890a6427b8 100644
--- a/branches/sca-java-2.0-M2/samples/helloworld-bpel/build.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/build.xml
diff --git a/branches/sca-java-2.0-M2/samples/helloworld-bpel/helloworld-bpel.png b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/helloworld-bpel.png
index 5f53a3c5d1..5f53a3c5d1 100644
--- a/branches/sca-java-2.0-M2/samples/helloworld-bpel/helloworld-bpel.png
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/helloworld-bpel.png
diff --git a/branches/sca-java-2.0-M2/samples/helloworld-bpel/helloworld-bpel.svg b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/helloworld-bpel.svg
index 5a98f1a07c..5a98f1a07c 100644
--- a/branches/sca-java-2.0-M2/samples/helloworld-bpel/helloworld-bpel.svg
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/helloworld-bpel.svg
diff --git a/branches/sca-java-2.0-M2/samples/helloworld-bpel/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/pom.xml
index 5a3c48f01c..5a3c48f01c 100644
--- a/branches/sca-java-2.0-M2/samples/helloworld-bpel/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/pom.xml
diff --git a/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
index e2d69eddf6..e2d69eddf6 100644
--- a/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
diff --git a/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/java/helloworld/Hello.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/java/helloworld/Hello.java
index ae7be07be6..ae7be07be6 100644
--- a/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/java/helloworld/Hello.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/java/helloworld/Hello.java
diff --git a/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
index 8378a15824..8378a15824 100644
--- a/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/resources/helloworld.bpel
index a88aa7960c..a88aa7960c 100644
--- a/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/resources/helloworld.bpel
diff --git a/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/resources/helloworld.composite b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/resources/helloworld.composite
index 91ce1f22d4..91ce1f22d4 100644
--- a/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/resources/log4j.properties b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/resources/log4j.properties
index 8649a71550..8649a71550 100644
--- a/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/resources/log4j.properties
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/main/resources/log4j.properties
diff --git a/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java.FIXME b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java.FIXME
index 3b85fa85a2..3b85fa85a2 100644
--- a/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java.FIXME
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java.FIXME
diff --git a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/README b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/README
index 28eccbdebb..28eccbdebb 100644
--- a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/README
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/README
diff --git a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/build.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/build.xml
index 54e7d8fe20..54e7d8fe20 100644
--- a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/build.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/build.xml
diff --git a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/calculator.png b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/calculator.png
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/calculator.png
diff --git a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/calculator.svg b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/calculator.svg
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/calculator.svg
diff --git a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/pom.xml
index f1062c2c74..f1062c2c74 100644
--- a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/pom.xml
diff --git a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java
index 84c98d7f70..84c98d7f70 100644
--- a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/resources/Calculator.composite
index 9450558145..9450558145 100644
--- a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
index 461c970373..461c970373 100644
--- a/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-2.0-M2/samples/logging.properties b/sca-java-2.x/branches/sca-java-2.0-M2/samples/logging.properties
index cf452e7812..cf452e7812 100644
--- a/branches/sca-java-2.0-M2/samples/logging.properties
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/logging.properties
diff --git a/branches/sca-java-2.0-M2/samples/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/pom.xml
index 66177fe804..66177fe804 100644
--- a/branches/sca-java-2.0-M2/samples/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/pom.xml
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/pom.xml
index ca187c75f4..ca187c75f4 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/pom.xml
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
index 931c1ad820..931c1ad820 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
index 6db7e93188..6db7e93188 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
index 3a51ed2623..3a51ed2623 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
index 7e2ca0a158..7e2ca0a158 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
index 7fd6bd6b6b..7fd6bd6b6b 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
index 189c142c99..189c142c99 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
index 5ca296e115..5ca296e115 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
index 89259021c7..89259021c7 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/pom.xml
index 743f6001b8..743f6001b8 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/pom.xml
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
index 66cef71a25..66cef71a25 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
index 56ed55b2d5..56ed55b2d5 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
index a5b03d4904..a5b03d4904 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
index ffd01cca73..ffd01cca73 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/pom.xml
index b72dd63e1e..b72dd63e1e 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/pom.xml
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
index 98c35dd431..98c35dd431 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
index 75ee7c2843..75ee7c2843 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
index 66cef71a25..66cef71a25 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
index a23399569a..a23399569a 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
index 77fa204a15..77fa204a15 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
index 0681c1f2bf..0681c1f2bf 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
index d0fb716b80..d0fb716b80 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
index f85602fcfa..f85602fcfa 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
index 56ed55b2d5..56ed55b2d5 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
index 0a16144519..0a16144519 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/index.html b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/index.html
index c79d29e6a5..c79d29e6a5 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/index.html
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/index.html
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/pom.xml
index c19bc6ed2d..c19bc6ed2d 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/pom.xml
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldService.java
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldServiceImpl.java
index 66cef71a25..66cef71a25 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.html b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.html
index 61eb207e23..61eb207e23 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.html
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.html
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.java
index 89b8d7eba4..89b8d7eba4 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.java
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/IMyService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/IMyService.java
index ab72a2b0f5..ab72a2b0f5 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/IMyService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/IMyService.java
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/MyService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/MyService.java
index 34d4dad625..34d4dad625 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/MyService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/MyService.java
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/WicketApplication.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/WicketApplication.java
index d26b729898..d26b729898 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/WicketApplication.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/WicketApplication.java
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/resources/log4j.properties b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/resources/log4j.properties
index 822153c0e2..822153c0e2 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/resources/log4j.properties
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/resources/log4j.properties
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.composite
index 7e2ca0a158..7e2ca0a158 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.xml
index 7b8490b2be..7b8490b2be 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld/pom.xml
index 9ac7f725cb..9ac7f725cb 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld/pom.xml
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java
index 010ca34f00..010ca34f00 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite
index f0609d9eb9..f0609d9eb9 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
index f13afbfb74..f13afbfb74 100644
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml