Moving 1.x branches

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

850 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-1.2.1/samples/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/README
index e4c2bcf7fb..e4c2bcf7fb 100644
--- a/branches/sca-java-1.2.1/samples/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/README
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/README
index 94716b151f..94716b151f 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/README
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/build.xml
index 5df5981bea..5df5981bea 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/build.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/pom.xml
index 0c55e732f2..0c55e732f2 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
index 3fe1598e0d..3fe1598e0d 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
index 0f6fee82be..0f6fee82be 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
index af759dbf93..af759dbf93 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
index 19c9271bb8..19c9271bb8 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
index 7eaa7e4fb5..7eaa7e4fb5 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
index 91697fcd9a..91697fcd9a 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
index 83b51bcbeb..83b51bcbeb 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
index ba74d8f99a..ba74d8f99a 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
index 0efc319af9..0efc319af9 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
index 1cd1e5af4e..1cd1e5af4e 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
index 24376176bf..24376176bf 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
index c6a6d3a4dd..c6a6d3a4dd 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
index ba05c3458c..ba05c3458c 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
index 4b06630102..4b06630102 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
index 21defcd3ee..21defcd3ee 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
index 9ce8cb4f9b..9ce8cb4f9b 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
index 7df7b2c147..7df7b2c147 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
index 4f7c13c735..4f7c13c735 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
index fb13a36199..fb13a36199 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
index 447917f010..447917f010 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
index 8ea2395d04..8ea2395d04 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
index 32336dd94f..32336dd94f 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
index 55be293862..55be293862 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 06d53250c1..06d53250c1 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 4ad61f573d..4ad61f573d 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index efa475ef92..efa475ef92 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
index 9b64df4871..9b64df4871 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/Echo.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/Echo.java
index 1d5e973f33..1d5e973f33 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/Echo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/Echo.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
index ba68dfe908..ba68dfe908 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
index 7383077f18..7383077f18 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
index ab05516622..ab05516622 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/resources/EchoBinding.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
index 176d67cc4b..176d67cc4b 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/resources/definitions.xml
index d3c7639a92..d3c7639a92 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/resources/definitions.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-echo/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/README
index 2772460cc6..2772460cc6 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/README
diff --git a/branches/sca-java-1.2.1/samples/binding-echo/binding-echo.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/binding-echo.png
index a38d985363..a38d985363 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo/binding-echo.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/binding-echo.png
diff --git a/branches/sca-java-1.2.1/samples/binding-echo/binding-echo.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/binding-echo.svg
index 5b5051bef5..5b5051bef5 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo/binding-echo.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/binding-echo.svg
diff --git a/branches/sca-java-1.2.1/samples/binding-echo/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/build.xml
index 7689ef3a54..7689ef3a54 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/build.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-echo/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/pom.xml
index cc89785362..cc89785362 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/Echo.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/Echo.java
index 1d5e973f33..1d5e973f33 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/Echo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/Echo.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/EchoBindingClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
index 21bdff4011..21bdff4011 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
index ba68dfe908..ba68dfe908 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo/src/main/resources/EchoBinding.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/src/main/resources/EchoBinding.composite
index 94612fb325..94612fb325 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo/src/main/resources/EchoBinding.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/src/main/resources/EchoBinding.composite
diff --git a/branches/sca-java-1.2.1/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
index 1a597fc80f..1a597fc80f 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/README
index aadb94063f..aadb94063f 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/README
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/binding-notification-broker.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/binding-notification-broker.png
index 49030650f2..49030650f2 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/binding-notification-broker.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/binding-notification-broker.png
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/build.xml
index f24acb008b..f24acb008b 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/build.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/pom.xml
index 6a7e8022f5..6a7e8022f5 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
index b5926c520f..b5926c520f 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
index 49ce48406c..49ce48406c 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
index ac20ba4969..ac20ba4969 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
index c913fd90be..c913fd90be 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
index 93730acf0b..93730acf0b 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
index 2dc70f8ed1..2dc70f8ed1 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
index f490c34ea6..f490c34ea6 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
index b823bbebcc..b823bbebcc 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/README
index bcf999dead..bcf999dead 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/README
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/binding-notification-consumer.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/binding-notification-consumer.png
index 33e1966c3e..33e1966c3e 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/binding-notification-consumer.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/binding-notification-consumer.png
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/build.xml
index 8b8cc74c84..8b8cc74c84 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/build.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/pom.xml
index b2eb6d6194..b2eb6d6194 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
index 90025332c5..90025332c5 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
index 0c89e4e5b2..0c89e4e5b2 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
index 26a96b21da..26a96b21da 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
index 2dc70f8ed1..2dc70f8ed1 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
index 8f9bcc4438..8f9bcc4438 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
index b823bbebcc..b823bbebcc 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
index ebb1580b15..ebb1580b15 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/README
index 3e6f0a5d99..3e6f0a5d99 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/README
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/binding-notification-producer.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/binding-notification-producer.png
index 34c347c893..34c347c893 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/binding-notification-producer.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/binding-notification-producer.png
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/build.xml
index 3814f3ac63..3814f3ac63 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/build.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/pom.xml
index d8fc075d34..d8fc075d34 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
index 19684d2fb0..19684d2fb0 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
index ea649b5818..ea649b5818 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
index 65711af2c1..65711af2c1 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
index 99decf273b..99decf273b 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
index 2dc70f8ed1..2dc70f8ed1 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
index 2db6ea655b..2db6ea655b 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
index b823bbebcc..b823bbebcc 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
index 1b909601e4..1b909601e4 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/README
index 065401e424..065401e424 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/README
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/build.xml
index 8fcec13a05..8fcec13a05 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/build.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/calculator-distributed.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/calculator-distributed.png
index 7c0e175664..7c0e175664 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/calculator-distributed.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/calculator-distributed.png
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/calculator-distributed.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/calculator-distributed.svg
index be5a4b8185..be5a4b8185 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/calculator-distributed.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/calculator-distributed.svg
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/cloud.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/cloud.composite
index 85e2f9c7f3..85e2f9c7f3 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/cloud.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/cloud.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/domain.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/domain.composite
index 643e22d0cf..643e22d0cf 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/domain.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/domain.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/pom.xml
index db30a3b1b6..db30a3b1b6 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/AddService.java
index d7dc4473ad..d7dc4473ad 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
index e9b7e254e5..e9b7e254e5 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
index da869e00fd..da869e00fd 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
index 78ab9c6ee0..78ab9c6ee0 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
index 1010207154..1010207154 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
index 1a4860d52d..1a4860d52d 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
index f9bdde79e1..f9bdde79e1 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
index 74849fe50b..74849fe50b 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchDomain.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
index dd19f6b49b..dd19f6b49b 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
index ed7fe55abc..ed7fe55abc 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
index 8f29cc17aa..8f29cc17aa 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
index 9ad132b0d4..9ad132b0d4 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
index 172676a3c7..172676a3c7 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
index db255e0232..db255e0232 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
index b770dbe8d4..b770dbe8d4 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 130157ac04..130157ac04 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
index 66caf0d17b..66caf0d17b 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
index cba0a5c281..cba0a5c281 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
index 1f0fc9227a..1f0fc9227a 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/workspace.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/workspace.xml
index 7d6d3dbdbd..7d6d3dbdbd 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/workspace.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/workspace.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/README
index b69c6873a6..b69c6873a6 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/README
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/build.xml
index 3d65356a06..3d65356a06 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/build.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/calculator.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/calculator.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/calculator.png
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/calculator.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/calculator.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/calculator.svg
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/pom.xml
index 1ebe9a82d2..1ebe9a82d2 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
index 57bbc39d89..57bbc39d89 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
index 4f063993a3..4f063993a3 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
index b3ef6e7312..b3ef6e7312 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
index 595626e672..595626e672 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
index d91bf88d96..d91bf88d96 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
index c3adb904b2..c3adb904b2 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
index 0238f0b013..0238f0b013 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/definitions.xml
index b9f0feb145..b9f0feb145 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
index d44e86775b..d44e86775b 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/README
index 837b5ce75f..837b5ce75f 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/README
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/build.xml
index 5f491a0da9..5f491a0da9 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/build.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/calculator-rmi-reference.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/calculator-rmi-reference.png
index 8c76b77a9f..8c76b77a9f 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/calculator-rmi-reference.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/calculator-rmi-reference.png
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/calculator-rmi-reference.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/calculator-rmi-reference.svg
index ba802e6717..ba802e6717 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/calculator-rmi-reference.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/calculator-rmi-reference.svg
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/pom.xml
index 6ddf3ac8be..6ddf3ac8be 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
index 3e0577341c..3e0577341c 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
index 5ca8b6ec99..5ca8b6ec99 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
index d40614ad19..d40614ad19 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
index a5a6e1cd29..a5a6e1cd29 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 2f5a050583..2f5a050583 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/README
index 454cdc0d37..454cdc0d37 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/README
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/build.xml
index f98f35e4b0..f98f35e4b0 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/build.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/calculator-rmi-service.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/calculator-rmi-service.png
index 574f5eb14b..574f5eb14b 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/calculator-rmi-service.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/calculator-rmi-service.png
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/calculator-rmi-service.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/calculator-rmi-service.svg
index 9253110f98..9253110f98 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/calculator-rmi-service.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/calculator-rmi-service.svg
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/pom.xml
index e04cd65960..e04cd65960 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
index 4e42d2046d..4e42d2046d 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
index 1b4db529c3..1b4db529c3 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
index d40614ad19..d40614ad19 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
index 34d90ab451..34d90ab451 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 3582eada70..3582eada70 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/README
index ab1dda13df..ab1dda13df 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/README
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/build.xml
index 429d638ca5..429d638ca5 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/build.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/calculator-script.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/calculator-script.png
index d3f8c491c3..d3f8c491c3 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/calculator-script.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/calculator-script.png
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/calculator-script.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/calculator-script.svg
index 16939f9310..16939f9310 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/calculator-script.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/calculator-script.svg
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/pom.xml
index d01c52b3da..d01c52b3da 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
index 243d1562dc..243d1562dc 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/Calculator.composite
index 8a765e6153..8a765e6153 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
index 1d4d221364..1d4d221364 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
index d6f27ca7f5..d6f27ca7f5 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
index d31c020de0..d31c020de0 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
index fea8f62110..fea8f62110 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/README
index c88b92b206..c88b92b206 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/calculator-web.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/calculator-web.png
index 896ddc4093..896ddc4093 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/calculator-web.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/calculator-web.png
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/calculator-web.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/calculator-web.svg
index 00ed27556f..00ed27556f 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/calculator-web.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/calculator-web.svg
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/pom.xml
index 9e84fbce9c..9e84fbce9c 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
index ac76137fcb..ac76137fcb 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/resources/Calculator.composite
index 50c23af0b2..50c23af0b2 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/resources/wsdl/add.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/resources/wsdl/add.wsdl
index 6c642e932c..6c642e932c 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/resources/wsdl/add.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/resources/wsdl/add.wsdl
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 3ce1f21836..3ce1f21836 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
index 701ba48203..701ba48203 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/calc.jsp
index ad1b8aa07e..ad1b8aa07e 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/README
index 690152ff65..690152ff65 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/calculator-web.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/calculator-web.png
index f482b8d1c8..f482b8d1c8 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/calculator-web.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/calculator-web.png
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/calculator-web.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/calculator-web.svg
index 1b7015b156..1b7015b156 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/calculator-web.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/calculator-web.svg
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/pom.xml
index 647c40243b..647c40243b 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
index 1550799832..1550799832 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
index 7e9a8c2909..7e9a8c2909 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
index ac76137fcb..ac76137fcb 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
index 34457699e2..34457699e2 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
index 72fb6a50a9..72fb6a50a9 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
index 2b3ecad284..2b3ecad284 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
index 4d511f887e..4d511f887e 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index 858e87a34f..858e87a34f 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
index b6b244244b..b6b244244b 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
index 136f85fe00..136f85fe00 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/security.properties b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
index 20d7b3a136..20d7b3a136 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 3ce1f21836..3ce1f21836 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 4c4b07bf5f..4c4b07bf5f 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
index 701ba48203..701ba48203 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
index ad1b8aa07e..ad1b8aa07e 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/README
index 690152ff65..690152ff65 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/calculator-web.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/calculator-web.png
index f482b8d1c8..f482b8d1c8 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/calculator-web.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/calculator-web.png
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/calculator-web.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/calculator-web.svg
index 1b7015b156..1b7015b156 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/calculator-web.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/calculator-web.svg
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/pom.xml
index 9aa7abaf47..9aa7abaf47 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
index 1550799832..1550799832 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
index ece31fd459..ece31fd459 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
index ac76137fcb..ac76137fcb 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
index 6415d5a896..6415d5a896 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 3ce1f21836..3ce1f21836 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index dd06198372..dd06198372 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
index 701ba48203..701ba48203 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
index ad1b8aa07e..ad1b8aa07e 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-1.2.1/samples/calculator/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/README
index ceb532faed..ceb532faed 100644
--- a/branches/sca-java-1.2.1/samples/calculator/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/README
diff --git a/branches/sca-java-1.2.1/samples/calculator/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/build.xml
index c4b755ef94..c4b755ef94 100644
--- a/branches/sca-java-1.2.1/samples/calculator/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/build.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator/calculator.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-java-1.2.1/samples/calculator/calculator.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/calculator.png
diff --git a/branches/sca-java-1.2.1/samples/calculator/calculator.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/calculator.svg
index 0615925c50..0615925c50 100644
--- a/branches/sca-java-1.2.1/samples/calculator/calculator.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/calculator.svg
diff --git a/branches/sca-java-1.2.1/samples/calculator/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/pom.xml
index 556799c908..556799c908 100644
--- a/branches/sca-java-1.2.1/samples/calculator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorClient.java
index 9d180bf52e..9d180bf52e 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/resources/Calculator.composite
index 90872041b0..90872041b0 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
index 775ad15537..775ad15537 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/README
index c32e25e7fc..c32e25e7fc 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/README
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/build.xml
index 757525bd1d..757525bd1d 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/build.xml
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/callback-ws-client.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/callback-ws-client.png
index 802ef604a7..802ef604a7 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/callback-ws-client.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/callback-ws-client.png
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/callback-ws-client.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/callback-ws-client.svg
index f49aeadbbf..f49aeadbbf 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/callback-ws-client.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/callback-ws-client.svg
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/pom.xml
index 025e3cd61d..025e3cd61d 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myapp/MyClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myapp/MyClient.java
index 199b964f10..199b964f10 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myapp/MyClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myapp/MyClient.java
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
index 856bbda111..856bbda111 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myserver/MyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myserver/MyService.java
index 7c1c14f574..7c1c14f574 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myserver/MyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myserver/MyService.java
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
index 532d1b0497..532d1b0497 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
index b44a6a5368..b44a6a5368 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/resources/myapp.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/resources/myapp.composite
index 7c0dd1f5dc..7c0dd1f5dc 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/resources/myapp.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/resources/myapp.composite
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
index a69819bfd5..a69819bfd5 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/README
index cc7454083e..cc7454083e 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/README
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/build.xml
index ffbaf16f06..ffbaf16f06 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/build.xml
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/callback-ws-service.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/callback-ws-service.png
index 772ac38431..772ac38431 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/callback-ws-service.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/callback-ws-service.png
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/callback-ws-service.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/callback-ws-service.svg
index ff0a1d307b..ff0a1d307b 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/callback-ws-service.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/callback-ws-service.svg
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/pom.xml
index 372998e494..372998e494 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
index d4abc2f597..d4abc2f597 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyService.java
index 7c1c14f574..7c1c14f574 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyService.java
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
index 532d1b0497..532d1b0497 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
index f36ea43a97..f36ea43a97 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
index 7c0f6d9315..7c0f6d9315 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/resources/callbackws.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/resources/callbackws.composite
index 4cfadccfd3..4cfadccfd3 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/resources/callbackws.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/resources/callbackws.composite
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
index 57ea5b0229..57ea5b0229 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/chat-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/README
index 0186006211..0186006211 100644
--- a/branches/sca-java-1.2.1/samples/chat-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/chat-webapp/chat-webapp.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/chat-webapp.png
index fdf540d243..fdf540d243 100644
--- a/branches/sca-java-1.2.1/samples/chat-webapp/chat-webapp.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/chat-webapp.png
diff --git a/branches/sca-java-1.2.1/samples/chat-webapp/chat-webapp.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/chat-webapp.svg
index b37c1dc590..b37c1dc590 100644
--- a/branches/sca-java-1.2.1/samples/chat-webapp/chat-webapp.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/chat-webapp.svg
diff --git a/branches/sca-java-1.2.1/samples/chat-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/pom.xml
index 49b4591391..49b4591391 100644
--- a/branches/sca-java-1.2.1/samples/chat-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/java/sample/ChatService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/java/sample/ChatService.java
index fbec33faa6..fbec33faa6 100644
--- a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/java/sample/ChatService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/java/sample/ChatService.java
diff --git a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
index 7d0bfb3307..7d0bfb3307 100644
--- a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/resources/chat.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/resources/chat.composite
index c9ce95e2dc..c9ce95e2dc 100644
--- a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/resources/chat.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/resources/chat.composite
diff --git a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 897849ff8d..897849ff8d 100644
--- a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
index 5cc16685b6..5cc16685b6 100644
--- a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/chat.html b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/chat.html
index 7a449a906a..7a449a906a 100644
--- a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/chat.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/chat.html
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/README
index 67c1aa32d5..67c1aa32d5 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/README
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/build.xml
index 7f2483f6fb..7f2483f6fb 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/build.xml
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/databinding-echo.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/databinding-echo.png
index afbbfff285..afbbfff285 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/databinding-echo.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/databinding-echo.png
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/databinding-echo.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/databinding-echo.svg
index 87964abf86..87964abf86 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/databinding-echo.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/databinding-echo.svg
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/pom.xml
index b061b0e2a9..b061b0e2a9 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
index 5679614164..5679614164 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
index ff8968837d..ff8968837d 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Echo.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Echo.java
index 25ecc90454..25ecc90454 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Echo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Echo.java
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
index 9ec3819899..9ec3819899 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Interface1.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Interface1.java
index 70b450e358..70b450e358 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Interface1.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Interface1.java
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Interface2.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Interface2.java
index b62f1f425d..b62f1f425d 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Interface2.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Interface2.java
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/resources/EchoDataBinding.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
index 2f042b8e34..2f042b8e34 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
index ef2308aa73..ef2308aa73 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
index 43434d8cee..43434d8cee 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/domain-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/README
index fe83e16a55..fe83e16a55 100644
--- a/branches/sca-java-1.2.1/samples/domain-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/domain-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/build.xml
index e38f430d58..e38f430d58 100644
--- a/branches/sca-java-1.2.1/samples/domain-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/build.xml
diff --git a/branches/sca-java-1.2.1/samples/domain-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/pom.xml
index 3df19fe3bf..3df19fe3bf 100644
--- a/branches/sca-java-1.2.1/samples/domain-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/java/node/DomainServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/java/node/DomainServer.java
index ea3cddc01b..ea3cddc01b 100644
--- a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/java/node/DomainServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/java/node/DomainServer.java
diff --git a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml
index fbe5880db6..fbe5880db6 100644
--- a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/domain.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/domain.composite
index dbaaebd3c7..dbaaebd3c7 100644
--- a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/domain.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/domain.composite
diff --git a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/index.html b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/index.html
index 425bd73734..425bd73734 100644
--- a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/index.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/index.html
diff --git a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/node.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/node.png
index b3c949d224..b3c949d224 100644
--- a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/node.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/node.png
diff --git a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/style.css b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/style.css
index f5bbf23379..f5bbf23379 100644
--- a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/style.css
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/style.css
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/README
index 3668a7705e..3668a7705e 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/feed-aggregator-webapp.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
index 1af95a5eff..1af95a5eff 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
index a861a5c50f..a861a5c50f 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/pom.xml
index 1e1d8db7b8..1e1d8db7b8 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
index 3d259e66b1..3d259e66b1 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
index dec073c36b..dec073c36b 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
index ea7d252ed4..ea7d252ed4 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
index 18ebbdf469..18ebbdf469 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
index b67fe843ca..b67fe843ca 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
index dea3980e4d..dea3980e4d 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/index.html b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/index.html
index e20f2fdf81..e20f2fdf81 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/index.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/index.html
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/README
index 5dfe430b83..5dfe430b83 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/README
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/build.xml
index 2118e13db7..2118e13db7 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/build.xml
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator/feed-aggregator.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/feed-aggregator.png
index c8fea8a7b8..c8fea8a7b8 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator/feed-aggregator.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/feed-aggregator.png
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator/feed-aggregator.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/feed-aggregator.svg
index 72fe6a00ac..72fe6a00ac 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator/feed-aggregator.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/feed-aggregator.svg
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/pom.xml
index afa69d6f08..afa69d6f08 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
index 5c713f9ca4..5c713f9ca4 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/SampleServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/SampleServer.java
index 2aace3daf7..2aace3daf7 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/SampleServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/SampleServer.java
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/Sort.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/Sort.java
index dec073c36b..dec073c36b 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/Sort.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/Sort.java
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/SortImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/SortImpl.java
index ea7d252ed4..ea7d252ed4 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/SortImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/SortImpl.java
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/resources/FeedAggregator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
index 836499e58f..836499e58f 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/README
index bf5f500ef3..bf5f500ef3 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/build.xml
index 79c77393b9..79c77393b9 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/helloworld-bpel.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/helloworld-bpel.png
index 5f53a3c5d1..5f53a3c5d1 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/helloworld-bpel.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/helloworld-bpel.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/helloworld-bpel.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/helloworld-bpel.svg
index 5a98f1a07c..5a98f1a07c 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/helloworld-bpel.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/helloworld-bpel.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/pom.xml
index 6a4e7090f1..6a4e7090f1 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
index 1826c885c4..1826c885c4 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/deploy.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/deploy.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/deploy.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.bpel
index e983899d76..e983899d76 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.bpel
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.componentType
index 121064a475..121064a475 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.componentType
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/log4j.properties
index 8649a71550..8649a71550 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/log4j.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/log4j.properties
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
index 1caaa78878..1caaa78878 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/README
index 38392a13b6..38392a13b6 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/build-dojo.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/build-dojo.xml
index 534a1dacd9..534a1dacd9 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/build-dojo.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/build-dojo.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/build.xml
index 95813af65a..95813af65a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
index d5c3bc5d3e..d5c3bc5d3e 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/pom.xml
index 12a188b60d..12a188b60d 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
index 3d8ea24f04..3d8ea24f04 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
index e205f4da9b..e205f4da9b 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
index e895ab455d..e895ab455d 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
index 4195f3288c..4195f3288c 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 2c178c1ddc..2c178c1ddc 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
index 70cd67890a..70cd67890a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/style.css b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/style.css
index 1071583264..1071583264 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/style.css
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/style.css
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/README
index 9be2e0b0f6..9be2e0b0f6 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/pom.xml
index e2c7f90f43..e2c7f90f43 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
index c24a741ee2..c24a741ee2 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
index 2af978b9ce..2af978b9ce 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
index 280388f443..280388f443 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
index 2419887413..2419887413 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
index f6328d156c..f6328d156c 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
index 3fe18f670f..3fe18f670f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
index 830f0d4b84..830f0d4b84 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/README
index 07253d039b..07253d039b 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
index 6ef1f438fb..6ef1f438fb 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/pom.xml
index abc772a2dc..abc772a2dc 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
index 3d8ea24f04..3d8ea24f04 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
index 35fd00fabd..35fd00fabd 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
index e895ab455d..e895ab455d 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
index 75dd9050fa..75dd9050fa 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 2c178c1ddc..2c178c1ddc 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
index 267bed176c..267bed176c 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
index 1071583264..1071583264 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/README
index abf10ef1f2..abf10ef1f2 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/build.xml
index 6c8b6255ce..6c8b6255ce 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/helloworld-ws-reference.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/helloworld-ws-reference.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/helloworld-ws-reference.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/helloworld-ws-reference.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/helloworld-ws-reference.svg
index 333ad53e0a..333ad53e0a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/helloworld-ws-reference.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/helloworld-ws-reference.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/pom.xml
index 1c827a1daf..1c827a1daf 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
index fc9142db36..fc9142db36 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
index db0c947cf7..db0c947cf7 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
index 0dee19550b..0dee19550b 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
index 3cf1104562..3cf1104562 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
index 6ccc48c3f6..6ccc48c3f6 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/logging.properties b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/logging.properties
index 6c7581e7f4..6c7581e7f4 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/logging.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/logging.properties
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
index e0ea596dd3..e0ea596dd3 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
index ff547f2159..ff547f2159 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/README
index fa6ceff63f..fa6ceff63f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/build.xml
index 5a05e9cd28..5a05e9cd28 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/helloworld-ws-service.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/helloworld-ws-service.png
index eab29d0bcd..eab29d0bcd 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/helloworld-ws-service.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/helloworld-ws-service.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/helloworld-ws-service.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/helloworld-ws-service.svg
index 8d2ae98c82..8d2ae98c82 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/helloworld-ws-service.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/helloworld-ws-service.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/pom.xml
index 0eff6c5d31..0eff6c5d31 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
index 29b8e58298..29b8e58298 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
index 7245513b2a..7245513b2a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/definitions.xml
index 9cf337ac98..9cf337ac98 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
index 4565a50f65..4565a50f65 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
index 3f9e00689e..3f9e00689e 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
index ba8bc8138e..ba8bc8138e 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/README
index 0d2141dda5..0d2141dda5 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/build.xml
index e4edb94054..e4edb94054 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/pom.xml
index 9ced03812f..9ced03812f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite
index 114608e4d8..114608e4d8 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl
index 0b95fbd14f..0b95fbd14f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml
index 182fd38fd9..182fd38fd9 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/README
index abf10ef1f2..abf10ef1f2 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/build.xml
index 4f83c8ae9d..4f83c8ae9d 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
index 333ad53e0a..333ad53e0a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/pom.xml
index a8b3e937d4..a8b3e937d4 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
index b3db243a1f..b3db243a1f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
index db0c947cf7..db0c947cf7 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
index 0dee19550b..0dee19550b 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
index d029ba3e1c..d029ba3e1c 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
index a4eb217310..a4eb217310 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
index 12b0716b5d..12b0716b5d 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/README
index 4d21b9a18a..4d21b9a18a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/build.xml
index 2e924dda7b..2e924dda7b 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
index 333ad53e0a..333ad53e0a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/pom.xml
index 90989682b0..90989682b0 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
index aab6aad379..aab6aad379 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
index a47d24ca01..a47d24ca01 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
index db0c947cf7..db0c947cf7 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
index 0dee19550b..0dee19550b 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index 8b089c7222..8b089c7222 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
index d9f22b448d..d9f22b448d 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
index 0b4f2399f0..0b4f2399f0 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
index 904befaf60..904befaf60 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
index d39c89cb95..d39c89cb95 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
index e6fcc6f4a6..e6fcc6f4a6 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
index 7ce89179c2..7ce89179c2 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
index 4b0c40dafd..4b0c40dafd 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/README
index 13c89ab2f6..13c89ab2f6 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/build.xml
index 71ee66b31e..71ee66b31e 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/helloworld-ws-reference.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/helloworld-ws-reference.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/helloworld-ws-reference.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/helloworld-ws-reference.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/helloworld-ws-reference.svg
index 354ffbae8f..354ffbae8f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/helloworld-ws-reference.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/helloworld-ws-reference.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/pom.xml
index 0eaba4cafc..0eaba4cafc 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
index 4559b282fe..4559b282fe 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
index db0c947cf7..db0c947cf7 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
index 0dee19550b..0dee19550b 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
index 899ad5ce35..899ad5ce35 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/logging.properties b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/logging.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/logging.properties
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
index 662c9affac..662c9affac 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
index 7ce89179c2..7ce89179c2 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
index 8226ec884e..8226ec884e 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/README
index 1348dbf0e5..1348dbf0e5 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/build.xml
index 386008e707..386008e707 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
index 2590f02a45..2590f02a45 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
index 56a29db23c..56a29db23c 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/pom.xml
index a1f715ef76..a1f715ef76 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
index eb82418516..eb82418516 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
index fea4e2a16c..fea4e2a16c 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
index 3d6576aca0..3d6576aca0 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
index 34396b1b02..34396b1b02 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
index fe79094b94..fe79094b94 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
index 584adfdcdf..584adfdcdf 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
index bc1550b5dd..bc1550b5dd 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 6f241cc90c..6f241cc90c 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 22c6f5db0f..22c6f5db0f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
index 257e65aad4..257e65aad4 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/README
index 4cecbb4bce..4cecbb4bce 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/build.xml
index 401315d424..401315d424 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
index 333ad53e0a..333ad53e0a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/pom.xml
index 9ed5f1dd13..9ed5f1dd13 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
index de4795ceaf..de4795ceaf 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
index c950f7df04..c950f7df04 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
index 367c5b4a12..367c5b4a12 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
index 711eef63b5..711eef63b5 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
index c255df2897..c255df2897 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
index d4fba548d5..d4fba548d5 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/logging.properties b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/logging.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/logging.properties
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
index 2ecc0bea43..2ecc0bea43 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
index 11564c370f..11564c370f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
index 4b0c40dafd..4b0c40dafd 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/README
index fa6ceff63f..fa6ceff63f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/build.xml
index 5a05e9cd28..5a05e9cd28 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/helloworld-ws-service.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/helloworld-ws-service.png
index eab29d0bcd..eab29d0bcd 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/helloworld-ws-service.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/helloworld-ws-service.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/helloworld-ws-service.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
index 8d2ae98c82..8d2ae98c82 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/pom.xml
index cc30acc347..cc30acc347 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
index 5baf8ef645..5baf8ef645 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
index 7245513b2a..7245513b2a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
index 9cf337ac98..9cf337ac98 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
index 67079f738e..67079f738e 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
index 10faf374f3..10faf374f3 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
index 3f9e00689e..3f9e00689e 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
index 755caad824..755caad824 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
index cd026b0538..cd026b0538 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/README
index 354071a8b5..354071a8b5 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/build.xml
index 52c87ef675..52c87ef675 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
index 6f7d9dd450..6f7d9dd450 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
index 53eb552923..53eb552923 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/pom.xml
index dd43a940f9..dd43a940f9 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
index 7245513b2a..7245513b2a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
index def19b4f40..def19b4f40 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
index 1f4a8ff819..1f4a8ff819 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
index 0b4f2399f0..0b4f2399f0 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
index d1e18d7929..d1e18d7929 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
index 068229be6f..068229be6f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
index 26c222cece..26c222cece 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/README
index 0d2141dda5..0d2141dda5 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/build.xml
index e2f356f329..e2f356f329 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/pom.xml
index ce4d907751..ce4d907751 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
index 0b95fbd14f..0b95fbd14f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
index 114608e4d8..114608e4d8 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 0c1bde0eda..0c1bde0eda 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
index 3f3c92fa78..3f3c92fa78 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/README
index 44dc7ab4e8..44dc7ab4e8 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/build.xml
index 46678febc3..46678febc3 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/helloworld-ws-service.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/helloworld-ws-service.png
index eab29d0bcd..eab29d0bcd 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/helloworld-ws-service.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/helloworld-ws-service.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/helloworld-ws-service.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/helloworld-ws-service.svg
index 61cd93ead9..61cd93ead9 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/helloworld-ws-service.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/helloworld-ws-service.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/pom.xml
index de48598941..de48598941 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
index 7cd98ae578..7cd98ae578 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
index 7245513b2a..7245513b2a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
index d767625ae7..d767625ae7 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
index 454763410c..454763410c 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
index 189332be91..189332be91 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/README
index 27de00e8ef..27de00e8ef 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/README
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/build.xml
index 7aa31aab8b..7aa31aab8b 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/build.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/implementation-composite.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/implementation-composite.png
index 4c6d71bc03..4c6d71bc03 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/implementation-composite.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/implementation-composite.png
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/implementation-composite.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/implementation-composite.svg
index 0e60354aab..0e60354aab 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/implementation-composite.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/implementation-composite.svg
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/pom.xml
index a2532e58a6..a2532e58a6 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/CompositeClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/CompositeClient.java
index bf743e1797..bf743e1797 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/CompositeClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/CompositeClient.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Source.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Source.java
index d0efcc1df1..d0efcc1df1 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Source.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Source.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceCallback.java
index baa95a8e39..baa95a8e39 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceCallback.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceImpl.java
index b9a0c7ff74..b9a0c7ff74 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Target.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Target.java
index 9a8f68a7fa..9a8f68a7fa 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Target.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Target.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/TargetImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/TargetImpl.java
index 86686e9233..86686e9233 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/TargetImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/TargetImpl.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite.composite
index 3376ac8ff5..3376ac8ff5 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite.composite
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite2.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite2.composite
index c9eff4fa9d..c9eff4fa9d 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite2.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite2.composite
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
index c8039b7dc7..c8039b7dc7 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/OuterComposite.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/OuterComposite.composite
index cb1c1e13d4..cb1c1e13d4 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/OuterComposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/OuterComposite.composite
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
index 9e9a4b44a4..9e9a4b44a4 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/README
index 5e8190648f..5e8190648f 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/README
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/build.xml
index 88d308e6fc..88d308e6fc 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/build.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/pom.xml
index 595f316265..595f316265 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUD.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
index b23d85887b..b23d85887b 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
index 49be844f93..49be844f93 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
index fa83c63c1b..fa83c63c1b 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
index cc0795a735..cc0795a735 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
index 2f1e5fcba8..2f1e5fcba8 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
index 383a035e69..383a035e69 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
index b212ee3c9b..b212ee3c9b 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
index 8f11f9d910..8f11f9d910 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
index 4566cb7155..4566cb7155 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
index 3cf5de5fa1..3cf5de5fa1 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 17c98cf706..17c98cf706 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 527c626418..527c626418 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 6ce605197a..6ce605197a 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
index 447e31bf93..447e31bf93 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
index 0bb5cfc361..0bb5cfc361 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/test/resources/crud.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/test/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/test/resources/crud.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/test/resources/crud.composite
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/README
index 50da631c04..50da631c04 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/README
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/build.xml
index 10b26b5a94..10b26b5a94 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/build.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud/implementation-crud.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/implementation-crud.png
index a292037e7a..a292037e7a 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud/implementation-crud.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/implementation-crud.png
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud/implementation-crud.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/implementation-crud.svg
index dbb37be208..dbb37be208 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud/implementation-crud.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/implementation-crud.svg
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/pom.xml
index 33c3d02eb5..33c3d02eb5 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
index ea87cb3001..ea87cb3001 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud/src/main/resources/crud.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/src/main/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud/src/main/resources/crud.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/src/main/resources/crud.composite
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
index 7e0476a8b1..7e0476a8b1 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/README
index 772d80a283..772d80a283 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/README
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/build.xml
index 7d8770e121..7d8770e121 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/build.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/implementation-notification.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/implementation-notification.png
index 0b7ee34bf7..0b7ee34bf7 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/implementation-notification.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/implementation-notification.png
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/pom.xml
index 7634427d63..7634427d63 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
index 4f09c5c65b..4f09c5c65b 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
index fcbb4fcdf7..fcbb4fcdf7 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
index 018535d826..018535d826 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
index ff2aaffdd0..ff2aaffdd0 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
index f2dc318206..f2dc318206 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
index 873e200613..873e200613 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
index bbf2281352..bbf2281352 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
index 5f8ba5ff31..5f8ba5ff31 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
index 873e200613..873e200613 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
index bbf2281352..bbf2281352 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/README
index 3b201779e1..3b201779e1 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/README
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/build.xml
index 78bae79859..78bae79859 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/build.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/pom.xml
index 060f516900..060f516900 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
index 7c2f5d236f..7c2f5d236f 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
index bbcfb3d0dc..bbcfb3d0dc 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
index 0dad270a6c..0dad270a6c 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
index f2d6871039..f2d6871039 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
index fbdbd9de79..fbdbd9de79 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
index 87333c61f6..87333c61f6 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
index 73a0d22493..73a0d22493 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
index 22f2be09e9..22f2be09e9 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 8337e81c5f..8337e81c5f 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 64dd230a15..64dd230a15 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index b30ea3b9cf..b30ea3b9cf 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
index 075af98240..075af98240 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
index c9d170770b..c9d170770b 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
index cc32929f09..cc32929f09 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
index 0580e30aba..0580e30aba 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
index 69ab1f567e..69ab1f567e 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
index d8b5f41adc..d8b5f41adc 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
index a92c5ab8db..a92c5ab8db 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
index c38094dfc9..c38094dfc9 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/README
index e6b285d82d..e6b285d82d 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/README
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/build.xml
index ee61db0467..ee61db0467 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/build.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/pom.xml
index dbd04b9344..dbd04b9344 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorld.java
index cc32929f09..cc32929f09 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldClient.java
index 34d9e3a463..34d9e3a463 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldImpl.java
index 0580e30aba..0580e30aba 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldImpl2.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldImpl2.java
index 69ab1f567e..69ab1f567e 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldImpl2.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldImpl2.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/resources/helloworld/HelloWorldImpl2.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/resources/helloworld/HelloWorldImpl2.componentType
index a92c5ab8db..a92c5ab8db 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/resources/helloworld/HelloWorldImpl2.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/resources/helloworld/HelloWorldImpl2.componentType
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/resources/helloworld/helloworld.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/resources/helloworld/helloworld.composite
index c38094dfc9..c38094dfc9 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/resources/helloworld/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/resources/helloworld/helloworld.composite
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
index d8b5f41adc..d8b5f41adc 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/loanapplication/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/pom.xml
index 3a3962cfba..3a3962cfba 100644
--- a/branches/sca-java-1.2.1/samples/loanapplication/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
index 4fedb70782..4fedb70782 100644
--- a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
diff --git a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
index 5183ece867..5183ece867 100644
--- a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
diff --git a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
index 7e4438bbff..7e4438bbff 100644
--- a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
diff --git a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
index b06d9465a2..b06d9465a2 100644
--- a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
diff --git a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanService.java
index 9dfd8b42fe..9dfd8b42fe 100644
--- a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanService.java
diff --git a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
index 76a53323bd..76a53323bd 100644
--- a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/loanapplication/src/main/resources/loanapplication.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/resources/loanapplication.composite
index 3aa8d030b7..3aa8d030b7 100644
--- a/branches/sca-java-1.2.1/samples/loanapplication/src/main/resources/loanapplication.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/resources/loanapplication.composite
diff --git a/branches/sca-java-1.2.1/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
index e88e48a53a..e88e48a53a 100644
--- a/branches/sca-java-1.2.1/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/README
index 11fecf2ae8..11fecf2ae8 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/README
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/build-bundles.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/build-bundles.xml
index 7a31e6016b..7a31e6016b 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/build-bundles.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/build-bundles.xml
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/build.xml
index 2e103e5a15..2e103e5a15 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/build.xml
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/osgi-supplychain.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/osgi-supplychain.png
index 2bec57ac8a..2bec57ac8a 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/osgi-supplychain.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/osgi-supplychain.png
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/osgi-supplychain.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/osgi-supplychain.svg
index 43cb427944..43cb427944 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/osgi-supplychain.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/osgi-supplychain.svg
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/pom.xml
index 0c2842b5a8..0c2842b5a8 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
index 5f40054ada..5f40054ada 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
index 64814487cb..64814487cb 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
index 225dce0236..225dce0236 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 023d716651..023d716651 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a1c7fce60a..a1c7fce60a 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 4647a716c7..4647a716c7 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index d0d29f94f8..d0d29f94f8 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index 1b7fb15bf1..1b7fb15bf1 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e97331c06c..e97331c06c 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 4206ce7dc8..4206ce7dc8 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index 0f88cca213..0f88cca213 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index f55a068ede..f55a068ede 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index 72eec76cc2..72eec76cc2 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 600f3f0c74..600f3f0c74 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index b8bca97bd0..b8bca97bd0 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Customer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Customer.componentType
index 5c61a0961c..5c61a0961c 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Customer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Customer.componentType
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
index 87a184d968..87a184d968 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
index 872ab6601a..872ab6601a 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSShipper.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
index 57fcbbc5d1..57fcbbc5d1 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
index 75fa8029f7..75fa8029f7 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Retailer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Retailer.componentType
index 15185f2bf9..15185f2bf9 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Retailer.componentType
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Shipper.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Shipper.componentType
index 675597d80b..675597d80b 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Shipper.componentType
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Warehouse.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
index 6e1ac3e5a9..6e1ac3e5a9 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
index e3844bc220..e3844bc220 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
index f09c3501c3..f09c3501c3 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
index b7ced3ade6..b7ced3ade6 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
index c36f89bd91..c36f89bd91 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
index 89ecd4e8c8..89ecd4e8c8 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
index 5b368afd5b..5b368afd5b 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
index 16514b94d5..16514b94d5 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
index cae7fdfde2..cae7fdfde2 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
index fd91e37b35..fd91e37b35 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
index d894309b71..d894309b71 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
index 2624b968bd..2624b968bd 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
index fc86a76784..fc86a76784 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/supplychain.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/supplychain.composite
index 0bbfed9176..0bbfed9176 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/supplychain.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/supplychain.composite
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
index d1e11168e2..d1e11168e2 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
index ff15c0d9a2..ff15c0d9a2 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/pom.xml
index 55e6ca66c7..55e6ca66c7 100644
--- a/branches/sca-java-1.2.1/samples/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/README
index c380269deb..c380269deb 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/README
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/build.xml
index c54ad91b63..c54ad91b63 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/build.xml
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/pom.xml
index 542f311194..542f311194 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
index 8a42136b5d..8a42136b5d 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
index 41d78683cc..41d78683cc 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
index f744a59744..f744a59744 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
index 374c0825e9..374c0825e9 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
index fbe38b8269..fbe38b8269 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
index d2d175430b..d2d175430b 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
index 06c3945a6e..06c3945a6e 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
index 4ab64dd558..4ab64dd558 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
index 85508eaa46..85508eaa46 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
index 26331381a8..26331381a8 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
index 6144dcc17f..6144dcc17f 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
index 43b2d41a5d..43b2d41a5d 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
index cfd201f883..cfd201f883 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
index 20fe73fd92..20fe73fd92 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
index 48a4364cd5..48a4364cd5 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
index d02190ab94..d02190ab94 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
index d504f40f04..d504f40f04 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
index cc50da164a..cc50da164a 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
index cf41ab528d..cf41ab528d 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
index 4946854f13..4946854f13 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
index 4c437586ef..4c437586ef 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
index b164eb2b98..b164eb2b98 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
index 96c2af138a..96c2af138a 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/xqueryquotews.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/xqueryquotews.composite
index cce6a728cc..cce6a728cc 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/xqueryquotews.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/xqueryquotews.composite
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
index f078b9ee9f..f078b9ee9f 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
index 9555532b3e..9555532b3e 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
index 9a4be5bda6..9a4be5bda6 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/README
index 900a006141..900a006141 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/README
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/build.xml
index ecc2596d71..ecc2596d71 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/build.xml
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/pom.xml
index b9993fa0bc..b9993fa0bc 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/simple-bigbank-spring.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/simple-bigbank-spring.png
index 593c047f6a..593c047f6a 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/simple-bigbank-spring.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/simple-bigbank-spring.png
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/simple-bigbank-spring.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/simple-bigbank-spring.svg
index c64f6de6b9..c64f6de6b9 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/simple-bigbank-spring.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/simple-bigbank-spring.svg
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
index 1625ff5b65..1625ff5b65 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
index 7c9082b944..7c9082b944 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
index ae9071445d..ae9071445d 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java
index a5ae7b3955..a5ae7b3955 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.java
index c354de387b..c354de387b 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
index 000acb935c..000acb935c 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.java
index 11bdff757e..11bdff757e 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.java
index b791024076..b791024076 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.java
index 86246a3f84..86246a3f84 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
index edbf910d37..edbf910d37 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 0512d40b0b..0512d40b0b 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
index 2d97b57066..2d97b57066 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml
index 2d882472fb..2d882472fb 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/BigBank.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
index 29d4a2d5a3..29d4a2d5a3 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite
index 26bdc59075..26bdc59075 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
index ba6c1dd797..ba6c1dd797 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/README
index acbe93a4d3..acbe93a4d3 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/README
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/build.xml
index a814014eae..a814014eae 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/build.xml
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/pom.xml
index 3c27bb2f3d..3c27bb2f3d 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/simple-bigbank.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/simple-bigbank.png
index 593c047f6a..593c047f6a 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/simple-bigbank.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/simple-bigbank.png
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/simple-bigbank.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/simple-bigbank.svg
index c64f6de6b9..c64f6de6b9 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/simple-bigbank.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/simple-bigbank.svg
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
index 1625ff5b65..1625ff5b65 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
index 7c9082b944..7c9082b944 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
index fa85f309c0..fa85f309c0 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
index a5ae7b3955..a5ae7b3955 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
index c354de387b..c354de387b 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
index 000acb935c..000acb935c 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
index 11bdff757e..11bdff757e 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
index b791024076..b791024076 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
index 86246a3f84..86246a3f84 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
index edbf910d37..edbf910d37 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 0512d40b0b..0512d40b0b 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
index 7961279352..7961279352 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/Account.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/Account.composite
index e71615e27e..e71615e27e 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/Account.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/Account.composite
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/BigBank.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/BigBank.composite
index c870f39cab..c870f39cab 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/BigBank.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/BigBank.composite
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/StockQuote.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/StockQuote.composite
index 4f29c14851..4f29c14851 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/StockQuote.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/StockQuote.composite
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
index ba6c1dd797..ba6c1dd797 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/README
index 6b27718f74..6b27718f74 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/README
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/build.xml
index 10b69bd395..10b69bd395 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/build.xml
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/pom.xml
index 2c2bf7a8ef..2c2bf7a8ef 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/simple-callback-ws.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/simple-callback-ws.png
index 1b6353f5cf..1b6353f5cf 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/simple-callback-ws.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/simple-callback-ws.png
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/simple-callback-ws.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/simple-callback-ws.svg
index 7d9e3de510..7d9e3de510 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/simple-callback-ws.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/simple-callback-ws.svg
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
index 4cc00d6d0f..4cc00d6d0f 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
index ad7c6d8fef..ad7c6d8fef 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
index 48acc0e94f..48acc0e94f 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
index 66cfb2bc8a..66cfb2bc8a 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
index 08057d2fcc..08057d2fcc 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
index eeb0e52163..eeb0e52163 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/resources/simplecallback.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/resources/simplecallback.composite
index 53e7fe66af..53e7fe66af 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/resources/simplecallback.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/resources/simplecallback.composite
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
index 8a6465de3a..8a6465de3a 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
index 580a7f6b0c..580a7f6b0c 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/README
index 719376f254..719376f254 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/README
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/build.xml
index 47d1ea4bc1..47d1ea4bc1 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/build.xml
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/pom.xml
index 0bae81c562..0bae81c562 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/simple-callback.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/simple-callback.png
index 1b6353f5cf..1b6353f5cf 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/simple-callback.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/simple-callback.png
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/simple-callback.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/simple-callback.svg
index 484b65df9d..484b65df9d 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/simple-callback.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/simple-callback.svg
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyClient.java
index 4cc00d6d0f..4cc00d6d0f 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyClient.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
index 3e2a1df5a5..3e2a1df5a5 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyService.java
index e78ad6f68f..e78ad6f68f 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyService.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
index b27eea44f5..b27eea44f5 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
index fc5e31d14e..fc5e31d14e 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
index b8987fcd07..b8987fcd07 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/src/main/resources/simplecallback.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/resources/simplecallback.composite
index 33e6f60601..33e6f60601 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/src/main/resources/simplecallback.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/resources/simplecallback.composite
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
index cbaab8af83..cbaab8af83 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/pom.xml
index cdd18f0b87..cdd18f0b87 100644
--- a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
index 73104c3166..73104c3166 100644
--- a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
diff --git a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
index 43efae32ca..43efae32ca 100644
--- a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
diff --git a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
index d65d4c8e4a..d65d4c8e4a 100644
--- a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
diff --git a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
index 198befa928..198befa928 100644
--- a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
diff --git a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
index 95ee37c1aa..95ee37c1aa 100644
--- a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
diff --git a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
index cc32929f09..cc32929f09 100644
--- a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
index 02af1ccf22..02af1ccf22 100644
--- a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
index 5813fda330..5813fda330 100644
--- a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
index fa9cecc160..fa9cecc160 100644
--- a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-java-1.2.1/samples/store/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/README
index d4797618ff..d4797618ff 100644
--- a/branches/sca-java-1.2.1/samples/store/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/README
diff --git a/branches/sca-java-1.2.1/samples/store/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/build.xml
index 4f7e2a7951..4f7e2a7951 100644
--- a/branches/sca-java-1.2.1/samples/store/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/build.xml
diff --git a/branches/sca-java-1.2.1/samples/store/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/pom.xml
index 52c596ec79..52c596ec79 100644
--- a/branches/sca-java-1.2.1/samples/store/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/java/launch/Launch.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/launch/Launch.java
index 801697abea..801697abea 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/java/launch/Launch.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/launch/Launch.java
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/java/services/Cart.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/Cart.java
index 916b8b46d2..916b8b46d2 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/java/services/Cart.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/Cart.java
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/java/services/Catalog.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/Catalog.java
index 2c3b19f579..2c3b19f579 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/java/services/Catalog.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/Catalog.java
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/java/services/CurrencyConverter.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/CurrencyConverter.java
index e104a0423a..e104a0423a 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/java/services/CurrencyConverter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/CurrencyConverter.java
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/java/services/CurrencyConverterImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/CurrencyConverterImpl.java
index c354aed447..c354aed447 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/java/services/CurrencyConverterImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/CurrencyConverterImpl.java
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/java/services/FruitsCatalogImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/FruitsCatalogImpl.java
index 377b3d7e59..377b3d7e59 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/java/services/FruitsCatalogImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/FruitsCatalogImpl.java
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/java/services/Item.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/Item.java
index 27abd4f016..27abd4f016 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/java/services/Item.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/Item.java
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/java/services/ShoppingCartImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/ShoppingCartImpl.java
index d04fffe6f1..d04fffe6f1 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/java/services/ShoppingCartImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/ShoppingCartImpl.java
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/java/services/Total.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/Total.java
index 8f464e526f..8f464e526f 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/java/services/Total.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/Total.java
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/resources/store.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/resources/store.composite
index 571678839d..571678839d 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/resources/store.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/resources/store.composite
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/resources/uiservices/store.html b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/resources/uiservices/store.html
index 095570f949..095570f949 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/resources/uiservices/store.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/resources/uiservices/store.html
diff --git a/branches/sca-java-1.2.1/samples/store/store.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/store.png
index da413edeee..da413edeee 100644
--- a/branches/sca-java-1.2.1/samples/store/store.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/store.png
diff --git a/branches/sca-java-1.2.1/samples/store/store.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/store.svg
index 74f8ecd36d..74f8ecd36d 100644
--- a/branches/sca-java-1.2.1/samples/store/store.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/store.svg
diff --git a/branches/sca-java-1.2.1/samples/supplychain/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/README
index ea4493fdd4..ea4493fdd4 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/README
diff --git a/branches/sca-java-1.2.1/samples/supplychain/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/build.xml
index 506180b8b1..506180b8b1 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/build.xml
diff --git a/branches/sca-java-1.2.1/samples/supplychain/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/pom.xml
index d39364e7a1..d39364e7a1 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Customer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Customer.java
index 8088001898..8088001898 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Customer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Customer.java
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
index 7a1e8553ec..7a1e8553ec 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Retailer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Retailer.java
index 1add63fb4e..1add63fb4e 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Retailer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Retailer.java
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
index f622052cf8..f622052cf8 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Shipper.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Shipper.java
index d4d49a922b..d4d49a922b 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Shipper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Shipper.java
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
index 4ae52a12a2..4ae52a12a2 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
index 7072f582d1..7072f582d1 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Warehouse.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Warehouse.java
index 0be499f569..0be499f569 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Warehouse.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Warehouse.java
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
index b5e256a1e0..b5e256a1e0 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/main/resources/supplychain.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/resources/supplychain.composite
index 301efcaf1f..301efcaf1f 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/main/resources/supplychain.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/resources/supplychain.composite
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
index 88e0eb7ab8..88e0eb7ab8 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/supplychain/supplychain.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/supplychain.png
index 51a384e827..51a384e827 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/supplychain.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/supplychain.png
diff --git a/branches/sca-java-1.2.1/samples/supplychain/supplychain.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/supplychain.svg
index f72e77acab..f72e77acab 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/supplychain.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/supplychain.svg
diff --git a/branches/sca-java-1.2.1/samples/web-resource/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/README
index 56bffba6a3..56bffba6a3 100644
--- a/branches/sca-java-1.2.1/samples/web-resource/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/README
diff --git a/branches/sca-java-1.2.1/samples/web-resource/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/build.xml
index 5f6b6091e7..5f6b6091e7 100644
--- a/branches/sca-java-1.2.1/samples/web-resource/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/build.xml
diff --git a/branches/sca-java-1.2.1/samples/web-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/pom.xml
index 09c4e81c0b..09c4e81c0b 100644
--- a/branches/sca-java-1.2.1/samples/web-resource/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/web-resource/src/main/java/web/resource/SampleServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/src/main/java/web/resource/SampleServer.java
index 9410de08c4..9410de08c4 100644
--- a/branches/sca-java-1.2.1/samples/web-resource/src/main/java/web/resource/SampleServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/src/main/java/web/resource/SampleServer.java
diff --git a/branches/sca-java-1.2.1/samples/web-resource/src/main/resources/WebResource.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/src/main/resources/WebResource.composite
index 4536136a8b..4536136a8b 100644
--- a/branches/sca-java-1.2.1/samples/web-resource/src/main/resources/WebResource.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/src/main/resources/WebResource.composite
diff --git a/branches/sca-java-1.2.1/samples/web-resource/src/main/resources/myContent/index.html b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/src/main/resources/myContent/index.html
index 55de048373..55de048373 100644
--- a/branches/sca-java-1.2.1/samples/web-resource/src/main/resources/myContent/index.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/src/main/resources/myContent/index.html
diff --git a/branches/sca-java-1.2.1/samples/web-resource/web-resource.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/web-resource.png
index 7259447b65..7259447b65 100644
--- a/branches/sca-java-1.2.1/samples/web-resource/web-resource.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/web-resource.png
diff --git a/branches/sca-java-1.2.1/samples/web-resource/web-resource.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/web-resource.svg
index 0d1257316c..0d1257316c 100644
--- a/branches/sca-java-1.2.1/samples/web-resource/web-resource.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/web-resource.svg