Moving 1.x tags

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

825 files changed, 0 insertions, 0 deletions

diff --git a/tags/java/sca/1.0/samples/README b/sca-java-1.x/tags/1.0/samples/README
index be9494c749..be9494c749 100644
--- a/tags/java/sca/1.0/samples/README
+++ b/sca-java-1.x/tags/1.0/samples/README
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/README b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/README
index 94716b151f..94716b151f 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/README
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/README
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/build.xml b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/build.xml
index 5df5981bea..5df5981bea 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/build.xml
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/pom.xml b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/pom.xml
index be25b40aaf..be25b40aaf 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/pom.xml
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
index 3fe1598e0d..3fe1598e0d 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
index 0f6fee82be..0f6fee82be 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
index af759dbf93..af759dbf93 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
index d8156f9647..d8156f9647 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
index 45c2d7c033..45c2d7c033 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
index 91697fcd9a..91697fcd9a 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
index 485386cea8..485386cea8 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
index ba74d8f99a..ba74d8f99a 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
index 0efc319af9..0efc319af9 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
index 1cd1e5af4e..1cd1e5af4e 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
index 33dc761aa4..33dc761aa4 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
index 49d195395b..49d195395b 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
index 7d38e3b7a8..7d38e3b7a8 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
index 72b8002238..72b8002238 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
index deda8d9744..deda8d9744 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
index ffadfc7fff..ffadfc7fff 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
index 6fa5f26977..6fa5f26977 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
index cf55b36fc2..cf55b36fc2 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
index ac610cfb51..ac610cfb51 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
index fcb250b444..fcb250b444 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
index 8ea2395d04..8ea2395d04 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
index 32336dd94f..32336dd94f 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
index 55be293862..55be293862 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 06d53250c1..06d53250c1 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index efa475ef92..efa475ef92 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
index 9b64df4871..9b64df4871 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/test/java/echo/Echo.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/test/java/echo/Echo.java
index 1d5e973f33..1d5e973f33 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/test/java/echo/Echo.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/test/java/echo/Echo.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
index ba68dfe908..ba68dfe908 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
index 7383077f18..7383077f18 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
index ab05516622..ab05516622 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/test/resources/EchoBinding.composite b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
index ecb6063010..ecb6063010 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
diff --git a/tags/java/sca/1.0/samples/binding-echo-extension/src/test/resources/definitions.xml b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/test/resources/definitions.xml
index a742804fb8..a742804fb8 100644
--- a/tags/java/sca/1.0/samples/binding-echo-extension/src/test/resources/definitions.xml
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo-extension/src/test/resources/definitions.xml
diff --git a/tags/java/sca/1.0/samples/binding-echo/README b/sca-java-1.x/tags/1.0/samples/binding-echo/README
index f8271af7b5..f8271af7b5 100644
--- a/tags/java/sca/1.0/samples/binding-echo/README
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo/README
diff --git a/tags/java/sca/1.0/samples/binding-echo/binding-echo.png b/sca-java-1.x/tags/1.0/samples/binding-echo/binding-echo.png
index a38d985363..a38d985363 100644
--- a/tags/java/sca/1.0/samples/binding-echo/binding-echo.png
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo/binding-echo.png
diff --git a/tags/java/sca/1.0/samples/binding-echo/binding-echo.svg b/sca-java-1.x/tags/1.0/samples/binding-echo/binding-echo.svg
index 5b5051bef5..5b5051bef5 100644
--- a/tags/java/sca/1.0/samples/binding-echo/binding-echo.svg
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo/binding-echo.svg
diff --git a/tags/java/sca/1.0/samples/binding-echo/build.xml b/sca-java-1.x/tags/1.0/samples/binding-echo/build.xml
index 7689ef3a54..7689ef3a54 100644
--- a/tags/java/sca/1.0/samples/binding-echo/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo/build.xml
diff --git a/tags/java/sca/1.0/samples/binding-echo/pom.xml b/sca-java-1.x/tags/1.0/samples/binding-echo/pom.xml
index 677c55d01b..677c55d01b 100644
--- a/tags/java/sca/1.0/samples/binding-echo/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo/pom.xml
diff --git a/tags/java/sca/1.0/samples/binding-echo/src/main/java/echo/Echo.java b/sca-java-1.x/tags/1.0/samples/binding-echo/src/main/java/echo/Echo.java
index 1d5e973f33..1d5e973f33 100644
--- a/tags/java/sca/1.0/samples/binding-echo/src/main/java/echo/Echo.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo/src/main/java/echo/Echo.java
diff --git a/tags/java/sca/1.0/samples/binding-echo/src/main/java/echo/EchoBindingClient.java b/sca-java-1.x/tags/1.0/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
index 21bdff4011..21bdff4011 100644
--- a/tags/java/sca/1.0/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
diff --git a/tags/java/sca/1.0/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java b/sca-java-1.x/tags/1.0/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
index ba68dfe908..ba68dfe908 100644
--- a/tags/java/sca/1.0/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
diff --git a/tags/java/sca/1.0/samples/binding-echo/src/main/resources/EchoBinding.composite b/sca-java-1.x/tags/1.0/samples/binding-echo/src/main/resources/EchoBinding.composite
index 94612fb325..94612fb325 100644
--- a/tags/java/sca/1.0/samples/binding-echo/src/main/resources/EchoBinding.composite
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo/src/main/resources/EchoBinding.composite
diff --git a/tags/java/sca/1.0/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java b/sca-java-1.x/tags/1.0/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
index 1a597fc80f..1a597fc80f 100644
--- a/tags/java/sca/1.0/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
diff --git a/tags/java/sca/1.0/samples/binding-notification-broker/README b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/README
index a241a2f434..a241a2f434 100644
--- a/tags/java/sca/1.0/samples/binding-notification-broker/README
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/README
diff --git a/tags/java/sca/1.0/samples/binding-notification-broker/binding-notification-broker.png b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/binding-notification-broker.png
index 49030650f2..49030650f2 100644
--- a/tags/java/sca/1.0/samples/binding-notification-broker/binding-notification-broker.png
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/binding-notification-broker.png
diff --git a/tags/java/sca/1.0/samples/binding-notification-broker/pom.xml b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/pom.xml
index 57d634d516..57d634d516 100644
--- a/tags/java/sca/1.0/samples/binding-notification-broker/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/pom.xml
diff --git a/tags/java/sca/1.0/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
index 35fa1a9ee9..35fa1a9ee9 100644
--- a/tags/java/sca/1.0/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
diff --git a/tags/java/sca/1.0/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
index d5bc8fbb50..d5bc8fbb50 100644
--- a/tags/java/sca/1.0/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
diff --git a/tags/java/sca/1.0/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
index cd3befe076..cd3befe076 100644
--- a/tags/java/sca/1.0/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
diff --git a/tags/java/sca/1.0/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
index 8caefaf1d2..8caefaf1d2 100644
--- a/tags/java/sca/1.0/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
diff --git a/tags/java/sca/1.0/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
index 430e9d6db7..430e9d6db7 100644
--- a/tags/java/sca/1.0/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
diff --git a/tags/java/sca/1.0/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
index 2dc70f8ed1..2dc70f8ed1 100644
--- a/tags/java/sca/1.0/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/tags/java/sca/1.0/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
index f490c34ea6..f490c34ea6 100644
--- a/tags/java/sca/1.0/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/tags/java/sca/1.0/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
index b823bbebcc..b823bbebcc 100644
--- a/tags/java/sca/1.0/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/tags/java/sca/1.0/samples/binding-notification-consumer/README b/sca-java-1.x/tags/1.0/samples/binding-notification-consumer/README
index 8f05bf13e3..8f05bf13e3 100644
--- a/tags/java/sca/1.0/samples/binding-notification-consumer/README
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-consumer/README
diff --git a/tags/java/sca/1.0/samples/binding-notification-consumer/binding-notification-consumer.png b/sca-java-1.x/tags/1.0/samples/binding-notification-consumer/binding-notification-consumer.png
index 33e1966c3e..33e1966c3e 100644
--- a/tags/java/sca/1.0/samples/binding-notification-consumer/binding-notification-consumer.png
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-consumer/binding-notification-consumer.png
diff --git a/tags/java/sca/1.0/samples/binding-notification-consumer/pom.xml b/sca-java-1.x/tags/1.0/samples/binding-notification-consumer/pom.xml
index 3af23c49f2..3af23c49f2 100644
--- a/tags/java/sca/1.0/samples/binding-notification-consumer/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-consumer/pom.xml
diff --git a/tags/java/sca/1.0/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java b/sca-java-1.x/tags/1.0/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
index 0efd1195bc..0efd1195bc 100644
--- a/tags/java/sca/1.0/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
diff --git a/tags/java/sca/1.0/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java b/sca-java-1.x/tags/1.0/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
index f6c27a2f55..f6c27a2f55 100644
--- a/tags/java/sca/1.0/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
diff --git a/tags/java/sca/1.0/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java b/sca-java-1.x/tags/1.0/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
index 0f4e037df9..0f4e037df9 100644
--- a/tags/java/sca/1.0/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
diff --git a/tags/java/sca/1.0/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/tags/1.0/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
index 2dc70f8ed1..2dc70f8ed1 100644
--- a/tags/java/sca/1.0/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/tags/java/sca/1.0/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/tags/1.0/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
index 8f9bcc4438..8f9bcc4438 100644
--- a/tags/java/sca/1.0/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/tags/java/sca/1.0/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/sca-java-1.x/tags/1.0/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
index b823bbebcc..b823bbebcc 100644
--- a/tags/java/sca/1.0/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/tags/java/sca/1.0/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java b/sca-java-1.x/tags/1.0/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
index c5318f405c..c5318f405c 100644
--- a/tags/java/sca/1.0/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
diff --git a/tags/java/sca/1.0/samples/binding-notification-producer/README b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/README
index a7c3f41e10..a7c3f41e10 100644
--- a/tags/java/sca/1.0/samples/binding-notification-producer/README
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/README
diff --git a/tags/java/sca/1.0/samples/binding-notification-producer/binding-notification-producer.png b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/binding-notification-producer.png
index 34c347c893..34c347c893 100644
--- a/tags/java/sca/1.0/samples/binding-notification-producer/binding-notification-producer.png
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/binding-notification-producer.png
diff --git a/tags/java/sca/1.0/samples/binding-notification-producer/pom.xml b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/pom.xml
index d80a354839..d80a354839 100644
--- a/tags/java/sca/1.0/samples/binding-notification-producer/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/pom.xml
diff --git a/tags/java/sca/1.0/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
index be80e71249..be80e71249 100644
--- a/tags/java/sca/1.0/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
diff --git a/tags/java/sca/1.0/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
index 39f06d5dde..39f06d5dde 100644
--- a/tags/java/sca/1.0/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
diff --git a/tags/java/sca/1.0/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
index 7d49b00607..7d49b00607 100644
--- a/tags/java/sca/1.0/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
diff --git a/tags/java/sca/1.0/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
index 235b180be8..235b180be8 100644
--- a/tags/java/sca/1.0/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
diff --git a/tags/java/sca/1.0/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
index 2dc70f8ed1..2dc70f8ed1 100644
--- a/tags/java/sca/1.0/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/tags/java/sca/1.0/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
index 2db6ea655b..2db6ea655b 100644
--- a/tags/java/sca/1.0/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/tags/java/sca/1.0/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
index b823bbebcc..b823bbebcc 100644
--- a/tags/java/sca/1.0/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/tags/java/sca/1.0/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
index d3901ee407..d3901ee407 100644
--- a/tags/java/sca/1.0/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/README b/sca-java-1.x/tags/1.0/samples/calculator-distributed/README
index 81dd0c64e6..81dd0c64e6 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/README
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/README
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/build.xml b/sca-java-1.x/tags/1.0/samples/calculator-distributed/build.xml
index 13363a6f2a..13363a6f2a 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/build.xml
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/calculator-distributed.png b/sca-java-1.x/tags/1.0/samples/calculator-distributed/calculator-distributed.png
index 7c0e175664..7c0e175664 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/calculator-distributed.png
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/calculator-distributed.png
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/calculator-distributed.svg b/sca-java-1.x/tags/1.0/samples/calculator-distributed/calculator-distributed.svg
index be5a4b8185..be5a4b8185 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/calculator-distributed.svg
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/calculator-distributed.svg
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/pom.xml b/sca-java-1.x/tags/1.0/samples/calculator-distributed/pom.xml
index 99e622cfed..99e622cfed 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/pom.xml
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/calculator/AddService.java b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/calculator/AddService.java
index d7dc4473ad..d7dc4473ad 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
index e9b7e254e5..e9b7e254e5 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
index da869e00fd..da869e00fd 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/calculator/DivideService.java b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/calculator/SubtractService.java b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
index 78ab9c6ee0..78ab9c6ee0 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
index 1010207154..1010207154 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/node/CalculatorNode.java b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/node/CalculatorNode.java
index 624e54ca18..624e54ca18 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/node/CalculatorNode.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/node/CalculatorNode.java
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/node/DomainNode.java b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/node/DomainNode.java
index c3f994cb1c..c3f994cb1c 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/src/main/java/node/DomainNode.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/java/node/DomainNode.java
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
index a111dfd064..a111dfd064 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
index 3f9ed8024b..3f9ed8024b 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
index bf226d9109..bf226d9109 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 3f9ed8024b..3f9ed8024b 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
index 4ef4c5ddb6..4ef4c5ddb6 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
index 3f9ed8024b..3f9ed8024b 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.0/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java
index a844c264cf..a844c264cf 100644
--- a/tags/java/sca/1.0/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-reference/README b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/README
index 837b5ce75f..837b5ce75f 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-reference/README
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/README
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-reference/build.xml b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/build.xml
index 30817fe6f0..30817fe6f0 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-reference/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/build.xml
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-reference/calculator-rmi-reference.png b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/calculator-rmi-reference.png
index 8c76b77a9f..8c76b77a9f 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-reference/calculator-rmi-reference.png
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/calculator-rmi-reference.png
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-reference/calculator-rmi-reference.svg b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/calculator-rmi-reference.svg
index ba802e6717..ba802e6717 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-reference/calculator-rmi-reference.svg
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/calculator-rmi-reference.svg
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-reference/pom.xml b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/pom.xml
index 717ef67d17..717ef67d17 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-reference/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/pom.xml
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
index cd1076c3f1..cd1076c3f1 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
index d310dad4b1..d310dad4b1 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
index f28f0ca179..f28f0ca179 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
index a5a6e1cd29..a5a6e1cd29 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 15e00f5946..15e00f5946 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-service/README b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/README
index 454cdc0d37..454cdc0d37 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-service/README
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/README
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-service/build.xml b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/build.xml
index f98f35e4b0..f98f35e4b0 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-service/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/build.xml
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-service/calculator-rmi-service.png b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/calculator-rmi-service.png
index 574f5eb14b..574f5eb14b 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-service/calculator-rmi-service.png
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/calculator-rmi-service.png
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-service/calculator-rmi-service.svg b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/calculator-rmi-service.svg
index 9253110f98..9253110f98 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-service/calculator-rmi-service.svg
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/calculator-rmi-service.svg
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-service/pom.xml b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/pom.xml
index e593516510..e593516510 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-service/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/pom.xml
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/AddService.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
index b698163c1b..b698163c1b 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
index 3ddcef61df..3ddcef61df 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
index f28f0ca179..f28f0ca179 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
index 34d90ab451..34d90ab451 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/tags/java/sca/1.0/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 8943dd24f6..8943dd24f6 100644
--- a/tags/java/sca/1.0/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/tags/java/sca/1.0/samples/calculator-script/README b/sca-java-1.x/tags/1.0/samples/calculator-script/README
index ab1dda13df..ab1dda13df 100644
--- a/tags/java/sca/1.0/samples/calculator-script/README
+++ b/sca-java-1.x/tags/1.0/samples/calculator-script/README
diff --git a/tags/java/sca/1.0/samples/calculator-script/build.xml b/sca-java-1.x/tags/1.0/samples/calculator-script/build.xml
index 429d638ca5..429d638ca5 100644
--- a/tags/java/sca/1.0/samples/calculator-script/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/calculator-script/build.xml
diff --git a/tags/java/sca/1.0/samples/calculator-script/calculator-script.png b/sca-java-1.x/tags/1.0/samples/calculator-script/calculator-script.png
index d3f8c491c3..d3f8c491c3 100644
--- a/tags/java/sca/1.0/samples/calculator-script/calculator-script.png
+++ b/sca-java-1.x/tags/1.0/samples/calculator-script/calculator-script.png
diff --git a/tags/java/sca/1.0/samples/calculator-script/calculator-script.svg b/sca-java-1.x/tags/1.0/samples/calculator-script/calculator-script.svg
index 16939f9310..16939f9310 100644
--- a/tags/java/sca/1.0/samples/calculator-script/calculator-script.svg
+++ b/sca-java-1.x/tags/1.0/samples/calculator-script/calculator-script.svg
diff --git a/tags/java/sca/1.0/samples/calculator-script/pom.xml b/sca-java-1.x/tags/1.0/samples/calculator-script/pom.xml
index 9fbe3514e3..9fbe3514e3 100644
--- a/tags/java/sca/1.0/samples/calculator-script/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/calculator-script/pom.xml
diff --git a/tags/java/sca/1.0/samples/calculator-script/src/main/java/calculator/AddService.java b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/tags/java/sca/1.0/samples/calculator-script/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/1.0/samples/calculator-script/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
index 243d1562dc..243d1562dc 100644
--- a/tags/java/sca/1.0/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
diff --git a/tags/java/sca/1.0/samples/calculator-script/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/tags/java/sca/1.0/samples/calculator-script/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/1.0/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/tags/java/sca/1.0/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-script/src/main/java/calculator/DivideService.java b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/tags/java/sca/1.0/samples/calculator-script/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/1.0/samples/calculator-script/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/tags/java/sca/1.0/samples/calculator-script/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/1.0/samples/calculator-script/src/main/java/calculator/SubtractService.java b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/tags/java/sca/1.0/samples/calculator-script/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/1.0/samples/calculator-script/src/main/resources/Calculator.composite b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/resources/Calculator.composite
index 8a765e6153..8a765e6153 100644
--- a/tags/java/sca/1.0/samples/calculator-script/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/resources/Calculator.composite
diff --git a/tags/java/sca/1.0/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
index 1d4d221364..1d4d221364 100644
--- a/tags/java/sca/1.0/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
diff --git a/tags/java/sca/1.0/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/tags/java/sca/1.0/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/tags/java/sca/1.0/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
index d6f27ca7f5..d6f27ca7f5 100644
--- a/tags/java/sca/1.0/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/tags/java/sca/1.0/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
index 132a1d13b0..132a1d13b0 100644
--- a/tags/java/sca/1.0/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-1.x/tags/1.0/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/tags/java/sca/1.0/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/tags/1.0/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
index fea8f62110..fea8f62110 100644
--- a/tags/java/sca/1.0/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
diff --git a/tags/java/sca/1.0/samples/calculator-webapp/README b/sca-java-1.x/tags/1.0/samples/calculator-webapp/README
index c88b92b206..c88b92b206 100644
--- a/tags/java/sca/1.0/samples/calculator-webapp/README
+++ b/sca-java-1.x/tags/1.0/samples/calculator-webapp/README
diff --git a/tags/java/sca/1.0/samples/calculator-webapp/build.xml b/sca-java-1.x/tags/1.0/samples/calculator-webapp/build.xml
index 1f3a24ec60..1f3a24ec60 100644
--- a/tags/java/sca/1.0/samples/calculator-webapp/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/calculator-webapp/build.xml
diff --git a/tags/java/sca/1.0/samples/calculator-webapp/calculator-web.png b/sca-java-1.x/tags/1.0/samples/calculator-webapp/calculator-web.png
index 896ddc4093..896ddc4093 100644
--- a/tags/java/sca/1.0/samples/calculator-webapp/calculator-web.png
+++ b/sca-java-1.x/tags/1.0/samples/calculator-webapp/calculator-web.png
diff --git a/tags/java/sca/1.0/samples/calculator-webapp/calculator-web.svg b/sca-java-1.x/tags/1.0/samples/calculator-webapp/calculator-web.svg
index 00ed27556f..00ed27556f 100644
--- a/tags/java/sca/1.0/samples/calculator-webapp/calculator-web.svg
+++ b/sca-java-1.x/tags/1.0/samples/calculator-webapp/calculator-web.svg
diff --git a/tags/java/sca/1.0/samples/calculator-webapp/pom.xml b/sca-java-1.x/tags/1.0/samples/calculator-webapp/pom.xml
index 2dffabc54e..2dffabc54e 100644
--- a/tags/java/sca/1.0/samples/calculator-webapp/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/calculator-webapp/pom.xml
diff --git a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/AddService.java b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
index 4787b728f4..4787b728f4 100644
--- a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index bf3b0303ec..bf3b0303ec 100644
--- a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/DivideService.java b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/SubtractService.java b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/tags/java/sca/1.0/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/resources/Calculator.composite
index 50c23af0b2..50c23af0b2 100644
--- a/tags/java/sca/1.0/samples/calculator-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/resources/Calculator.composite
diff --git a/tags/java/sca/1.0/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
index fe09ab2e1b..fe09ab2e1b 100644
--- a/tags/java/sca/1.0/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.0/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
index b5a828d55b..b5a828d55b 100644
--- a/tags/java/sca/1.0/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/1.0/samples/calculator-webapp/src/main/webapp/calc.jsp b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/webapp/calc.jsp
index 4c4366747d..4c4366747d 100644
--- a/tags/java/sca/1.0/samples/calculator-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/tags/1.0/samples/calculator-webapp/src/main/webapp/calc.jsp
diff --git a/tags/java/sca/1.0/samples/calculator-ws-webapp/README b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/README
index a6e6c897e4..a6e6c897e4 100644
--- a/tags/java/sca/1.0/samples/calculator-ws-webapp/README
+++ b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/README
diff --git a/tags/java/sca/1.0/samples/calculator-ws-webapp/build.xml b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/build.xml
index 004e60a5cc..004e60a5cc 100644
--- a/tags/java/sca/1.0/samples/calculator-ws-webapp/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/build.xml
diff --git a/tags/java/sca/1.0/samples/calculator-ws-webapp/calculator-web.png b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/calculator-web.png
index f482b8d1c8..f482b8d1c8 100644
--- a/tags/java/sca/1.0/samples/calculator-ws-webapp/calculator-web.png
+++ b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/calculator-web.png
diff --git a/tags/java/sca/1.0/samples/calculator-ws-webapp/calculator-web.svg b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/calculator-web.svg
index 1b7015b156..1b7015b156 100644
--- a/tags/java/sca/1.0/samples/calculator-ws-webapp/calculator-web.svg
+++ b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/calculator-web.svg
diff --git a/tags/java/sca/1.0/samples/calculator-ws-webapp/pom.xml b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/pom.xml
index 70f8c8d068..70f8c8d068 100644
--- a/tags/java/sca/1.0/samples/calculator-ws-webapp/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/pom.xml
diff --git a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
index c3c789e745..c3c789e745 100644
--- a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
index a7049729f7..a7049729f7 100644
--- a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
index 4787b728f4..4787b728f4 100644
--- a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index bf3b0303ec..bf3b0303ec 100644
--- a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
index 6415d5a896..6415d5a896 100644
--- a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
diff --git a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
index fe09ab2e1b..fe09ab2e1b 100644
--- a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
index d3a62d39f4..d3a62d39f4 100644
--- a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/webapp/calc.jsp b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
index 4c4366747d..4c4366747d 100644
--- a/tags/java/sca/1.0/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/tags/1.0/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
diff --git a/tags/java/sca/1.0/samples/calculator/README b/sca-java-1.x/tags/1.0/samples/calculator/README
index ceb532faed..ceb532faed 100644
--- a/tags/java/sca/1.0/samples/calculator/README
+++ b/sca-java-1.x/tags/1.0/samples/calculator/README
diff --git a/tags/java/sca/1.0/samples/calculator/build.xml b/sca-java-1.x/tags/1.0/samples/calculator/build.xml
index c4b755ef94..c4b755ef94 100644
--- a/tags/java/sca/1.0/samples/calculator/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/calculator/build.xml
diff --git a/tags/java/sca/1.0/samples/calculator/calculator.png b/sca-java-1.x/tags/1.0/samples/calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/tags/java/sca/1.0/samples/calculator/calculator.png
+++ b/sca-java-1.x/tags/1.0/samples/calculator/calculator.png
diff --git a/tags/java/sca/1.0/samples/calculator/calculator.svg b/sca-java-1.x/tags/1.0/samples/calculator/calculator.svg
index 0615925c50..0615925c50 100644
--- a/tags/java/sca/1.0/samples/calculator/calculator.svg
+++ b/sca-java-1.x/tags/1.0/samples/calculator/calculator.svg
diff --git a/tags/java/sca/1.0/samples/calculator/pom.xml b/sca-java-1.x/tags/1.0/samples/calculator/pom.xml
index bac4abea48..bac4abea48 100644
--- a/tags/java/sca/1.0/samples/calculator/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/calculator/pom.xml
diff --git a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/AddService.java b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/CalculatorClient.java
index 9d180bf52e..9d180bf52e 100644
--- a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/DivideService.java b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/SubtractService.java b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/tags/java/sca/1.0/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/calculator/src/main/resources/Calculator.composite b/sca-java-1.x/tags/1.0/samples/calculator/src/main/resources/Calculator.composite
index 90872041b0..90872041b0 100644
--- a/tags/java/sca/1.0/samples/calculator/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/tags/1.0/samples/calculator/src/main/resources/Calculator.composite
diff --git a/tags/java/sca/1.0/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/tags/1.0/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
index a5735a8701..a5735a8701 100644
--- a/tags/java/sca/1.0/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/tags/java/sca/1.0/samples/chat-webapp/README b/sca-java-1.x/tags/1.0/samples/chat-webapp/README
index dddd7e3f94..dddd7e3f94 100644
--- a/tags/java/sca/1.0/samples/chat-webapp/README
+++ b/sca-java-1.x/tags/1.0/samples/chat-webapp/README
diff --git a/tags/java/sca/1.0/samples/chat-webapp/build.xml b/sca-java-1.x/tags/1.0/samples/chat-webapp/build.xml
index 1a03d92f24..1a03d92f24 100644
--- a/tags/java/sca/1.0/samples/chat-webapp/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/chat-webapp/build.xml
diff --git a/tags/java/sca/1.0/samples/chat-webapp/pom.xml b/sca-java-1.x/tags/1.0/samples/chat-webapp/pom.xml
index d9661d1a9b..d9661d1a9b 100644
--- a/tags/java/sca/1.0/samples/chat-webapp/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/chat-webapp/pom.xml
diff --git a/tags/java/sca/1.0/samples/chat-webapp/src/main/java/sample/ChatService.java b/sca-java-1.x/tags/1.0/samples/chat-webapp/src/main/java/sample/ChatService.java
index ca90b8f579..ca90b8f579 100644
--- a/tags/java/sca/1.0/samples/chat-webapp/src/main/java/sample/ChatService.java
+++ b/sca-java-1.x/tags/1.0/samples/chat-webapp/src/main/java/sample/ChatService.java
diff --git a/tags/java/sca/1.0/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java b/sca-java-1.x/tags/1.0/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
index 7d0bfb3307..7d0bfb3307 100644
--- a/tags/java/sca/1.0/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/chat-webapp/src/main/resources/chat.composite b/sca-java-1.x/tags/1.0/samples/chat-webapp/src/main/resources/chat.composite
index c9ce95e2dc..c9ce95e2dc 100644
--- a/tags/java/sca/1.0/samples/chat-webapp/src/main/resources/chat.composite
+++ b/sca-java-1.x/tags/1.0/samples/chat-webapp/src/main/resources/chat.composite
diff --git a/tags/java/sca/1.0/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.0/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 897849ff8d..897849ff8d 100644
--- a/tags/java/sca/1.0/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.0/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.0/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/tags/1.0/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
index 97d91fec56..97d91fec56 100644
--- a/tags/java/sca/1.0/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/tags/1.0/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/1.0/samples/chat-webapp/src/main/webapp/chat.html b/sca-java-1.x/tags/1.0/samples/chat-webapp/src/main/webapp/chat.html
index 7a449a906a..7a449a906a 100644
--- a/tags/java/sca/1.0/samples/chat-webapp/src/main/webapp/chat.html
+++ b/sca-java-1.x/tags/1.0/samples/chat-webapp/src/main/webapp/chat.html
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/build.xml b/sca-java-1.x/tags/1.0/samples/company-das-webapp/build.xml
index feef76481b..feef76481b 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/build.xml
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/db.lck b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/db.lck
index 9f6b4b3d4b..9f6b4b3d4b 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/db.lck
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/db.lck
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/log/log.ctrl b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/log/log.ctrl
index edbd775299..edbd775299 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/log/log.ctrl
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/log/log.ctrl
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/log/log1.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/log/log1.dat
index 7e85ac8e8f..7e85ac8e8f 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/log/log1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/log/log1.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/log/logmirror.ctrl b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/log/logmirror.ctrl
index edbd775299..edbd775299 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/log/logmirror.ctrl
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/log/logmirror.ctrl
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c10.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c10.dat
index 5d8ecaa10f..5d8ecaa10f 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c10.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c10.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c101.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c101.dat
index 0f79fa7574..0f79fa7574 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c101.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c101.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c111.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c111.dat
index 39d49e3d19..39d49e3d19 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c111.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c111.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c121.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c121.dat
index 2a4311779b..2a4311779b 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c121.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c121.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c130.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c130.dat
index 64e3c18d62..64e3c18d62 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c130.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c130.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c141.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c141.dat
index 0632d04164..0632d04164 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c141.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c141.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c150.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c150.dat
index d7541026f6..d7541026f6 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c150.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c150.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c161.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c161.dat
index 6673bf1873..6673bf1873 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c161.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c161.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c171.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c171.dat
index c2a753cc5d..c2a753cc5d 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c171.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c171.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c180.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c180.dat
index cb9391aed1..cb9391aed1 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c180.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c180.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c191.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c191.dat
index d3cf1d6364..d3cf1d6364 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c191.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c191.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c1a1.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c1a1.dat
index a7a2d536e9..a7a2d536e9 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c1a1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c1a1.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c1b1.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c1b1.dat
index 19097e69e7..19097e69e7 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c1b1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c1b1.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c1c0.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c1c0.dat
index 359525a31a..359525a31a 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c1c0.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c1c0.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c1d1.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c1d1.dat
index 9f257df932..9f257df932 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c1d1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c1d1.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c1e0.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c1e0.dat
index e43e52fb7f..e43e52fb7f 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c1e0.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c1e0.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c1f1.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c1f1.dat
index 7e6ee3b1e0..7e6ee3b1e0 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c1f1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c1f1.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c20.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c20.dat
index 1be6390f06..1be6390f06 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c20.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c20.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c200.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c200.dat
index b15d56855c..b15d56855c 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c200.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c200.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c211.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c211.dat
index 84b0022312..84b0022312 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c211.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c211.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c221.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c221.dat
index 63106a9523..63106a9523 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c221.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c221.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c230.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c230.dat
index 9975f27c1f..9975f27c1f 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c230.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c230.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c241.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c241.dat
index 835c645a16..835c645a16 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c241.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c241.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c251.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c251.dat
index d3d6adf4fb..d3d6adf4fb 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c251.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c251.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c260.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c260.dat
index 8d7333df7d..8d7333df7d 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c260.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c260.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c271.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c271.dat
index af722f7d73..af722f7d73 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c271.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c271.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c281.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c281.dat
index 3972983c2e..3972983c2e 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c281.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c281.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c290.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c290.dat
index 31577b8124..31577b8124 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c290.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c290.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c2a1.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c2a1.dat
index 0f700d13a7..0f700d13a7 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c2a1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c2a1.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c2b1.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c2b1.dat
index 1d6382fb3d..1d6382fb3d 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c2b1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c2b1.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c2c1.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c2c1.dat
index 3bc60d886b..3bc60d886b 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c2c1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c2c1.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c2d0.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c2d0.dat
index c542d3c91c..c542d3c91c 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c2d0.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c2d0.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c2e1.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c2e1.dat
index 16abd20b5f..16abd20b5f 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c2e1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c2e1.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c2f0.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c2f0.dat
index eb26be5932..eb26be5932 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c2f0.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c2f0.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c300.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c300.dat
index 1214f1df4b..1214f1df4b 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c300.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c300.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c31.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c31.dat
index 18c16f1123..18c16f1123 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c31.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c31.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c311.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c311.dat
index 926cbf25b5..926cbf25b5 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c311.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c311.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c320.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c320.dat
index 07e7bc023c..07e7bc023c 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c320.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c320.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c331.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c331.dat
index fd827f9dc2..fd827f9dc2 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c331.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c331.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c340.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c340.dat
index ca70319886..ca70319886 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c340.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c340.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c351.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c351.dat
index 8fbe2a527c..8fbe2a527c 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c351.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c351.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c360.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c360.dat
index dcf9c746e1..dcf9c746e1 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c360.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c360.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c371.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c371.dat
index 6f21a840ea..6f21a840ea 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c371.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c371.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c380.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c380.dat
index b512e8065f..b512e8065f 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c380.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c380.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c391.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c391.dat
index 27006e95a1..27006e95a1 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c391.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c391.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c3a0.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c3a0.dat
index 565dca97ac..565dca97ac 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c3a0.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c3a0.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c3b1.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c3b1.dat
index 36894c9818..36894c9818 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c3b1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c3b1.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c3c0.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c3c0.dat
index d0c538aede..d0c538aede 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c3c0.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c3c0.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c3d1.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c3d1.dat
index 65bcec5527..65bcec5527 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c3d1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c3d1.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c3e0.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c3e0.dat
index bdab359420..bdab359420 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c3e0.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c3e0.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c3f1.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c3f1.dat
index dc2d278b57..dc2d278b57 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c3f1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c3f1.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c400.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c400.dat
index 3072709cec..3072709cec 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c400.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c400.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c41.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c41.dat
index 61086690f2..61086690f2 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c41.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c41.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c411.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c411.dat
index ca551d8249..ca551d8249 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c411.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c411.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c420.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c420.dat
index f04de0840e..f04de0840e 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c420.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c420.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c431.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c431.dat
index 398b1672cc..398b1672cc 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c431.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c431.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c440.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c440.dat
index af259d0872..af259d0872 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c440.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c440.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c451.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c451.dat
index 772a18c658..772a18c658 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c451.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c451.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c460.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c460.dat
index 505428362d..505428362d 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c460.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c460.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c471.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c471.dat
index 484d0df42d..484d0df42d 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c471.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c471.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c481.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c481.dat
index faac073076..faac073076 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c481.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c481.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c490.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c490.dat
index 7585319d21..7585319d21 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c490.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c490.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c4a1.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c4a1.dat
index 4fe8b786e3..4fe8b786e3 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c4a1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c4a1.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c51.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c51.dat
index 7fc7937b15..7fc7937b15 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c51.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c51.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c60.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c60.dat
index d1fb08c946..d1fb08c946 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c60.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c60.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c71.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c71.dat
index d4c2090a3b..d4c2090a3b 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c71.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c71.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c81.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c81.dat
index 38b6ea6520..38b6ea6520 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c81.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c81.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c90.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c90.dat
index a607a5969c..a607a5969c 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/c90.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/c90.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/ca1.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/ca1.dat
index 19b4c9e340..19b4c9e340 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/ca1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/ca1.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/cb1.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/cb1.dat
index 73dc986572..73dc986572 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/cb1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/cb1.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/cc0.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/cc0.dat
index d1eef3bb56..d1eef3bb56 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/cc0.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/cc0.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/cd1.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/cd1.dat
index c7e6db3ef7..c7e6db3ef7 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/cd1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/cd1.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/ce1.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/ce1.dat
index 8fd3bf17a8..8fd3bf17a8 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/ce1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/ce1.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/cf0.dat b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/cf0.dat
index 332b3d9a8a..332b3d9a8a 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/seg0/cf0.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/seg0/cf0.dat
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/dastest/service.properties b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/service.properties
index af9511d9c7..af9511d9c7 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/dastest/service.properties
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/dastest/service.properties
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/pom.xml b/sca-java-1.x/tags/1.0/samples/company-das-webapp/pom.xml
index 404c292119..404c292119 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/pom.xml
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/readme.html b/sca-java-1.x/tags/1.0/samples/company-das-webapp/readme.html
index 65a50de320..65a50de320 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/readme.html
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/readme.html
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/src/main/java/das/DASService.java b/sca-java-1.x/tags/1.0/samples/company-das-webapp/src/main/java/das/DASService.java
index 0387341b87..0387341b87 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/src/main/java/das/DASService.java
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/src/main/java/das/DASService.java
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/src/main/java/das/DASServiceException.java b/sca-java-1.x/tags/1.0/samples/company-das-webapp/src/main/java/das/DASServiceException.java
index e62201a4de..e62201a4de 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/src/main/java/das/DASServiceException.java
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/src/main/java/das/DASServiceException.java
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/src/main/java/das/DASServiceImpl.java b/sca-java-1.x/tags/1.0/samples/company-das-webapp/src/main/java/das/DASServiceImpl.java
index 70d9e379ef..70d9e379ef 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/src/main/java/das/DASServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/src/main/java/das/DASServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/src/main/resources/CompanyConfig.xml b/sca-java-1.x/tags/1.0/samples/company-das-webapp/src/main/resources/CompanyConfig.xml
index 3d20054c12..3d20054c12 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/src/main/resources/CompanyConfig.xml
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/src/main/resources/CompanyConfig.xml
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/src/main/resources/dasservice.composite b/sca-java-1.x/tags/1.0/samples/company-das-webapp/src/main/resources/dasservice.composite
index 54c4af61ee..54c4af61ee 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/src/main/resources/dasservice.composite
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/src/main/resources/dasservice.composite
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/src/main/resources/log4j.properties b/sca-java-1.x/tags/1.0/samples/company-das-webapp/src/main/resources/log4j.properties
index c5c2868aaa..c5c2868aaa 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/src/main/resources/log4j.properties
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/src/main/resources/log4j.properties
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/src/main/webapp/Company.jsp b/sca-java-1.x/tags/1.0/samples/company-das-webapp/src/main/webapp/Company.jsp
index 0a156de1c7..0a156de1c7 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/src/main/webapp/Company.jsp
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/src/main/webapp/Company.jsp
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/src/main/webapp/META-INF/context.xml b/sca-java-1.x/tags/1.0/samples/company-das-webapp/src/main/webapp/META-INF/context.xml
index 0e90eb0a83..0e90eb0a83 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/src/main/webapp/META-INF/context.xml
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/src/main/webapp/META-INF/context.xml
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.0/samples/company-das-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 25849fa6b9..25849fa6b9 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.0/samples/company-das-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/tags/1.0/samples/company-das-webapp/src/main/webapp/WEB-INF/web.xml
index 67a782269e..67a782269e 100644
--- a/tags/java/sca/1.0/samples/company-das-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/tags/1.0/samples/company-das-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/1.0/samples/company-das/pom.xml b/sca-java-1.x/tags/1.0/samples/company-das/pom.xml
index 53adbdca6b..53adbdca6b 100644
--- a/tags/java/sca/1.0/samples/company-das/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/company-das/pom.xml
diff --git a/tags/java/sca/1.0/samples/company-das/readme.html b/sca-java-1.x/tags/1.0/samples/company-das/readme.html
index ec6b492b72..ec6b492b72 100644
--- a/tags/java/sca/1.0/samples/company-das/readme.html
+++ b/sca-java-1.x/tags/1.0/samples/company-das/readme.html
diff --git a/tags/java/sca/1.0/samples/company-das/src/main/java/das/DASService.java b/sca-java-1.x/tags/1.0/samples/company-das/src/main/java/das/DASService.java
index 0387341b87..0387341b87 100644
--- a/tags/java/sca/1.0/samples/company-das/src/main/java/das/DASService.java
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/main/java/das/DASService.java
diff --git a/tags/java/sca/1.0/samples/company-das/src/main/java/das/DASServiceException.java b/sca-java-1.x/tags/1.0/samples/company-das/src/main/java/das/DASServiceException.java
index e62201a4de..e62201a4de 100644
--- a/tags/java/sca/1.0/samples/company-das/src/main/java/das/DASServiceException.java
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/main/java/das/DASServiceException.java
diff --git a/tags/java/sca/1.0/samples/company-das/src/main/java/das/DASServiceImpl.java b/sca-java-1.x/tags/1.0/samples/company-das/src/main/java/das/DASServiceImpl.java
index 70d9e379ef..70d9e379ef 100644
--- a/tags/java/sca/1.0/samples/company-das/src/main/java/das/DASServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/main/java/das/DASServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/company-das/src/main/resources/dasservice.composite b/sca-java-1.x/tags/1.0/samples/company-das/src/main/resources/dasservice.composite
index 42ac52a756..42ac52a756 100644
--- a/tags/java/sca/1.0/samples/company-das/src/main/resources/dasservice.composite
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/main/resources/dasservice.composite
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/java/das/DASServiceTestCase.java b/sca-java-1.x/tags/1.0/samples/company-das/src/test/java/das/DASServiceTestCase.java
index 38acde3eb0..38acde3eb0 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/java/das/DASServiceTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/java/das/DASServiceTestCase.java
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/CompanyConfig.xml b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/CompanyConfig.xml
index 912e81e9f6..912e81e9f6 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/CompanyConfig.xml
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/CompanyConfig.xml
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/db.lck b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/db.lck
index 9f6b4b3d4b..9f6b4b3d4b 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/db.lck
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/db.lck
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/log/log.ctrl b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/log/log.ctrl
index edbd775299..edbd775299 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/log/log.ctrl
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/log/log.ctrl
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/log/log1.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/log/log1.dat
index 7e85ac8e8f..7e85ac8e8f 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/log/log1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/log/log1.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/log/logmirror.ctrl b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/log/logmirror.ctrl
index edbd775299..edbd775299 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/log/logmirror.ctrl
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/log/logmirror.ctrl
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c10.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c10.dat
index 5d8ecaa10f..5d8ecaa10f 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c10.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c10.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c101.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c101.dat
index 0f79fa7574..0f79fa7574 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c101.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c101.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c111.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c111.dat
index 39d49e3d19..39d49e3d19 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c111.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c111.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c121.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c121.dat
index 2a4311779b..2a4311779b 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c121.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c121.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c130.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c130.dat
index 64e3c18d62..64e3c18d62 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c130.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c130.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c141.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c141.dat
index 0632d04164..0632d04164 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c141.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c141.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c150.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c150.dat
index d7541026f6..d7541026f6 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c150.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c150.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c161.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c161.dat
index 6673bf1873..6673bf1873 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c161.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c161.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c171.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c171.dat
index c2a753cc5d..c2a753cc5d 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c171.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c171.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c180.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c180.dat
index cb9391aed1..cb9391aed1 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c180.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c180.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c191.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c191.dat
index d3cf1d6364..d3cf1d6364 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c191.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c191.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c1a1.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c1a1.dat
index a7a2d536e9..a7a2d536e9 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c1a1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c1a1.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c1b1.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c1b1.dat
index 19097e69e7..19097e69e7 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c1b1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c1b1.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c1c0.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c1c0.dat
index 359525a31a..359525a31a 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c1c0.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c1c0.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c1d1.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c1d1.dat
index 9f257df932..9f257df932 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c1d1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c1d1.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c1e0.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c1e0.dat
index e43e52fb7f..e43e52fb7f 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c1e0.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c1e0.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c1f1.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c1f1.dat
index 7e6ee3b1e0..7e6ee3b1e0 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c1f1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c1f1.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c20.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c20.dat
index 1be6390f06..1be6390f06 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c20.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c20.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c200.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c200.dat
index b15d56855c..b15d56855c 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c200.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c200.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c211.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c211.dat
index 84b0022312..84b0022312 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c211.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c211.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c221.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c221.dat
index 63106a9523..63106a9523 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c221.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c221.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c230.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c230.dat
index 9975f27c1f..9975f27c1f 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c230.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c230.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c241.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c241.dat
index 835c645a16..835c645a16 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c241.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c241.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c251.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c251.dat
index d3d6adf4fb..d3d6adf4fb 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c251.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c251.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c260.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c260.dat
index 8d7333df7d..8d7333df7d 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c260.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c260.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c271.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c271.dat
index af722f7d73..af722f7d73 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c271.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c271.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c281.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c281.dat
index 3972983c2e..3972983c2e 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c281.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c281.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c290.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c290.dat
index 31577b8124..31577b8124 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c290.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c290.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c2a1.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c2a1.dat
index 0f700d13a7..0f700d13a7 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c2a1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c2a1.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c2b1.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c2b1.dat
index 1d6382fb3d..1d6382fb3d 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c2b1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c2b1.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c2c1.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c2c1.dat
index 3bc60d886b..3bc60d886b 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c2c1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c2c1.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c2d0.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c2d0.dat
index c542d3c91c..c542d3c91c 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c2d0.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c2d0.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c2e1.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c2e1.dat
index 16abd20b5f..16abd20b5f 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c2e1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c2e1.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c2f0.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c2f0.dat
index eb26be5932..eb26be5932 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c2f0.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c2f0.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c300.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c300.dat
index 1214f1df4b..1214f1df4b 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c300.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c300.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c31.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c31.dat
index 18c16f1123..18c16f1123 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c31.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c31.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c311.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c311.dat
index 926cbf25b5..926cbf25b5 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c311.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c311.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c320.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c320.dat
index 07e7bc023c..07e7bc023c 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c320.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c320.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c331.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c331.dat
index fd827f9dc2..fd827f9dc2 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c331.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c331.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c340.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c340.dat
index ca70319886..ca70319886 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c340.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c340.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c351.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c351.dat
index 8fbe2a527c..8fbe2a527c 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c351.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c351.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c360.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c360.dat
index dcf9c746e1..dcf9c746e1 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c360.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c360.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c371.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c371.dat
index 6f21a840ea..6f21a840ea 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c371.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c371.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c380.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c380.dat
index b512e8065f..b512e8065f 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c380.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c380.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c391.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c391.dat
index 27006e95a1..27006e95a1 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c391.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c391.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c3a0.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c3a0.dat
index 565dca97ac..565dca97ac 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c3a0.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c3a0.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c3b1.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c3b1.dat
index 36894c9818..36894c9818 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c3b1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c3b1.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c3c0.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c3c0.dat
index d0c538aede..d0c538aede 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c3c0.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c3c0.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c3d1.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c3d1.dat
index 65bcec5527..65bcec5527 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c3d1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c3d1.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c3e0.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c3e0.dat
index bdab359420..bdab359420 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c3e0.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c3e0.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c3f1.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c3f1.dat
index dc2d278b57..dc2d278b57 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c3f1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c3f1.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c400.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c400.dat
index 3072709cec..3072709cec 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c400.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c400.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c41.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c41.dat
index 61086690f2..61086690f2 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c41.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c41.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c411.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c411.dat
index ca551d8249..ca551d8249 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c411.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c411.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c420.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c420.dat
index f04de0840e..f04de0840e 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c420.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c420.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c431.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c431.dat
index 398b1672cc..398b1672cc 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c431.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c431.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c440.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c440.dat
index af259d0872..af259d0872 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c440.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c440.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c451.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c451.dat
index 772a18c658..772a18c658 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c451.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c451.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c460.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c460.dat
index 505428362d..505428362d 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c460.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c460.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c471.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c471.dat
index 484d0df42d..484d0df42d 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c471.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c471.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c481.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c481.dat
index faac073076..faac073076 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c481.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c481.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c490.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c490.dat
index 7585319d21..7585319d21 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c490.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c490.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c4a1.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c4a1.dat
index 4fe8b786e3..4fe8b786e3 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c4a1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c4a1.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c51.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c51.dat
index 7fc7937b15..7fc7937b15 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c51.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c51.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c60.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c60.dat
index d1fb08c946..d1fb08c946 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c60.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c60.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c71.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c71.dat
index d4c2090a3b..d4c2090a3b 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c71.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c71.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c81.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c81.dat
index 38b6ea6520..38b6ea6520 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c81.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c81.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c90.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c90.dat
index a607a5969c..a607a5969c 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/c90.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/c90.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/ca1.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/ca1.dat
index 19b4c9e340..19b4c9e340 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/ca1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/ca1.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/cb1.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/cb1.dat
index 73dc986572..73dc986572 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/cb1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/cb1.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/cc0.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/cc0.dat
index d1eef3bb56..d1eef3bb56 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/cc0.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/cc0.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/cd1.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/cd1.dat
index c7e6db3ef7..c7e6db3ef7 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/cd1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/cd1.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/ce1.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/ce1.dat
index 8fd3bf17a8..8fd3bf17a8 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/ce1.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/ce1.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/cf0.dat b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/cf0.dat
index 332b3d9a8a..332b3d9a8a 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/seg0/cf0.dat
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/seg0/cf0.dat
diff --git a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/service.properties b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/service.properties
index af9511d9c7..af9511d9c7 100644
--- a/tags/java/sca/1.0/samples/company-das/src/test/resources/dastest/service.properties
+++ b/sca-java-1.x/tags/1.0/samples/company-das/src/test/resources/dastest/service.properties
diff --git a/tags/java/sca/1.0/samples/databinding-echo/README b/sca-java-1.x/tags/1.0/samples/databinding-echo/README
index 67c1aa32d5..67c1aa32d5 100644
--- a/tags/java/sca/1.0/samples/databinding-echo/README
+++ b/sca-java-1.x/tags/1.0/samples/databinding-echo/README
diff --git a/tags/java/sca/1.0/samples/databinding-echo/build.xml b/sca-java-1.x/tags/1.0/samples/databinding-echo/build.xml
index 22fc41228b..22fc41228b 100644
--- a/tags/java/sca/1.0/samples/databinding-echo/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/databinding-echo/build.xml
diff --git a/tags/java/sca/1.0/samples/databinding-echo/databinding-echo.png b/sca-java-1.x/tags/1.0/samples/databinding-echo/databinding-echo.png
index afbbfff285..afbbfff285 100644
--- a/tags/java/sca/1.0/samples/databinding-echo/databinding-echo.png
+++ b/sca-java-1.x/tags/1.0/samples/databinding-echo/databinding-echo.png
diff --git a/tags/java/sca/1.0/samples/databinding-echo/databinding-echo.svg b/sca-java-1.x/tags/1.0/samples/databinding-echo/databinding-echo.svg
index 87964abf86..87964abf86 100644
--- a/tags/java/sca/1.0/samples/databinding-echo/databinding-echo.svg
+++ b/sca-java-1.x/tags/1.0/samples/databinding-echo/databinding-echo.svg
diff --git a/tags/java/sca/1.0/samples/databinding-echo/pom.xml b/sca-java-1.x/tags/1.0/samples/databinding-echo/pom.xml
index 87da0a5d00..87da0a5d00 100644
--- a/tags/java/sca/1.0/samples/databinding-echo/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/databinding-echo/pom.xml
diff --git a/tags/java/sca/1.0/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java b/sca-java-1.x/tags/1.0/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
index 5679614164..5679614164 100644
--- a/tags/java/sca/1.0/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
diff --git a/tags/java/sca/1.0/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java b/sca-java-1.x/tags/1.0/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
index ff8968837d..ff8968837d 100644
--- a/tags/java/sca/1.0/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
diff --git a/tags/java/sca/1.0/samples/databinding-echo/src/main/java/dbecho/Echo.java b/sca-java-1.x/tags/1.0/samples/databinding-echo/src/main/java/dbecho/Echo.java
index 25ecc90454..25ecc90454 100644
--- a/tags/java/sca/1.0/samples/databinding-echo/src/main/java/dbecho/Echo.java
+++ b/sca-java-1.x/tags/1.0/samples/databinding-echo/src/main/java/dbecho/Echo.java
diff --git a/tags/java/sca/1.0/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java b/sca-java-1.x/tags/1.0/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
index 9ec3819899..9ec3819899 100644
--- a/tags/java/sca/1.0/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
+++ b/sca-java-1.x/tags/1.0/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
diff --git a/tags/java/sca/1.0/samples/databinding-echo/src/main/java/dbecho/Interface1.java b/sca-java-1.x/tags/1.0/samples/databinding-echo/src/main/java/dbecho/Interface1.java
index 70b450e358..70b450e358 100644
--- a/tags/java/sca/1.0/samples/databinding-echo/src/main/java/dbecho/Interface1.java
+++ b/sca-java-1.x/tags/1.0/samples/databinding-echo/src/main/java/dbecho/Interface1.java
diff --git a/tags/java/sca/1.0/samples/databinding-echo/src/main/java/dbecho/Interface2.java b/sca-java-1.x/tags/1.0/samples/databinding-echo/src/main/java/dbecho/Interface2.java
index b62f1f425d..b62f1f425d 100644
--- a/tags/java/sca/1.0/samples/databinding-echo/src/main/java/dbecho/Interface2.java
+++ b/sca-java-1.x/tags/1.0/samples/databinding-echo/src/main/java/dbecho/Interface2.java
diff --git a/tags/java/sca/1.0/samples/databinding-echo/src/main/resources/EchoDataBinding.composite b/sca-java-1.x/tags/1.0/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
index 2f042b8e34..2f042b8e34 100644
--- a/tags/java/sca/1.0/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
+++ b/sca-java-1.x/tags/1.0/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
diff --git a/tags/java/sca/1.0/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl b/sca-java-1.x/tags/1.0/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
index ef2308aa73..ef2308aa73 100644
--- a/tags/java/sca/1.0/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
+++ b/sca-java-1.x/tags/1.0/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
diff --git a/tags/java/sca/1.0/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java b/sca-java-1.x/tags/1.0/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
index 43434d8cee..43434d8cee 100644
--- a/tags/java/sca/1.0/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
diff --git a/tags/java/sca/1.0/samples/feed-aggregator-webapp/README b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/README
index 6f50990e85..6f50990e85 100644
--- a/tags/java/sca/1.0/samples/feed-aggregator-webapp/README
+++ b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/README
diff --git a/tags/java/sca/1.0/samples/feed-aggregator-webapp/build.xml b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/build.xml
index 4e806f4689..4e806f4689 100644
--- a/tags/java/sca/1.0/samples/feed-aggregator-webapp/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/build.xml
diff --git a/tags/java/sca/1.0/samples/feed-aggregator-webapp/pom.xml b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/pom.xml
index be2cea5997..be2cea5997 100644
--- a/tags/java/sca/1.0/samples/feed-aggregator-webapp/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/pom.xml
diff --git a/tags/java/sca/1.0/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
index 6d15b5426b..6d15b5426b 100644
--- a/tags/java/sca/1.0/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
diff --git a/tags/java/sca/1.0/samples/feed-aggregator-webapp/src/main/java/feed/SampleServer.java b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/src/main/java/feed/SampleServer.java
index 05961a315c..05961a315c 100644
--- a/tags/java/sca/1.0/samples/feed-aggregator-webapp/src/main/java/feed/SampleServer.java
+++ b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/src/main/java/feed/SampleServer.java
diff --git a/tags/java/sca/1.0/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
index db26ad9350..db26ad9350 100644
--- a/tags/java/sca/1.0/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
+++ b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
diff --git a/tags/java/sca/1.0/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
index 62d90bfa3b..62d90bfa3b 100644
--- a/tags/java/sca/1.0/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
diff --git a/tags/java/sca/1.0/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
index df02ba8536..df02ba8536 100644
--- a/tags/java/sca/1.0/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
+++ b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
diff --git a/tags/java/sca/1.0/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
index b67fe843ca..b67fe843ca 100644
--- a/tags/java/sca/1.0/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.0/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
index dea3980e4d..dea3980e4d 100644
--- a/tags/java/sca/1.0/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/1.0/samples/feed-aggregator-webapp/src/main/webapp/index.html b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/src/main/webapp/index.html
index 3f12c3e157..3f12c3e157 100644
--- a/tags/java/sca/1.0/samples/feed-aggregator-webapp/src/main/webapp/index.html
+++ b/sca-java-1.x/tags/1.0/samples/feed-aggregator-webapp/src/main/webapp/index.html
diff --git a/tags/java/sca/1.0/samples/feed-aggregator/README b/sca-java-1.x/tags/1.0/samples/feed-aggregator/README
index f9daa95a11..f9daa95a11 100644
--- a/tags/java/sca/1.0/samples/feed-aggregator/README
+++ b/sca-java-1.x/tags/1.0/samples/feed-aggregator/README
diff --git a/tags/java/sca/1.0/samples/feed-aggregator/build.xml b/sca-java-1.x/tags/1.0/samples/feed-aggregator/build.xml
index 2118e13db7..2118e13db7 100644
--- a/tags/java/sca/1.0/samples/feed-aggregator/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/feed-aggregator/build.xml
diff --git a/tags/java/sca/1.0/samples/feed-aggregator/pom.xml b/sca-java-1.x/tags/1.0/samples/feed-aggregator/pom.xml
index 0d46601996..0d46601996 100644
--- a/tags/java/sca/1.0/samples/feed-aggregator/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/feed-aggregator/pom.xml
diff --git a/tags/java/sca/1.0/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java b/sca-java-1.x/tags/1.0/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
index 6d15b5426b..6d15b5426b 100644
--- a/tags/java/sca/1.0/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
diff --git a/tags/java/sca/1.0/samples/feed-aggregator/src/main/java/feed/SampleServer.java b/sca-java-1.x/tags/1.0/samples/feed-aggregator/src/main/java/feed/SampleServer.java
index 05961a315c..05961a315c 100644
--- a/tags/java/sca/1.0/samples/feed-aggregator/src/main/java/feed/SampleServer.java
+++ b/sca-java-1.x/tags/1.0/samples/feed-aggregator/src/main/java/feed/SampleServer.java
diff --git a/tags/java/sca/1.0/samples/feed-aggregator/src/main/java/feed/Sort.java b/sca-java-1.x/tags/1.0/samples/feed-aggregator/src/main/java/feed/Sort.java
index db26ad9350..db26ad9350 100644
--- a/tags/java/sca/1.0/samples/feed-aggregator/src/main/java/feed/Sort.java
+++ b/sca-java-1.x/tags/1.0/samples/feed-aggregator/src/main/java/feed/Sort.java
diff --git a/tags/java/sca/1.0/samples/feed-aggregator/src/main/java/feed/SortImpl.java b/sca-java-1.x/tags/1.0/samples/feed-aggregator/src/main/java/feed/SortImpl.java
index 62d90bfa3b..62d90bfa3b 100644
--- a/tags/java/sca/1.0/samples/feed-aggregator/src/main/java/feed/SortImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/feed-aggregator/src/main/java/feed/SortImpl.java
diff --git a/tags/java/sca/1.0/samples/feed-aggregator/src/main/resources/FeedAggregator.composite b/sca-java-1.x/tags/1.0/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
index df02ba8536..df02ba8536 100644
--- a/tags/java/sca/1.0/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
+++ b/sca-java-1.x/tags/1.0/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
diff --git a/tags/java/sca/1.0/samples/helloworld-bpel/README b/sca-java-1.x/tags/1.0/samples/helloworld-bpel/README
index 7ba1b3422e..7ba1b3422e 100644
--- a/tags/java/sca/1.0/samples/helloworld-bpel/README
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-bpel/README
diff --git a/tags/java/sca/1.0/samples/helloworld-bpel/pom.xml b/sca-java-1.x/tags/1.0/samples/helloworld-bpel/pom.xml
index 4058eb1ae6..4058eb1ae6 100644
--- a/tags/java/sca/1.0/samples/helloworld-bpel/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-bpel/pom.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java b/sca-java-1.x/tags/1.0/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
index 68d66bfda5..68d66bfda5 100644
--- a/tags/java/sca/1.0/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
diff --git a/tags/java/sca/1.0/samples/helloworld-bpel/src/main/resources/deploy.xml b/sca-java-1.x/tags/1.0/samples/helloworld-bpel/src/main/resources/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/tags/java/sca/1.0/samples/helloworld-bpel/src/main/resources/deploy.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-bpel/src/main/resources/deploy.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-1.x/tags/1.0/samples/helloworld-bpel/src/main/resources/helloworld.bpel
index e983899d76..e983899d76 100644
--- a/tags/java/sca/1.0/samples/helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-bpel/src/main/resources/helloworld.bpel
diff --git a/tags/java/sca/1.0/samples/helloworld-bpel/src/main/resources/helloworld.componentType b/sca-java-1.x/tags/1.0/samples/helloworld-bpel/src/main/resources/helloworld.componentType
index 121064a475..121064a475 100644
--- a/tags/java/sca/1.0/samples/helloworld-bpel/src/main/resources/helloworld.componentType
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-bpel/src/main/resources/helloworld.componentType
diff --git a/tags/java/sca/1.0/samples/helloworld-bpel/src/main/resources/helloworld.composite b/sca-java-1.x/tags/1.0/samples/helloworld-bpel/src/main/resources/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/tags/java/sca/1.0/samples/helloworld-bpel/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-bpel/src/main/resources/helloworld.composite
diff --git a/tags/java/sca/1.0/samples/helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-1.x/tags/1.0/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/tags/java/sca/1.0/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
diff --git a/tags/java/sca/1.0/samples/helloworld-bpel/src/main/resources/log4j.properties b/sca-java-1.x/tags/1.0/samples/helloworld-bpel/src/main/resources/log4j.properties
index aae9b90dea..aae9b90dea 100644
--- a/tags/java/sca/1.0/samples/helloworld-bpel/src/main/resources/log4j.properties
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-bpel/src/main/resources/log4j.properties
diff --git a/tags/java/sca/1.0/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java b/sca-java-1.x/tags/1.0/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
index f2f9a99153..f2f9a99153 100644
--- a/tags/java/sca/1.0/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
diff --git a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/README b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/README
index 02d4050833..02d4050833 100644
--- a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/README
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/README
diff --git a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/build-dojo.xml b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/build-dojo.xml
index bd7186881c..bd7186881c 100644
--- a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/build-dojo.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/build-dojo.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/build.xml b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/build.xml
index c68bef90e1..c68bef90e1 100644
--- a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/build.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
diff --git a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
index d5c3bc5d3e..d5c3bc5d3e 100644
--- a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
diff --git a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/pom.xml b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/pom.xml
index 3b172141d3..3b172141d3 100644
--- a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/pom.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
index 3d8ea24f04..3d8ea24f04 100644
--- a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
diff --git a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
index e205f4da9b..e205f4da9b 100644
--- a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
index e895ab455d..e895ab455d 100644
--- a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
diff --git a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
index 4195f3288c..4195f3288c 100644
--- a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 2c178c1ddc..2c178c1ddc 100644
--- a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
index 70cd67890a..70cd67890a 100644
--- a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/src/main/webapp/style.css b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/src/main/webapp/style.css
index 1071583264..1071583264 100644
--- a/tags/java/sca/1.0/samples/helloworld-dojo-webapp/src/main/webapp/style.css
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-dojo-webapp/src/main/webapp/style.css
diff --git a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/README b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/README
index 07253d039b..07253d039b 100644
--- a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/README
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/README
diff --git a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/build.xml b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/build.xml
index 0161761116..0161761116 100644
--- a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/build.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
diff --git a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
index 6ef1f438fb..6ef1f438fb 100644
--- a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
diff --git a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/pom.xml b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/pom.xml
index f9655bf6db..f9655bf6db 100644
--- a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/pom.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
index 3d8ea24f04..3d8ea24f04 100644
--- a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
diff --git a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
index 35fd00fabd..35fd00fabd 100644
--- a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
index e895ab455d..e895ab455d 100644
--- a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
diff --git a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
index 75dd9050fa..75dd9050fa 100644
--- a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
index c8246e15a7..c8246e15a7 100644
--- a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
index 267bed176c..267bed176c 100644
--- a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
index 1071583264..1071583264 100644
--- a/tags/java/sca/1.0/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/README b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/README
index ffa061460b..ffa061460b 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/README
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/README
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/build.xml b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/build.xml
index 38f1b7549d..38f1b7549d 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/build.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
index bd2bba41db..bd2bba41db 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
index 333ad53e0a..333ad53e0a 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/pom.xml b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/pom.xml
index 0921227cfc..0921227cfc 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/pom.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
index 236dd3ba75..236dd3ba75 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
index 38d62e16c8..38d62e16c8 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
index c0259c6e07..c0259c6e07 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
index 27cef47677..27cef47677 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
index 4e20ca13b7..4e20ca13b7 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
index c9bfb3537e..c9bfb3537e 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
index 3a4b43222d..3a4b43222d 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
index 32ad8325e9..32ad8325e9 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
index 848c41d1c7..848c41d1c7 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
index 21f2166560..21f2166560 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference/README b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/README
index 8ee8dd7ff5..8ee8dd7ff5 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference/README
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/README
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference/build.xml b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/build.xml
index 71ee66b31e..71ee66b31e 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/build.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference/helloworld-ws-reference.png b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference/helloworld-ws-reference.png
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/helloworld-ws-reference.png
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference/helloworld-ws-reference.svg b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/helloworld-ws-reference.svg
index 354ffbae8f..354ffbae8f 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference/helloworld-ws-reference.svg
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/helloworld-ws-reference.svg
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference/pom.xml b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/pom.xml
index 9c99e10323..9c99e10323 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/pom.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
index 4559b282fe..4559b282fe 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
index db0c947cf7..db0c947cf7 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
index 0dee19550b..0dee19550b 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
index 899ad5ce35..899ad5ce35 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference/src/main/resources/logging.properties b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference/src/main/resources/logging.properties
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/src/main/resources/logging.properties
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
index 1e468bc9ca..1e468bc9ca 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
index 7ce89179c2..7ce89179c2 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
index 4b0c40dafd..4b0c40dafd 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/README b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/README
index 92fd1d2875..92fd1d2875 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/README
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/README
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/build.xml b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/build.xml
index 8864f49f2e..8864f49f2e 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/build.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/pom.xml b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/pom.xml
index a1049ce5bb..a1049ce5bb 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/pom.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
index eb82418516..eb82418516 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
index fea4e2a16c..fea4e2a16c 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
index 3d6576aca0..3d6576aca0 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
index 34396b1b02..34396b1b02 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
index a82e040a67..a82e040a67 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
index a0b7c37cd9..a0b7c37cd9 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
index 4657c6cdc1..4657c6cdc1 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 6f241cc90c..6f241cc90c 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
index c4f08cf89b..c4f08cf89b 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo/README b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/README
index be947b1923..be947b1923 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo/README
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/README
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo/build.xml b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/build.xml
index 401315d424..401315d424 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/build.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo/helloworld-ws-sdo.png b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
index bd2bba41db..bd2bba41db 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
index 333ad53e0a..333ad53e0a 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo/pom.xml b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/pom.xml
index 971cfbb63e..971cfbb63e 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/pom.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
index de4795ceaf..de4795ceaf 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
index c950f7df04..c950f7df04 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
index 367c5b4a12..367c5b4a12 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
index 711eef63b5..711eef63b5 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
index c255df2897..c255df2897 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
index d4fba548d5..d4fba548d5 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/main/resources/logging.properties b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/main/resources/logging.properties
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/main/resources/logging.properties
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
index 2ecc0bea43..2ecc0bea43 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
index 11564c370f..11564c370f 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
index 4b0c40dafd..4b0c40dafd 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/README b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/README
index bd7643d47d..bd7643d47d 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/README
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/README
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/build.xml b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/build.xml
index 29bbae0173..29bbae0173 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/build.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
index 6f7d9dd450..6f7d9dd450 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
index 53eb552923..53eb552923 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/pom.xml b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/pom.xml
index dcf67d57ea..dcf67d57ea 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/pom.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
index 3d43290380..3d43290380 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
index 4b019b21bf..4b019b21bf 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
index 8d16deeba0..8d16deeba0 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
index 039098bbe0..039098bbe0 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
index 7b293c17cb..7b293c17cb 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
index 068229be6f..068229be6f 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
index 5d05e8d244..5d05e8d244 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service/README b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/README
index b82d5bd329..b82d5bd329 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service/README
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/README
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service/build.xml b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/build.xml
index 46678febc3..46678febc3 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/build.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service/helloworld-ws-service.png b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/helloworld-ws-service.png
index 6f7d9dd450..6f7d9dd450 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service/helloworld-ws-service.png
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/helloworld-ws-service.png
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service/helloworld-ws-service.svg b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/helloworld-ws-service.svg
index 3305faeed8..3305faeed8 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service/helloworld-ws-service.svg
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/helloworld-ws-service.svg
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service/pom.xml b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/pom.xml
index 358c2a930a..358c2a930a 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/pom.xml
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
index 7245513b2a..7245513b2a 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service/src/main/resources/helloworldws.composite b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/src/main/resources/helloworldws.composite
index a9c1bfabb1..a9c1bfabb1 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/src/main/resources/helloworldws.composite
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
index 454763410c..454763410c 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
diff --git a/tags/java/sca/1.0/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
index 99c1f4d799..99c1f4d799 100644
--- a/tags/java/sca/1.0/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
diff --git a/tags/java/sca/1.0/samples/implementation-composite/README b/sca-java-1.x/tags/1.0/samples/implementation-composite/README
index 27de00e8ef..27de00e8ef 100644
--- a/tags/java/sca/1.0/samples/implementation-composite/README
+++ b/sca-java-1.x/tags/1.0/samples/implementation-composite/README
diff --git a/tags/java/sca/1.0/samples/implementation-composite/build.xml b/sca-java-1.x/tags/1.0/samples/implementation-composite/build.xml
index 7aa31aab8b..7aa31aab8b 100644
--- a/tags/java/sca/1.0/samples/implementation-composite/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/implementation-composite/build.xml
diff --git a/tags/java/sca/1.0/samples/implementation-composite/implementation-composite.png b/sca-java-1.x/tags/1.0/samples/implementation-composite/implementation-composite.png
index 4c6d71bc03..4c6d71bc03 100644
--- a/tags/java/sca/1.0/samples/implementation-composite/implementation-composite.png
+++ b/sca-java-1.x/tags/1.0/samples/implementation-composite/implementation-composite.png
diff --git a/tags/java/sca/1.0/samples/implementation-composite/implementation-composite.svg b/sca-java-1.x/tags/1.0/samples/implementation-composite/implementation-composite.svg
index 0e60354aab..0e60354aab 100644
--- a/tags/java/sca/1.0/samples/implementation-composite/implementation-composite.svg
+++ b/sca-java-1.x/tags/1.0/samples/implementation-composite/implementation-composite.svg
diff --git a/tags/java/sca/1.0/samples/implementation-composite/pom.xml b/sca-java-1.x/tags/1.0/samples/implementation-composite/pom.xml
index d802c5ea25..d802c5ea25 100644
--- a/tags/java/sca/1.0/samples/implementation-composite/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/implementation-composite/pom.xml
diff --git a/tags/java/sca/1.0/samples/implementation-composite/src/main/java/composite/CompositeClient.java b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/main/java/composite/CompositeClient.java
index bf743e1797..bf743e1797 100644
--- a/tags/java/sca/1.0/samples/implementation-composite/src/main/java/composite/CompositeClient.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/main/java/composite/CompositeClient.java
diff --git a/tags/java/sca/1.0/samples/implementation-composite/src/main/java/composite/Source.java b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/main/java/composite/Source.java
index d0efcc1df1..d0efcc1df1 100644
--- a/tags/java/sca/1.0/samples/implementation-composite/src/main/java/composite/Source.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/main/java/composite/Source.java
diff --git a/tags/java/sca/1.0/samples/implementation-composite/src/main/java/composite/SourceCallback.java b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/main/java/composite/SourceCallback.java
index baa95a8e39..baa95a8e39 100644
--- a/tags/java/sca/1.0/samples/implementation-composite/src/main/java/composite/SourceCallback.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/main/java/composite/SourceCallback.java
diff --git a/tags/java/sca/1.0/samples/implementation-composite/src/main/java/composite/SourceImpl.java b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/main/java/composite/SourceImpl.java
index b9a0c7ff74..b9a0c7ff74 100644
--- a/tags/java/sca/1.0/samples/implementation-composite/src/main/java/composite/SourceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/main/java/composite/SourceImpl.java
diff --git a/tags/java/sca/1.0/samples/implementation-composite/src/main/java/composite/Target.java b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/main/java/composite/Target.java
index 9a8f68a7fa..9a8f68a7fa 100644
--- a/tags/java/sca/1.0/samples/implementation-composite/src/main/java/composite/Target.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/main/java/composite/Target.java
diff --git a/tags/java/sca/1.0/samples/implementation-composite/src/main/java/composite/TargetImpl.java b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/main/java/composite/TargetImpl.java
index 86686e9233..86686e9233 100644
--- a/tags/java/sca/1.0/samples/implementation-composite/src/main/java/composite/TargetImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/main/java/composite/TargetImpl.java
diff --git a/tags/java/sca/1.0/samples/implementation-composite/src/main/resources/InnerComposite.composite b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/main/resources/InnerComposite.composite
index 3376ac8ff5..3376ac8ff5 100644
--- a/tags/java/sca/1.0/samples/implementation-composite/src/main/resources/InnerComposite.composite
+++ b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/main/resources/InnerComposite.composite
diff --git a/tags/java/sca/1.0/samples/implementation-composite/src/main/resources/InnerComposite2.composite b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/main/resources/InnerComposite2.composite
index c9eff4fa9d..c9eff4fa9d 100644
--- a/tags/java/sca/1.0/samples/implementation-composite/src/main/resources/InnerComposite2.composite
+++ b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/main/resources/InnerComposite2.composite
diff --git a/tags/java/sca/1.0/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
index e675fd3624..e675fd3624 100644
--- a/tags/java/sca/1.0/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/1.0/samples/implementation-composite/src/main/resources/OuterComposite.composite b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/main/resources/OuterComposite.composite
index cb1c1e13d4..cb1c1e13d4 100644
--- a/tags/java/sca/1.0/samples/implementation-composite/src/main/resources/OuterComposite.composite
+++ b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/main/resources/OuterComposite.composite
diff --git a/tags/java/sca/1.0/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
index 9e9a4b44a4..9e9a4b44a4 100644
--- a/tags/java/sca/1.0/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
diff --git a/tags/java/sca/1.0/samples/implementation-crud-extension/README b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/README
index 5e8190648f..5e8190648f 100644
--- a/tags/java/sca/1.0/samples/implementation-crud-extension/README
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/README
diff --git a/tags/java/sca/1.0/samples/implementation-crud-extension/build.xml b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/build.xml
index 88d308e6fc..88d308e6fc 100644
--- a/tags/java/sca/1.0/samples/implementation-crud-extension/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/build.xml
diff --git a/tags/java/sca/1.0/samples/implementation-crud-extension/pom.xml b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/pom.xml
index fed04acec0..fed04acec0 100644
--- a/tags/java/sca/1.0/samples/implementation-crud-extension/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/pom.xml
diff --git a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/java/crud/CRUD.java b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
index b23d85887b..b23d85887b 100644
--- a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
diff --git a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
index 5cb2bd2b1c..5cb2bd2b1c 100644
--- a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
diff --git a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
index fa83c63c1b..fa83c63c1b 100644
--- a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
diff --git a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
index cc0795a735..cc0795a735 100644
--- a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
diff --git a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
index 7f9f8da674..7f9f8da674 100644
--- a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
diff --git a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
index 383a035e69..383a035e69 100644
--- a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
diff --git a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
index f37d9f0c1d..f37d9f0c1d 100644
--- a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
diff --git a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
index 450bc8a928..450bc8a928 100644
--- a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
diff --git a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
index d0166d649b..d0166d649b 100644
--- a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
diff --git a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
index 3cf5de5fa1..3cf5de5fa1 100644
--- a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
diff --git a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 17c98cf706..17c98cf706 100644
--- a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 6ce605197a..6ce605197a 100644
--- a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
index 447e31bf93..447e31bf93 100644
--- a/tags/java/sca/1.0/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
diff --git a/tags/java/sca/1.0/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
index 999ec4bdb6..999ec4bdb6 100644
--- a/tags/java/sca/1.0/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
diff --git a/tags/java/sca/1.0/samples/implementation-crud-extension/src/test/resources/crud.composite b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/test/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/tags/java/sca/1.0/samples/implementation-crud-extension/src/test/resources/crud.composite
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud-extension/src/test/resources/crud.composite
diff --git a/tags/java/sca/1.0/samples/implementation-crud/README b/sca-java-1.x/tags/1.0/samples/implementation-crud/README
index 50da631c04..50da631c04 100644
--- a/tags/java/sca/1.0/samples/implementation-crud/README
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud/README
diff --git a/tags/java/sca/1.0/samples/implementation-crud/build.xml b/sca-java-1.x/tags/1.0/samples/implementation-crud/build.xml
index 10b26b5a94..10b26b5a94 100644
--- a/tags/java/sca/1.0/samples/implementation-crud/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud/build.xml
diff --git a/tags/java/sca/1.0/samples/implementation-crud/implementation-crud.png b/sca-java-1.x/tags/1.0/samples/implementation-crud/implementation-crud.png
index a292037e7a..a292037e7a 100644
--- a/tags/java/sca/1.0/samples/implementation-crud/implementation-crud.png
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud/implementation-crud.png
diff --git a/tags/java/sca/1.0/samples/implementation-crud/implementation-crud.svg b/sca-java-1.x/tags/1.0/samples/implementation-crud/implementation-crud.svg
index dbb37be208..dbb37be208 100644
--- a/tags/java/sca/1.0/samples/implementation-crud/implementation-crud.svg
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud/implementation-crud.svg
diff --git a/tags/java/sca/1.0/samples/implementation-crud/pom.xml b/sca-java-1.x/tags/1.0/samples/implementation-crud/pom.xml
index fb153adf28..fb153adf28 100644
--- a/tags/java/sca/1.0/samples/implementation-crud/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud/pom.xml
diff --git a/tags/java/sca/1.0/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java b/sca-java-1.x/tags/1.0/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
index e349f30fb9..e349f30fb9 100644
--- a/tags/java/sca/1.0/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
diff --git a/tags/java/sca/1.0/samples/implementation-crud/src/main/resources/crud.composite b/sca-java-1.x/tags/1.0/samples/implementation-crud/src/main/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/tags/java/sca/1.0/samples/implementation-crud/src/main/resources/crud.composite
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud/src/main/resources/crud.composite
diff --git a/tags/java/sca/1.0/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java b/sca-java-1.x/tags/1.0/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
index 171ddbaed3..171ddbaed3 100644
--- a/tags/java/sca/1.0/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
diff --git a/tags/java/sca/1.0/samples/implementation-notification/README b/sca-java-1.x/tags/1.0/samples/implementation-notification/README
index 9a3e74a3a2..9a3e74a3a2 100644
--- a/tags/java/sca/1.0/samples/implementation-notification/README
+++ b/sca-java-1.x/tags/1.0/samples/implementation-notification/README
diff --git a/tags/java/sca/1.0/samples/implementation-notification/implementation-notification.png b/sca-java-1.x/tags/1.0/samples/implementation-notification/implementation-notification.png
index 0b7ee34bf7..0b7ee34bf7 100644
--- a/tags/java/sca/1.0/samples/implementation-notification/implementation-notification.png
+++ b/sca-java-1.x/tags/1.0/samples/implementation-notification/implementation-notification.png
diff --git a/tags/java/sca/1.0/samples/implementation-notification/pom.xml b/sca-java-1.x/tags/1.0/samples/implementation-notification/pom.xml
index 9270a9ae95..9270a9ae95 100644
--- a/tags/java/sca/1.0/samples/implementation-notification/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/implementation-notification/pom.xml
diff --git a/tags/java/sca/1.0/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java b/sca-java-1.x/tags/1.0/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
index bf8c72e0ce..bf8c72e0ce 100644
--- a/tags/java/sca/1.0/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
diff --git a/tags/java/sca/1.0/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java b/sca-java-1.x/tags/1.0/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
index 7bbfda2122..7bbfda2122 100644
--- a/tags/java/sca/1.0/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
diff --git a/tags/java/sca/1.0/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java b/sca-java-1.x/tags/1.0/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
index 2aaae596be..2aaae596be 100644
--- a/tags/java/sca/1.0/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
diff --git a/tags/java/sca/1.0/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java b/sca-java-1.x/tags/1.0/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
index a0bb02e846..a0bb02e846 100644
--- a/tags/java/sca/1.0/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
diff --git a/tags/java/sca/1.0/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java b/sca-java-1.x/tags/1.0/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
index 719141c94b..719141c94b 100644
--- a/tags/java/sca/1.0/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
diff --git a/tags/java/sca/1.0/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/tags/1.0/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
index 873e200613..873e200613 100644
--- a/tags/java/sca/1.0/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-1.x/tags/1.0/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
diff --git a/tags/java/sca/1.0/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/tags/1.0/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
index bbf2281352..bbf2281352 100644
--- a/tags/java/sca/1.0/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-1.x/tags/1.0/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
diff --git a/tags/java/sca/1.0/samples/implementation-pojo-extension/README b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/README
index 3b201779e1..3b201779e1 100644
--- a/tags/java/sca/1.0/samples/implementation-pojo-extension/README
+++ b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/README
diff --git a/tags/java/sca/1.0/samples/implementation-pojo-extension/build.xml b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/build.xml
index 78bae79859..78bae79859 100644
--- a/tags/java/sca/1.0/samples/implementation-pojo-extension/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/build.xml
diff --git a/tags/java/sca/1.0/samples/implementation-pojo-extension/pom.xml b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/pom.xml
index e2000801e4..e2000801e4 100644
--- a/tags/java/sca/1.0/samples/implementation-pojo-extension/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/pom.xml
diff --git a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
index 7c2f5d236f..7c2f5d236f 100644
--- a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
diff --git a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
index bbcfb3d0dc..bbcfb3d0dc 100644
--- a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
diff --git a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
index 0dad270a6c..0dad270a6c 100644
--- a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
diff --git a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
index b5682673f6..b5682673f6 100644
--- a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
diff --git a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
index d388fae6d3..d388fae6d3 100644
--- a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
diff --git a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
index dbe956b8c6..dbe956b8c6 100644
--- a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
diff --git a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
index dd96a18cbb..dd96a18cbb 100644
--- a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
diff --git a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
index ce135b64cf..ce135b64cf 100644
--- a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
diff --git a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 8337e81c5f..8337e81c5f 100644
--- a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index b30ea3b9cf..b30ea3b9cf 100644
--- a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
index 075af98240..075af98240 100644
--- a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
+++ b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
diff --git a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
index c9d170770b..c9d170770b 100644
--- a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
+++ b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
diff --git a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
index cc32929f09..cc32929f09 100644
--- a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
diff --git a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
index 0580e30aba..0580e30aba 100644
--- a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
index 69ab1f567e..69ab1f567e 100644
--- a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
diff --git a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
index b2a676be49..b2a676be49 100644
--- a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
index a92c5ab8db..a92c5ab8db 100644
--- a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
+++ b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
diff --git a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
index c38094dfc9..c38094dfc9 100644
--- a/tags/java/sca/1.0/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-1.x/tags/1.0/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
diff --git a/tags/java/sca/1.0/samples/loanapplication/pom.xml b/sca-java-1.x/tags/1.0/samples/loanapplication/pom.xml
index d6c7345c48..d6c7345c48 100644
--- a/tags/java/sca/1.0/samples/loanapplication/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/loanapplication/pom.xml
diff --git a/tags/java/sca/1.0/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java b/sca-java-1.x/tags/1.0/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
index 4fedb70782..4fedb70782 100644
--- a/tags/java/sca/1.0/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
+++ b/sca-java-1.x/tags/1.0/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
diff --git a/tags/java/sca/1.0/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java b/sca-java-1.x/tags/1.0/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
index 5183ece867..5183ece867 100644
--- a/tags/java/sca/1.0/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
+++ b/sca-java-1.x/tags/1.0/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
diff --git a/tags/java/sca/1.0/samples/loanapplication/src/main/java/loanapplication/LoanClient.java b/sca-java-1.x/tags/1.0/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
index 7e4438bbff..7e4438bbff 100644
--- a/tags/java/sca/1.0/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
+++ b/sca-java-1.x/tags/1.0/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
diff --git a/tags/java/sca/1.0/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java b/sca-java-1.x/tags/1.0/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
index b06d9465a2..b06d9465a2 100644
--- a/tags/java/sca/1.0/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
diff --git a/tags/java/sca/1.0/samples/loanapplication/src/main/java/loanapplication/LoanService.java b/sca-java-1.x/tags/1.0/samples/loanapplication/src/main/java/loanapplication/LoanService.java
index 9dfd8b42fe..9dfd8b42fe 100644
--- a/tags/java/sca/1.0/samples/loanapplication/src/main/java/loanapplication/LoanService.java
+++ b/sca-java-1.x/tags/1.0/samples/loanapplication/src/main/java/loanapplication/LoanService.java
diff --git a/tags/java/sca/1.0/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java b/sca-java-1.x/tags/1.0/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
index 76a53323bd..76a53323bd 100644
--- a/tags/java/sca/1.0/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/loanapplication/src/main/resources/loanapplication.composite b/sca-java-1.x/tags/1.0/samples/loanapplication/src/main/resources/loanapplication.composite
index 3aa8d030b7..3aa8d030b7 100644
--- a/tags/java/sca/1.0/samples/loanapplication/src/main/resources/loanapplication.composite
+++ b/sca-java-1.x/tags/1.0/samples/loanapplication/src/main/resources/loanapplication.composite
diff --git a/tags/java/sca/1.0/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java b/sca-java-1.x/tags/1.0/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
index e88e48a53a..e88e48a53a 100644
--- a/tags/java/sca/1.0/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/README b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/README
index 2ede760e24..2ede760e24 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/README
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/README
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/build-bundles.xml b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/build-bundles.xml
index 7a31e6016b..7a31e6016b 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/build-bundles.xml
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/build-bundles.xml
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/build.xml b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/build.xml
index cf08cf5a15..cf08cf5a15 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/build.xml
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/pom.xml b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/pom.xml
index cc1c4c7cf9..cc1c4c7cf9 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/pom.xml
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
index 5f40054ada..5f40054ada 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
index 64814487cb..64814487cb 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
index 225dce0236..225dce0236 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 023d716651..023d716651 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a1c7fce60a..a1c7fce60a 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 4647a716c7..4647a716c7 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index d0d29f94f8..d0d29f94f8 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index 1b7fb15bf1..1b7fb15bf1 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e97331c06c..e97331c06c 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 4206ce7dc8..4206ce7dc8 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index 0f88cca213..0f88cca213 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index f55a068ede..f55a068ede 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index 72eec76cc2..72eec76cc2 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 600f3f0c74..600f3f0c74 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index b8bca97bd0..b8bca97bd0 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/Customer.componentType b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/Customer.componentType
index 5c61a0961c..5c61a0961c 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/Customer.componentType
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/Customer.componentType
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
index 87a184d968..87a184d968 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
index 872ab6601a..872ab6601a 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/DSShipper.componentType b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
index 57fcbbc5d1..57fcbbc5d1 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
index 75fa8029f7..75fa8029f7 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/META-INF/LICENSE.txt
index 0084319535..0084319535 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/META-INF/LICENSE.txt
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/META-INF/NOTICE b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/META-INF/NOTICE
index d83ebbe236..d83ebbe236 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/META-INF/NOTICE
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/META-INF/README.txt b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/META-INF/README.txt
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/Retailer.componentType b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/Retailer.componentType
index 15185f2bf9..15185f2bf9 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/Retailer.componentType
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/Retailer.componentType
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/Shipper.componentType b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/Shipper.componentType
index 675597d80b..675597d80b 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/Shipper.componentType
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/Shipper.componentType
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/Warehouse.componentType b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
index 6e1ac3e5a9..6e1ac3e5a9 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
index 88d79e5219..88d79e5219 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
index d95ef5d582..d95ef5d582 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
index de7ac7ec7a..de7ac7ec7a 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
index 21241a6899..21241a6899 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
index b5c5a862be..b5c5a862be 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
index 5b368afd5b..5b368afd5b 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
index 47897d16ca..47897d16ca 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
index cae7fdfde2..cae7fdfde2 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
index f5333c7caa..f5333c7caa 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
index d894309b71..d894309b71 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
index 6166549e5a..6166549e5a 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
index fc86a76784..fc86a76784 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/supplychain.composite b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/supplychain.composite
index 5a309a2778..5a309a2778 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/supplychain.composite
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/supplychain.composite
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
index 1a83420810..1a83420810 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
index ff15c0d9a2..ff15c0d9a2 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/tags/java/sca/1.0/samples/osgi-supplychain/supplychain.svg b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/supplychain.svg
index 128cbaf659..128cbaf659 100644
--- a/tags/java/sca/1.0/samples/osgi-supplychain/supplychain.svg
+++ b/sca-java-1.x/tags/1.0/samples/osgi-supplychain/supplychain.svg
diff --git a/tags/java/sca/1.0/samples/pom.xml b/sca-java-1.x/tags/1.0/samples/pom.xml
index b28989fabf..b28989fabf 100644
--- a/tags/java/sca/1.0/samples/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/pom.xml
diff --git a/tags/java/sca/1.0/samples/quote-xquery/README b/sca-java-1.x/tags/1.0/samples/quote-xquery/README
index 9c644dd48a..9c644dd48a 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/README
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/README
diff --git a/tags/java/sca/1.0/samples/quote-xquery/build.xml b/sca-java-1.x/tags/1.0/samples/quote-xquery/build.xml
index 2fe6b68c8c..2fe6b68c8c 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/build.xml
diff --git a/tags/java/sca/1.0/samples/quote-xquery/pom.xml b/sca-java-1.x/tags/1.0/samples/quote-xquery/pom.xml
index 9ff0093e03..9ff0093e03 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/pom.xml
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
index 8a42136b5d..8a42136b5d 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
index 41d78683cc..41d78683cc 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
index f744a59744..f744a59744 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
index 374c0825e9..374c0825e9 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
index fbe38b8269..fbe38b8269 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
index d2d175430b..d2d175430b 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
index 06c3945a6e..06c3945a6e 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
index 4ab64dd558..4ab64dd558 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
index 85508eaa46..85508eaa46 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
index 26331381a8..26331381a8 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
index 6144dcc17f..6144dcc17f 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
index 43b2d41a5d..43b2d41a5d 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
index cfd201f883..cfd201f883 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
index 20fe73fd92..20fe73fd92 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
index 98dd96ffaf..98dd96ffaf 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
index d02190ab94..d02190ab94 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
index c66256a2fe..c66256a2fe 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
index c150a4e1dd..c150a4e1dd 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
index 5f5191d63f..5f5191d63f 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
index e7f3e67068..e7f3e67068 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
index 4c437586ef..4c437586ef 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
index 4f64850056..4f64850056 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
index 96c2af138a..96c2af138a 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/resources/xqueryquotews.composite b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/resources/xqueryquotews.composite
index cce6a728cc..cce6a728cc 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/resources/xqueryquotews.composite
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/resources/xqueryquotews.composite
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
index f078b9ee9f..f078b9ee9f 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
index 9555532b3e..9555532b3e 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
diff --git a/tags/java/sca/1.0/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
index 9a4be5bda6..9a4be5bda6 100644
--- a/tags/java/sca/1.0/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
+++ b/sca-java-1.x/tags/1.0/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank-spring/README b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/README
index 900a006141..900a006141 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank-spring/README
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/README
diff --git a/tags/java/sca/1.0/samples/simple-bigbank-spring/build.xml b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/build.xml
index ecc2596d71..ecc2596d71 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank-spring/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/build.xml
diff --git a/tags/java/sca/1.0/samples/simple-bigbank-spring/pom.xml b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/pom.xml
index 9c33c10049..9c33c10049 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank-spring/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/pom.xml
diff --git a/tags/java/sca/1.0/samples/simple-bigbank-spring/simple-bigbank-spring.png b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/simple-bigbank-spring.png
index 593c047f6a..593c047f6a 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank-spring/simple-bigbank-spring.png
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/simple-bigbank-spring.png
diff --git a/tags/java/sca/1.0/samples/simple-bigbank-spring/simple-bigbank-spring.svg b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/simple-bigbank-spring.svg
index c64f6de6b9..c64f6de6b9 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank-spring/simple-bigbank-spring.svg
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/simple-bigbank-spring.svg
diff --git a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
index 1625ff5b65..1625ff5b65 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
index 7c9082b944..7c9082b944 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
index ae9071445d..ae9071445d 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java
index a5ae7b3955..a5ae7b3955 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.java
index c354de387b..c354de387b 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
index 000acb935c..000acb935c 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.java
index 11bdff757e..11bdff757e 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.java
index b791024076..b791024076 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.java
index 86246a3f84..86246a3f84 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
index edbf910d37..edbf910d37 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 0512d40b0b..0512d40b0b 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
index 2d97b57066..2d97b57066 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml
index 2d882472fb..2d882472fb 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml
diff --git a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/resources/BigBank.composite b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
index 29d4a2d5a3..29d4a2d5a3 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
diff --git a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite
index 26bdc59075..26bdc59075 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite
diff --git a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
index ba6c1dd797..ba6c1dd797 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank/README b/sca-java-1.x/tags/1.0/samples/simple-bigbank/README
index acbe93a4d3..acbe93a4d3 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank/README
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank/README
diff --git a/tags/java/sca/1.0/samples/simple-bigbank/build.xml b/sca-java-1.x/tags/1.0/samples/simple-bigbank/build.xml
index a814014eae..a814014eae 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank/build.xml
diff --git a/tags/java/sca/1.0/samples/simple-bigbank/pom.xml b/sca-java-1.x/tags/1.0/samples/simple-bigbank/pom.xml
index 8f676fa0f4..8f676fa0f4 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank/pom.xml
diff --git a/tags/java/sca/1.0/samples/simple-bigbank/simple-bigbank.png b/sca-java-1.x/tags/1.0/samples/simple-bigbank/simple-bigbank.png
index 593c047f6a..593c047f6a 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank/simple-bigbank.png
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank/simple-bigbank.png
diff --git a/tags/java/sca/1.0/samples/simple-bigbank/simple-bigbank.svg b/sca-java-1.x/tags/1.0/samples/simple-bigbank/simple-bigbank.svg
index c64f6de6b9..c64f6de6b9 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank/simple-bigbank.svg
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank/simple-bigbank.svg
diff --git a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
index 1625ff5b65..1625ff5b65 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
index 7c9082b944..7c9082b944 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
index fa85f309c0..fa85f309c0 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
index a5ae7b3955..a5ae7b3955 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
index c354de387b..c354de387b 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
index 000acb935c..000acb935c 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
index 11bdff757e..11bdff757e 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
index b791024076..b791024076 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
index 86246a3f84..86246a3f84 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
index edbf910d37..edbf910d37 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 0512d40b0b..0512d40b0b 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
index 7961279352..7961279352 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/tags/java/sca/1.0/samples/simple-bigbank/src/main/resources/Account.composite b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/resources/Account.composite
index e71615e27e..e71615e27e 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank/src/main/resources/Account.composite
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/resources/Account.composite
diff --git a/tags/java/sca/1.0/samples/simple-bigbank/src/main/resources/BigBank.composite b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/resources/BigBank.composite
index c870f39cab..c870f39cab 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank/src/main/resources/BigBank.composite
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/resources/BigBank.composite
diff --git a/tags/java/sca/1.0/samples/simple-bigbank/src/main/resources/StockQuote.composite b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/resources/StockQuote.composite
index 4f29c14851..4f29c14851 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank/src/main/resources/StockQuote.composite
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/main/resources/StockQuote.composite
diff --git a/tags/java/sca/1.0/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
index ba6c1dd797..ba6c1dd797 100644
--- a/tags/java/sca/1.0/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
diff --git a/tags/java/sca/1.0/samples/simple-callback-ws/README b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/README
index 85cd90afef..85cd90afef 100644
--- a/tags/java/sca/1.0/samples/simple-callback-ws/README
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/README
diff --git a/tags/java/sca/1.0/samples/simple-callback-ws/build.xml b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/build.xml
index 10b69bd395..10b69bd395 100644
--- a/tags/java/sca/1.0/samples/simple-callback-ws/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/build.xml
diff --git a/tags/java/sca/1.0/samples/simple-callback-ws/pom.xml b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/pom.xml
index 336503f96d..336503f96d 100644
--- a/tags/java/sca/1.0/samples/simple-callback-ws/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/pom.xml
diff --git a/tags/java/sca/1.0/samples/simple-callback-ws/simple-callback-ws.png b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/simple-callback-ws.png
index 1b6353f5cf..1b6353f5cf 100644
--- a/tags/java/sca/1.0/samples/simple-callback-ws/simple-callback-ws.png
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/simple-callback-ws.png
diff --git a/tags/java/sca/1.0/samples/simple-callback-ws/simple-callback-ws.svg b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/simple-callback-ws.svg
index 7d9e3de510..7d9e3de510 100644
--- a/tags/java/sca/1.0/samples/simple-callback-ws/simple-callback-ws.svg
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/simple-callback-ws.svg
diff --git a/tags/java/sca/1.0/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
index 4cc00d6d0f..4cc00d6d0f 100644
--- a/tags/java/sca/1.0/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
diff --git a/tags/java/sca/1.0/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
index b9479324ec..b9479324ec 100644
--- a/tags/java/sca/1.0/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
diff --git a/tags/java/sca/1.0/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
index 48acc0e94f..48acc0e94f 100644
--- a/tags/java/sca/1.0/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
diff --git a/tags/java/sca/1.0/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
index 66cfb2bc8a..66cfb2bc8a 100644
--- a/tags/java/sca/1.0/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/tags/java/sca/1.0/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
index 3817eb15b0..3817eb15b0 100644
--- a/tags/java/sca/1.0/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
index eeb0e52163..eeb0e52163 100644
--- a/tags/java/sca/1.0/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/tags/java/sca/1.0/samples/simple-callback-ws/src/main/resources/simplecallback.composite b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/src/main/resources/simplecallback.composite
index 0233dfc81c..0233dfc81c 100644
--- a/tags/java/sca/1.0/samples/simple-callback-ws/src/main/resources/simplecallback.composite
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/src/main/resources/simplecallback.composite
diff --git a/tags/java/sca/1.0/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
index 243737dd70..243737dd70 100644
--- a/tags/java/sca/1.0/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
diff --git a/tags/java/sca/1.0/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
index 580a7f6b0c..580a7f6b0c 100644
--- a/tags/java/sca/1.0/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/tags/java/sca/1.0/samples/simple-callback/README b/sca-java-1.x/tags/1.0/samples/simple-callback/README
index 719376f254..719376f254 100644
--- a/tags/java/sca/1.0/samples/simple-callback/README
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback/README
diff --git a/tags/java/sca/1.0/samples/simple-callback/build.xml b/sca-java-1.x/tags/1.0/samples/simple-callback/build.xml
index 47d1ea4bc1..47d1ea4bc1 100644
--- a/tags/java/sca/1.0/samples/simple-callback/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback/build.xml
diff --git a/tags/java/sca/1.0/samples/simple-callback/pom.xml b/sca-java-1.x/tags/1.0/samples/simple-callback/pom.xml
index ebd640864c..ebd640864c 100644
--- a/tags/java/sca/1.0/samples/simple-callback/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback/pom.xml
diff --git a/tags/java/sca/1.0/samples/simple-callback/simple-callback.png b/sca-java-1.x/tags/1.0/samples/simple-callback/simple-callback.png
index 1b6353f5cf..1b6353f5cf 100644
--- a/tags/java/sca/1.0/samples/simple-callback/simple-callback.png
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback/simple-callback.png
diff --git a/tags/java/sca/1.0/samples/simple-callback/simple-callback.svg b/sca-java-1.x/tags/1.0/samples/simple-callback/simple-callback.svg
index 484b65df9d..484b65df9d 100644
--- a/tags/java/sca/1.0/samples/simple-callback/simple-callback.svg
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback/simple-callback.svg
diff --git a/tags/java/sca/1.0/samples/simple-callback/src/main/java/simplecallback/MyClient.java b/sca-java-1.x/tags/1.0/samples/simple-callback/src/main/java/simplecallback/MyClient.java
index 4cc00d6d0f..4cc00d6d0f 100644
--- a/tags/java/sca/1.0/samples/simple-callback/src/main/java/simplecallback/MyClient.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback/src/main/java/simplecallback/MyClient.java
diff --git a/tags/java/sca/1.0/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java b/sca-java-1.x/tags/1.0/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
index 3e2a1df5a5..3e2a1df5a5 100644
--- a/tags/java/sca/1.0/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
diff --git a/tags/java/sca/1.0/samples/simple-callback/src/main/java/simplecallback/MyService.java b/sca-java-1.x/tags/1.0/samples/simple-callback/src/main/java/simplecallback/MyService.java
index e78ad6f68f..e78ad6f68f 100644
--- a/tags/java/sca/1.0/samples/simple-callback/src/main/java/simplecallback/MyService.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback/src/main/java/simplecallback/MyService.java
diff --git a/tags/java/sca/1.0/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java b/sca-java-1.x/tags/1.0/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
index b27eea44f5..b27eea44f5 100644
--- a/tags/java/sca/1.0/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/tags/java/sca/1.0/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java b/sca-java-1.x/tags/1.0/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
index fc5e31d14e..fc5e31d14e 100644
--- a/tags/java/sca/1.0/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/tags/java/sca/1.0/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java b/sca-java-1.x/tags/1.0/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
index b8987fcd07..b8987fcd07 100644
--- a/tags/java/sca/1.0/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/tags/java/sca/1.0/samples/simple-callback/src/main/resources/simplecallback.composite b/sca-java-1.x/tags/1.0/samples/simple-callback/src/main/resources/simplecallback.composite
index 33e6f60601..33e6f60601 100644
--- a/tags/java/sca/1.0/samples/simple-callback/src/main/resources/simplecallback.composite
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback/src/main/resources/simplecallback.composite
diff --git a/tags/java/sca/1.0/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java b/sca-java-1.x/tags/1.0/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
index cbaab8af83..cbaab8af83 100644
--- a/tags/java/sca/1.0/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/tags/java/sca/1.0/samples/spi-implementation-pojo/pom.xml b/sca-java-1.x/tags/1.0/samples/spi-implementation-pojo/pom.xml
index 85ad3c25c6..85ad3c25c6 100644
--- a/tags/java/sca/1.0/samples/spi-implementation-pojo/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/spi-implementation-pojo/pom.xml
diff --git a/tags/java/sca/1.0/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java b/sca-java-1.x/tags/1.0/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
index 73104c3166..73104c3166 100644
--- a/tags/java/sca/1.0/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
+++ b/sca-java-1.x/tags/1.0/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
diff --git a/tags/java/sca/1.0/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java b/sca-java-1.x/tags/1.0/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
index 43efae32ca..43efae32ca 100644
--- a/tags/java/sca/1.0/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
+++ b/sca-java-1.x/tags/1.0/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
diff --git a/tags/java/sca/1.0/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java b/sca-java-1.x/tags/1.0/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
index d65d4c8e4a..d65d4c8e4a 100644
--- a/tags/java/sca/1.0/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
+++ b/sca-java-1.x/tags/1.0/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
diff --git a/tags/java/sca/1.0/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java b/sca-java-1.x/tags/1.0/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
index 198befa928..198befa928 100644
--- a/tags/java/sca/1.0/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
+++ b/sca-java-1.x/tags/1.0/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
diff --git a/tags/java/sca/1.0/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator b/sca-java-1.x/tags/1.0/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
index 95ee37c1aa..95ee37c1aa 100644
--- a/tags/java/sca/1.0/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
+++ b/sca-java-1.x/tags/1.0/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
diff --git a/tags/java/sca/1.0/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java b/sca-java-1.x/tags/1.0/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
index cc32929f09..cc32929f09 100644
--- a/tags/java/sca/1.0/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/tags/1.0/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
diff --git a/tags/java/sca/1.0/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/tags/1.0/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
index 02af1ccf22..02af1ccf22 100644
--- a/tags/java/sca/1.0/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/tags/java/sca/1.0/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/tags/1.0/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
index 5813fda330..5813fda330 100644
--- a/tags/java/sca/1.0/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/tags/java/sca/1.0/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite b/sca-java-1.x/tags/1.0/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
index fa9cecc160..fa9cecc160 100644
--- a/tags/java/sca/1.0/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-1.x/tags/1.0/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
diff --git a/tags/java/sca/1.0/samples/store/README b/sca-java-1.x/tags/1.0/samples/store/README
index 1cc5a40276..1cc5a40276 100644
--- a/tags/java/sca/1.0/samples/store/README
+++ b/sca-java-1.x/tags/1.0/samples/store/README
diff --git a/tags/java/sca/1.0/samples/store/build.xml b/sca-java-1.x/tags/1.0/samples/store/build.xml
index 4f96edba35..4f96edba35 100644
--- a/tags/java/sca/1.0/samples/store/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/store/build.xml
diff --git a/tags/java/sca/1.0/samples/store/getting-started-1.0.pdf b/sca-java-1.x/tags/1.0/samples/store/getting-started-1.0.pdf
index 950e4b12cd..950e4b12cd 100644
--- a/tags/java/sca/1.0/samples/store/getting-started-1.0.pdf
+++ b/sca-java-1.x/tags/1.0/samples/store/getting-started-1.0.pdf
diff --git a/tags/java/sca/1.0/samples/store/pom.xml b/sca-java-1.x/tags/1.0/samples/store/pom.xml
index 3681898429..3681898429 100644
--- a/tags/java/sca/1.0/samples/store/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/store/pom.xml
diff --git a/tags/java/sca/1.0/samples/store/src/main/java/launch/Launch.java b/sca-java-1.x/tags/1.0/samples/store/src/main/java/launch/Launch.java
index 801697abea..801697abea 100644
--- a/tags/java/sca/1.0/samples/store/src/main/java/launch/Launch.java
+++ b/sca-java-1.x/tags/1.0/samples/store/src/main/java/launch/Launch.java
diff --git a/tags/java/sca/1.0/samples/store/src/main/java/services/Catalog.java b/sca-java-1.x/tags/1.0/samples/store/src/main/java/services/Catalog.java
index 9f784b0848..9f784b0848 100644
--- a/tags/java/sca/1.0/samples/store/src/main/java/services/Catalog.java
+++ b/sca-java-1.x/tags/1.0/samples/store/src/main/java/services/Catalog.java
diff --git a/tags/java/sca/1.0/samples/store/src/main/java/services/CatalogImpl.java b/sca-java-1.x/tags/1.0/samples/store/src/main/java/services/CatalogImpl.java
index fd44c66bf6..fd44c66bf6 100644
--- a/tags/java/sca/1.0/samples/store/src/main/java/services/CatalogImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/store/src/main/java/services/CatalogImpl.java
diff --git a/tags/java/sca/1.0/samples/store/src/main/java/services/CurrencyConverter.java b/sca-java-1.x/tags/1.0/samples/store/src/main/java/services/CurrencyConverter.java
index 8b0f70907d..8b0f70907d 100644
--- a/tags/java/sca/1.0/samples/store/src/main/java/services/CurrencyConverter.java
+++ b/sca-java-1.x/tags/1.0/samples/store/src/main/java/services/CurrencyConverter.java
diff --git a/tags/java/sca/1.0/samples/store/src/main/java/services/CurrencyConverterImpl.java b/sca-java-1.x/tags/1.0/samples/store/src/main/java/services/CurrencyConverterImpl.java
index 0ae8f345ce..0ae8f345ce 100644
--- a/tags/java/sca/1.0/samples/store/src/main/java/services/CurrencyConverterImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/store/src/main/java/services/CurrencyConverterImpl.java
diff --git a/tags/java/sca/1.0/samples/store/src/main/java/services/ShoppingCartImpl.java b/sca-java-1.x/tags/1.0/samples/store/src/main/java/services/ShoppingCartImpl.java
index f3934717f8..f3934717f8 100644
--- a/tags/java/sca/1.0/samples/store/src/main/java/services/ShoppingCartImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/store/src/main/java/services/ShoppingCartImpl.java
diff --git a/tags/java/sca/1.0/samples/store/src/main/resources/store.composite b/sca-java-1.x/tags/1.0/samples/store/src/main/resources/store.composite
index 1f04cb02ed..1f04cb02ed 100644
--- a/tags/java/sca/1.0/samples/store/src/main/resources/store.composite
+++ b/sca-java-1.x/tags/1.0/samples/store/src/main/resources/store.composite
diff --git a/tags/java/sca/1.0/samples/store/src/main/resources/ufservices/binding-atom.js b/sca-java-1.x/tags/1.0/samples/store/src/main/resources/ufservices/binding-atom.js
index aacf864f14..aacf864f14 100644
--- a/tags/java/sca/1.0/samples/store/src/main/resources/ufservices/binding-atom.js
+++ b/sca-java-1.x/tags/1.0/samples/store/src/main/resources/ufservices/binding-atom.js
diff --git a/tags/java/sca/1.0/samples/store/src/main/resources/ufservices/binding-jsonrpc.js b/sca-java-1.x/tags/1.0/samples/store/src/main/resources/ufservices/binding-jsonrpc.js
index 7f4a092f71..7f4a092f71 100644
--- a/tags/java/sca/1.0/samples/store/src/main/resources/ufservices/binding-jsonrpc.js
+++ b/sca-java-1.x/tags/1.0/samples/store/src/main/resources/ufservices/binding-jsonrpc.js
diff --git a/tags/java/sca/1.0/samples/store/src/main/resources/ufservices/store.html b/sca-java-1.x/tags/1.0/samples/store/src/main/resources/ufservices/store.html
index 337588aa2c..337588aa2c 100644
--- a/tags/java/sca/1.0/samples/store/src/main/resources/ufservices/store.html
+++ b/sca-java-1.x/tags/1.0/samples/store/src/main/resources/ufservices/store.html
diff --git a/tags/java/sca/1.0/samples/supplychain/README b/sca-java-1.x/tags/1.0/samples/supplychain/README
index ea4493fdd4..ea4493fdd4 100644
--- a/tags/java/sca/1.0/samples/supplychain/README
+++ b/sca-java-1.x/tags/1.0/samples/supplychain/README
diff --git a/tags/java/sca/1.0/samples/supplychain/build.xml b/sca-java-1.x/tags/1.0/samples/supplychain/build.xml
index 506180b8b1..506180b8b1 100644
--- a/tags/java/sca/1.0/samples/supplychain/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/supplychain/build.xml
diff --git a/tags/java/sca/1.0/samples/supplychain/pom.xml b/sca-java-1.x/tags/1.0/samples/supplychain/pom.xml
index dab4ada147..dab4ada147 100644
--- a/tags/java/sca/1.0/samples/supplychain/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/supplychain/pom.xml
diff --git a/tags/java/sca/1.0/samples/supplychain/src/main/java/supplychain/Customer.java b/sca-java-1.x/tags/1.0/samples/supplychain/src/main/java/supplychain/Customer.java
index 8088001898..8088001898 100644
--- a/tags/java/sca/1.0/samples/supplychain/src/main/java/supplychain/Customer.java
+++ b/sca-java-1.x/tags/1.0/samples/supplychain/src/main/java/supplychain/Customer.java
diff --git a/tags/java/sca/1.0/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java b/sca-java-1.x/tags/1.0/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
index 7a1e8553ec..7a1e8553ec 100644
--- a/tags/java/sca/1.0/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
diff --git a/tags/java/sca/1.0/samples/supplychain/src/main/java/supplychain/Retailer.java b/sca-java-1.x/tags/1.0/samples/supplychain/src/main/java/supplychain/Retailer.java
index 1add63fb4e..1add63fb4e 100644
--- a/tags/java/sca/1.0/samples/supplychain/src/main/java/supplychain/Retailer.java
+++ b/sca-java-1.x/tags/1.0/samples/supplychain/src/main/java/supplychain/Retailer.java
diff --git a/tags/java/sca/1.0/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java b/sca-java-1.x/tags/1.0/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
index f622052cf8..f622052cf8 100644
--- a/tags/java/sca/1.0/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
diff --git a/tags/java/sca/1.0/samples/supplychain/src/main/java/supplychain/Shipper.java b/sca-java-1.x/tags/1.0/samples/supplychain/src/main/java/supplychain/Shipper.java
index d4d49a922b..d4d49a922b 100644
--- a/tags/java/sca/1.0/samples/supplychain/src/main/java/supplychain/Shipper.java
+++ b/sca-java-1.x/tags/1.0/samples/supplychain/src/main/java/supplychain/Shipper.java
diff --git a/tags/java/sca/1.0/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java b/sca-java-1.x/tags/1.0/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
index 4ae52a12a2..4ae52a12a2 100644
--- a/tags/java/sca/1.0/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
diff --git a/tags/java/sca/1.0/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java b/sca-java-1.x/tags/1.0/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
index 7072f582d1..7072f582d1 100644
--- a/tags/java/sca/1.0/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ b/sca-java-1.x/tags/1.0/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/tags/java/sca/1.0/samples/supplychain/src/main/java/supplychain/Warehouse.java b/sca-java-1.x/tags/1.0/samples/supplychain/src/main/java/supplychain/Warehouse.java
index 0be499f569..0be499f569 100644
--- a/tags/java/sca/1.0/samples/supplychain/src/main/java/supplychain/Warehouse.java
+++ b/sca-java-1.x/tags/1.0/samples/supplychain/src/main/java/supplychain/Warehouse.java
diff --git a/tags/java/sca/1.0/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java b/sca-java-1.x/tags/1.0/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
index b5e256a1e0..b5e256a1e0 100644
--- a/tags/java/sca/1.0/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
+++ b/sca-java-1.x/tags/1.0/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
diff --git a/tags/java/sca/1.0/samples/supplychain/src/main/resources/supplychain.composite b/sca-java-1.x/tags/1.0/samples/supplychain/src/main/resources/supplychain.composite
index 301efcaf1f..301efcaf1f 100644
--- a/tags/java/sca/1.0/samples/supplychain/src/main/resources/supplychain.composite
+++ b/sca-java-1.x/tags/1.0/samples/supplychain/src/main/resources/supplychain.composite
diff --git a/tags/java/sca/1.0/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/sca-java-1.x/tags/1.0/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
index 88e0eb7ab8..88e0eb7ab8 100644
--- a/tags/java/sca/1.0/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ b/sca-java-1.x/tags/1.0/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/tags/java/sca/1.0/samples/supplychain/supplychain.png b/sca-java-1.x/tags/1.0/samples/supplychain/supplychain.png
index 51a384e827..51a384e827 100644
--- a/tags/java/sca/1.0/samples/supplychain/supplychain.png
+++ b/sca-java-1.x/tags/1.0/samples/supplychain/supplychain.png
diff --git a/tags/java/sca/1.0/samples/supplychain/supplychain.svg b/sca-java-1.x/tags/1.0/samples/supplychain/supplychain.svg
index f72e77acab..f72e77acab 100644
--- a/tags/java/sca/1.0/samples/supplychain/supplychain.svg
+++ b/sca-java-1.x/tags/1.0/samples/supplychain/supplychain.svg
diff --git a/tags/java/sca/1.0/samples/web-resource/README b/sca-java-1.x/tags/1.0/samples/web-resource/README
index 36607ada4c..36607ada4c 100644
--- a/tags/java/sca/1.0/samples/web-resource/README
+++ b/sca-java-1.x/tags/1.0/samples/web-resource/README
diff --git a/tags/java/sca/1.0/samples/web-resource/build.xml b/sca-java-1.x/tags/1.0/samples/web-resource/build.xml
index 5f6b6091e7..5f6b6091e7 100644
--- a/tags/java/sca/1.0/samples/web-resource/build.xml
+++ b/sca-java-1.x/tags/1.0/samples/web-resource/build.xml
diff --git a/tags/java/sca/1.0/samples/web-resource/pom.xml b/sca-java-1.x/tags/1.0/samples/web-resource/pom.xml
index 206404d427..206404d427 100644
--- a/tags/java/sca/1.0/samples/web-resource/pom.xml
+++ b/sca-java-1.x/tags/1.0/samples/web-resource/pom.xml
diff --git a/tags/java/sca/1.0/samples/web-resource/src/main/java/web/resource/SampleServer.java b/sca-java-1.x/tags/1.0/samples/web-resource/src/main/java/web/resource/SampleServer.java
index 9410de08c4..9410de08c4 100644
--- a/tags/java/sca/1.0/samples/web-resource/src/main/java/web/resource/SampleServer.java
+++ b/sca-java-1.x/tags/1.0/samples/web-resource/src/main/java/web/resource/SampleServer.java
diff --git a/tags/java/sca/1.0/samples/web-resource/src/main/resources/WebResource.composite b/sca-java-1.x/tags/1.0/samples/web-resource/src/main/resources/WebResource.composite
index 4536136a8b..4536136a8b 100644
--- a/tags/java/sca/1.0/samples/web-resource/src/main/resources/WebResource.composite
+++ b/sca-java-1.x/tags/1.0/samples/web-resource/src/main/resources/WebResource.composite
diff --git a/tags/java/sca/1.0/samples/web-resource/src/main/resources/myContent/index.html b/sca-java-1.x/tags/1.0/samples/web-resource/src/main/resources/myContent/index.html
index 55de048373..55de048373 100644
--- a/tags/java/sca/1.0/samples/web-resource/src/main/resources/myContent/index.html
+++ b/sca-java-1.x/tags/1.0/samples/web-resource/src/main/resources/myContent/index.html