1248 files changed, 1 insertions, 1200 deletions

diff --git a/java/sca/samples/binding-echo-extension/README b/java/sca/contrib/samples/binding-echo-extension/README
index 94716b151f..94716b151f 100644
--- a/java/sca/samples/binding-echo-extension/README
+++ b/java/sca/contrib/samples/binding-echo-extension/README
diff --git a/java/sca/samples/binding-echo-extension/build.xml b/java/sca/contrib/samples/binding-echo-extension/build.xml
index 5df5981bea..5df5981bea 100644
--- a/java/sca/samples/binding-echo-extension/build.xml
+++ b/java/sca/contrib/samples/binding-echo-extension/build.xml
diff --git a/java/sca/samples/binding-echo-extension/pom.xml b/java/sca/contrib/samples/binding-echo-extension/pom.xml
index 5d5ba0865f..5d5ba0865f 100644
--- a/java/sca/samples/binding-echo-extension/pom.xml
+++ b/java/sca/contrib/samples/binding-echo-extension/pom.xml
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
index 3fe1598e0d..3fe1598e0d 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
index 0f6fee82be..0f6fee82be 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
index af759dbf93..af759dbf93 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
index 19c9271bb8..19c9271bb8 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
index 45fdb73f67..45fdb73f67 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
index 91697fcd9a..91697fcd9a 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
index 4877bade7f..4877bade7f 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
index ba74d8f99a..ba74d8f99a 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
index 0efc319af9..0efc319af9 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
index 1cd1e5af4e..1cd1e5af4e 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
index 33dc761aa4..33dc761aa4 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
index c847d088a6..c847d088a6 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
index 7d38e3b7a8..7d38e3b7a8 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
index 72b8002238..72b8002238 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
index deda8d9744..deda8d9744 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
index ffadfc7fff..ffadfc7fff 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
index 6fa5f26977..6fa5f26977 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
index cf55b36fc2..cf55b36fc2 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
index ac610cfb51..ac610cfb51 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
index fcb250b444..fcb250b444 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
index 8ea2395d04..8ea2395d04 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
index 32336dd94f..32336dd94f 100644
--- a/java/sca/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
diff --git a/java/sca/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory b/java/sca/contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
index 55be293862..55be293862 100644
--- a/java/sca/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
diff --git a/java/sca/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 06d53250c1..06d53250c1 100644
--- a/java/sca/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/java/sca/contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 4ad61f573d..4ad61f573d 100644
--- a/java/sca/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/java/sca/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/java/sca/contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index efa475ef92..efa475ef92 100644
--- a/java/sca/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/java/sca/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd b/java/sca/contrib/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
index 9b64df4871..9b64df4871 100644
--- a/java/sca/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
+++ b/java/sca/contrib/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
diff --git a/java/sca/samples/binding-echo-extension/src/test/java/echo/Echo.java b/java/sca/contrib/samples/binding-echo-extension/src/test/java/echo/Echo.java
index 1d5e973f33..1d5e973f33 100644
--- a/java/sca/samples/binding-echo-extension/src/test/java/echo/Echo.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/test/java/echo/Echo.java
diff --git a/java/sca/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java b/java/sca/contrib/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
index 01b89101a8..01b89101a8 100644
--- a/java/sca/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
diff --git a/java/sca/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java b/java/sca/contrib/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
index 7383077f18..7383077f18 100644
--- a/java/sca/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
diff --git a/java/sca/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java b/java/sca/contrib/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
index ab05516622..ab05516622 100644
--- a/java/sca/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
+++ b/java/sca/contrib/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
diff --git a/java/sca/samples/binding-echo-extension/src/test/resources/EchoBinding.composite b/java/sca/contrib/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
index 176d67cc4b..176d67cc4b 100644
--- a/java/sca/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
+++ b/java/sca/contrib/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
diff --git a/java/sca/samples/binding-echo-extension/src/test/resources/definitions.xml b/java/sca/contrib/samples/binding-echo-extension/src/test/resources/definitions.xml
index 1cb1d1c9ba..1cb1d1c9ba 100644
--- a/java/sca/samples/binding-echo-extension/src/test/resources/definitions.xml
+++ b/java/sca/contrib/samples/binding-echo-extension/src/test/resources/definitions.xml
diff --git a/java/sca/samples/binding-echo/README b/java/sca/contrib/samples/binding-echo/README
index 2772460cc6..2772460cc6 100644
--- a/java/sca/samples/binding-echo/README
+++ b/java/sca/contrib/samples/binding-echo/README
diff --git a/java/sca/samples/binding-echo/binding-echo.png b/java/sca/contrib/samples/binding-echo/binding-echo.png
index a38d985363..a38d985363 100644
--- a/java/sca/samples/binding-echo/binding-echo.png
+++ b/java/sca/contrib/samples/binding-echo/binding-echo.png
diff --git a/java/sca/samples/binding-echo/binding-echo.svg b/java/sca/contrib/samples/binding-echo/binding-echo.svg
index 5b5051bef5..5b5051bef5 100644
--- a/java/sca/samples/binding-echo/binding-echo.svg
+++ b/java/sca/contrib/samples/binding-echo/binding-echo.svg
diff --git a/java/sca/samples/binding-echo/build.xml b/java/sca/contrib/samples/binding-echo/build.xml
index 7689ef3a54..7689ef3a54 100644
--- a/java/sca/samples/binding-echo/build.xml
+++ b/java/sca/contrib/samples/binding-echo/build.xml
diff --git a/java/sca/samples/binding-echo/pom.xml b/java/sca/contrib/samples/binding-echo/pom.xml
index f5e2464563..f5e2464563 100644
--- a/java/sca/samples/binding-echo/pom.xml
+++ b/java/sca/contrib/samples/binding-echo/pom.xml
diff --git a/java/sca/samples/binding-echo/src/main/java/echo/Echo.java b/java/sca/contrib/samples/binding-echo/src/main/java/echo/Echo.java
index 1d5e973f33..1d5e973f33 100644
--- a/java/sca/samples/binding-echo/src/main/java/echo/Echo.java
+++ b/java/sca/contrib/samples/binding-echo/src/main/java/echo/Echo.java
diff --git a/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingClient.java b/java/sca/contrib/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
index 21bdff4011..21bdff4011 100644
--- a/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
+++ b/java/sca/contrib/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
diff --git a/java/sca/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java b/java/sca/contrib/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
index 01b89101a8..01b89101a8 100644
--- a/java/sca/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
+++ b/java/sca/contrib/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
diff --git a/java/sca/samples/binding-echo/src/main/resources/EchoBinding.composite b/java/sca/contrib/samples/binding-echo/src/main/resources/EchoBinding.composite
index 94612fb325..94612fb325 100644
--- a/java/sca/samples/binding-echo/src/main/resources/EchoBinding.composite
+++ b/java/sca/contrib/samples/binding-echo/src/main/resources/EchoBinding.composite
diff --git a/java/sca/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java b/java/sca/contrib/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
index 1a597fc80f..1a597fc80f 100644
--- a/java/sca/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
+++ b/java/sca/contrib/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
diff --git a/java/sca/samples/binding-notification-broker/README b/java/sca/contrib/samples/binding-notification-broker/README
index ebd8bbec30..ebd8bbec30 100644
--- a/java/sca/samples/binding-notification-broker/README
+++ b/java/sca/contrib/samples/binding-notification-broker/README
diff --git a/java/sca/samples/binding-notification-broker/binding-notification-broker.png b/java/sca/contrib/samples/binding-notification-broker/binding-notification-broker.png
index 49030650f2..49030650f2 100644
--- a/java/sca/samples/binding-notification-broker/binding-notification-broker.png
+++ b/java/sca/contrib/samples/binding-notification-broker/binding-notification-broker.png
diff --git a/java/sca/samples/binding-notification-broker/build.xml b/java/sca/contrib/samples/binding-notification-broker/build.xml
index a042b9036a..a042b9036a 100644
--- a/java/sca/samples/binding-notification-broker/build.xml
+++ b/java/sca/contrib/samples/binding-notification-broker/build.xml
diff --git a/java/sca/samples/binding-notification-broker/pom.xml b/java/sca/contrib/samples/binding-notification-broker/pom.xml
index 82e79c24f5..82e79c24f5 100644
--- a/java/sca/samples/binding-notification-broker/pom.xml
+++ b/java/sca/contrib/samples/binding-notification-broker/pom.xml
diff --git a/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java b/java/sca/contrib/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
index 35fa1a9ee9..35fa1a9ee9 100644
--- a/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
+++ b/java/sca/contrib/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
diff --git a/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java b/java/sca/contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
index 3f069ede78..3f069ede78 100644
--- a/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
+++ b/java/sca/contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
diff --git a/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java b/java/sca/contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
index b9a5b98126..b9a5b98126 100644
--- a/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
+++ b/java/sca/contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
diff --git a/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java b/java/sca/contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
index 6406572d10..6406572d10 100644
--- a/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
+++ b/java/sca/contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
diff --git a/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java b/java/sca/contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
index b0f0d2a800..b0f0d2a800 100644
--- a/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
+++ b/java/sca/contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
diff --git a/java/sca/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType b/java/sca/contrib/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
index 2dc70f8ed1..2dc70f8ed1 100644
--- a/java/sca/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/java/sca/contrib/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/java/sca/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite b/java/sca/contrib/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
index f490c34ea6..f490c34ea6 100644
--- a/java/sca/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/java/sca/contrib/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/java/sca/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl b/java/sca/contrib/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
index b823bbebcc..b823bbebcc 100644
--- a/java/sca/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ b/java/sca/contrib/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/java/sca/samples/binding-notification-consumer/README b/java/sca/contrib/samples/binding-notification-consumer/README
index b54b445670..b54b445670 100644
--- a/java/sca/samples/binding-notification-consumer/README
+++ b/java/sca/contrib/samples/binding-notification-consumer/README
diff --git a/java/sca/samples/binding-notification-consumer/binding-notification-consumer.png b/java/sca/contrib/samples/binding-notification-consumer/binding-notification-consumer.png
index 33e1966c3e..33e1966c3e 100644
--- a/java/sca/samples/binding-notification-consumer/binding-notification-consumer.png
+++ b/java/sca/contrib/samples/binding-notification-consumer/binding-notification-consumer.png
diff --git a/java/sca/samples/binding-notification-consumer/build.xml b/java/sca/contrib/samples/binding-notification-consumer/build.xml
index f57fe1bb26..f57fe1bb26 100644
--- a/java/sca/samples/binding-notification-consumer/build.xml
+++ b/java/sca/contrib/samples/binding-notification-consumer/build.xml
diff --git a/java/sca/samples/binding-notification-consumer/pom.xml b/java/sca/contrib/samples/binding-notification-consumer/pom.xml
index c1452f7d02..c1452f7d02 100644
--- a/java/sca/samples/binding-notification-consumer/pom.xml
+++ b/java/sca/contrib/samples/binding-notification-consumer/pom.xml
diff --git a/java/sca/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java b/java/sca/contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
index 424728692f..424728692f 100644
--- a/java/sca/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
+++ b/java/sca/contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
diff --git a/java/sca/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java b/java/sca/contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
index 852ddaa919..852ddaa919 100644
--- a/java/sca/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
+++ b/java/sca/contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
diff --git a/java/sca/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java b/java/sca/contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
index c53adb1944..c53adb1944 100644
--- a/java/sca/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
+++ b/java/sca/contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
diff --git a/java/sca/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType b/java/sca/contrib/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
index 2dc70f8ed1..2dc70f8ed1 100644
--- a/java/sca/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/java/sca/contrib/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/java/sca/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite b/java/sca/contrib/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
index 8f9bcc4438..8f9bcc4438 100644
--- a/java/sca/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/java/sca/contrib/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/java/sca/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/java/sca/contrib/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
index b823bbebcc..b823bbebcc 100644
--- a/java/sca/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ b/java/sca/contrib/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/java/sca/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java b/java/sca/contrib/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
index c5318f405c..c5318f405c 100644
--- a/java/sca/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
+++ b/java/sca/contrib/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
diff --git a/java/sca/samples/binding-notification-producer/README b/java/sca/contrib/samples/binding-notification-producer/README
index c5f284d4c5..c5f284d4c5 100644
--- a/java/sca/samples/binding-notification-producer/README
+++ b/java/sca/contrib/samples/binding-notification-producer/README
diff --git a/java/sca/samples/binding-notification-producer/binding-notification-producer.png b/java/sca/contrib/samples/binding-notification-producer/binding-notification-producer.png
index 34c347c893..34c347c893 100644
--- a/java/sca/samples/binding-notification-producer/binding-notification-producer.png
+++ b/java/sca/contrib/samples/binding-notification-producer/binding-notification-producer.png
diff --git a/java/sca/samples/binding-notification-producer/build.xml b/java/sca/contrib/samples/binding-notification-producer/build.xml
index d13e4c8a6c..d13e4c8a6c 100644
--- a/java/sca/samples/binding-notification-producer/build.xml
+++ b/java/sca/contrib/samples/binding-notification-producer/build.xml
diff --git a/java/sca/samples/binding-notification-producer/pom.xml b/java/sca/contrib/samples/binding-notification-producer/pom.xml
index ffe90c0cb3..ffe90c0cb3 100644
--- a/java/sca/samples/binding-notification-producer/pom.xml
+++ b/java/sca/contrib/samples/binding-notification-producer/pom.xml
diff --git a/java/sca/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java b/java/sca/contrib/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
index be80e71249..be80e71249 100644
--- a/java/sca/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
+++ b/java/sca/contrib/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
diff --git a/java/sca/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java b/java/sca/contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
index 548d45b12d..548d45b12d 100644
--- a/java/sca/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
+++ b/java/sca/contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
diff --git a/java/sca/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java b/java/sca/contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
index e670ccb95c..e670ccb95c 100644
--- a/java/sca/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
+++ b/java/sca/contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
diff --git a/java/sca/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java b/java/sca/contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
index efd3657dc3..efd3657dc3 100644
--- a/java/sca/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
+++ b/java/sca/contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
diff --git a/java/sca/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType b/java/sca/contrib/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
index 2dc70f8ed1..2dc70f8ed1 100644
--- a/java/sca/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/java/sca/contrib/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/java/sca/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite b/java/sca/contrib/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
index 2db6ea655b..2db6ea655b 100644
--- a/java/sca/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/java/sca/contrib/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/java/sca/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/java/sca/contrib/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
index b823bbebcc..b823bbebcc 100644
--- a/java/sca/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ b/java/sca/contrib/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/java/sca/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java b/java/sca/contrib/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
index d3901ee407..d3901ee407 100644
--- a/java/sca/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
+++ b/java/sca/contrib/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
diff --git a/java/sca/samples/calculator-corba-reference/README b/java/sca/contrib/samples/calculator-corba-reference/README
index 66c4cddb94..66c4cddb94 100644
--- a/java/sca/samples/calculator-corba-reference/README
+++ b/java/sca/contrib/samples/calculator-corba-reference/README
diff --git a/java/sca/samples/calculator-corba-reference/pom.xml b/java/sca/contrib/samples/calculator-corba-reference/pom.xml
index 96d4ce402c..96d4ce402c 100644
--- a/java/sca/samples/calculator-corba-reference/pom.xml
+++ b/java/sca/contrib/samples/calculator-corba-reference/pom.xml
diff --git a/java/sca/samples/calculator-corba-reference/src/main/java/calculator/AddService.java b/java/sca/contrib/samples/calculator-corba-reference/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/java/sca/samples/calculator-corba-reference/src/main/java/calculator/AddService.java
+++ b/java/sca/contrib/samples/calculator-corba-reference/src/main/java/calculator/AddService.java
diff --git a/java/sca/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java b/java/sca/contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java
index cd1076c3f1..cd1076c3f1 100644
--- a/java/sca/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java
+++ b/java/sca/contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/java/sca/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java b/java/sca/contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java
index 0bac3da45c..0bac3da45c 100644
--- a/java/sca/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java
+++ b/java/sca/contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java
index 675350860e..675350860e 100644
--- a/java/sca/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java b/java/sca/contrib/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/java/sca/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java
+++ b/java/sca/contrib/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java
diff --git a/java/sca/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java b/java/sca/contrib/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/java/sca/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java
+++ b/java/sca/contrib/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java b/java/sca/contrib/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/java/sca/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java
+++ b/java/sca/contrib/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java
diff --git a/java/sca/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite b/java/sca/contrib/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite
index 717add91a8..717add91a8 100644
--- a/java/sca/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite
+++ b/java/sca/contrib/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite
diff --git a/java/sca/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java b/java/sca/contrib/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java
index 041608273b..041608273b 100644
--- a/java/sca/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java
+++ b/java/sca/contrib/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java
diff --git a/java/sca/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java b/java/sca/contrib/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java
index 65e9b89ce2..65e9b89ce2 100644
--- a/java/sca/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java
+++ b/java/sca/contrib/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java
diff --git a/java/sca/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java b/java/sca/contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java
index 6206e0cf6f..6206e0cf6f 100644
--- a/java/sca/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java
+++ b/java/sca/contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java
diff --git a/java/sca/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java b/java/sca/contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
index 6facda6a34..6facda6a34 100644
--- a/java/sca/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
+++ b/java/sca/contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
diff --git a/java/sca/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java b/java/sca/contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java
index f6a4bd8994..f6a4bd8994 100644
--- a/java/sca/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java
+++ b/java/sca/contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java
diff --git a/java/sca/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl b/java/sca/contrib/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl
index 55ffeac8a3..55ffeac8a3 100644
--- a/java/sca/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl
+++ b/java/sca/contrib/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl
diff --git a/java/sca/samples/calculator-corba-service/README b/java/sca/contrib/samples/calculator-corba-service/README
index 87863752cd..87863752cd 100644
--- a/java/sca/samples/calculator-corba-service/README
+++ b/java/sca/contrib/samples/calculator-corba-service/README
diff --git a/java/sca/samples/calculator-corba-service/pom.xml b/java/sca/contrib/samples/calculator-corba-service/pom.xml
index 63c5f5f9a6..63c5f5f9a6 100644
--- a/java/sca/samples/calculator-corba-service/pom.xml
+++ b/java/sca/contrib/samples/calculator-corba-service/pom.xml
diff --git a/java/sca/samples/calculator-corba-service/src/main/java/calculator/AddService.java b/java/sca/contrib/samples/calculator-corba-service/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/java/sca/samples/calculator-corba-service/src/main/java/calculator/AddService.java
+++ b/java/sca/contrib/samples/calculator-corba-service/src/main/java/calculator/AddService.java
diff --git a/java/sca/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java b/java/sca/contrib/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/java/sca/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java b/java/sca/contrib/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java
index b0a46b6dd0..b0a46b6dd0 100644
--- a/java/sca/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java
+++ b/java/sca/contrib/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/contrib/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java
index 675350860e..675350860e 100644
--- a/java/sca/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca/samples/calculator-corba-service/src/main/java/calculator/DivideService.java b/java/sca/contrib/samples/calculator-corba-service/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/java/sca/samples/calculator-corba-service/src/main/java/calculator/DivideService.java
+++ b/java/sca/contrib/samples/calculator-corba-service/src/main/java/calculator/DivideService.java
diff --git a/java/sca/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java b/java/sca/contrib/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/java/sca/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java b/java/sca/contrib/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/java/sca/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java
+++ b/java/sca/contrib/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca/contrib/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/java/sca/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java b/java/sca/contrib/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/java/sca/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java
+++ b/java/sca/contrib/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java
diff --git a/java/sca/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java b/java/sca/contrib/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/java/sca/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite b/java/sca/contrib/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite
index 1ab6cecef7..1ab6cecef7 100644
--- a/java/sca/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite
+++ b/java/sca/contrib/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite
diff --git a/java/sca/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java b/java/sca/contrib/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java
index 4248ca8573..4248ca8573 100644
--- a/java/sca/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java
+++ b/java/sca/contrib/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java
diff --git a/java/sca/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.java b/java/sca/contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.java
index 6576358755..6576358755 100644
--- a/java/sca/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.java
+++ b/java/sca/contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.java
diff --git a/java/sca/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java b/java/sca/contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java
index 0977982fb3..0977982fb3 100644
--- a/java/sca/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java
+++ b/java/sca/contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java
diff --git a/java/sca/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java b/java/sca/contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java
index 0cf6439d49..0cf6439d49 100644
--- a/java/sca/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java
+++ b/java/sca/contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java
diff --git a/java/sca/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java b/java/sca/contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
index 3e2956d469..3e2956d469 100644
--- a/java/sca/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
+++ b/java/sca/contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
diff --git a/java/sca/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java b/java/sca/contrib/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java
index ad193ee121..ad193ee121 100644
--- a/java/sca/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java
+++ b/java/sca/contrib/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java
diff --git a/java/sca/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl b/java/sca/contrib/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl
index 5848bbaa2c..5848bbaa2c 100644
--- a/java/sca/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl
+++ b/java/sca/contrib/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl
diff --git a/java/sca/samples/calculator-distributed/README b/java/sca/contrib/samples/calculator-distributed/README
index 51f4b07e81..51f4b07e81 100644
--- a/java/sca/samples/calculator-distributed/README
+++ b/java/sca/contrib/samples/calculator-distributed/README
diff --git a/java/sca/samples/calculator-distributed/build.xml b/java/sca/contrib/samples/calculator-distributed/build.xml
index cccd22f3ae..cccd22f3ae 100644
--- a/java/sca/samples/calculator-distributed/build.xml
+++ b/java/sca/contrib/samples/calculator-distributed/build.xml
diff --git a/java/sca/samples/calculator-distributed/calculator-distributed.png b/java/sca/contrib/samples/calculator-distributed/calculator-distributed.png
index 7c0e175664..7c0e175664 100644
--- a/java/sca/samples/calculator-distributed/calculator-distributed.png
+++ b/java/sca/contrib/samples/calculator-distributed/calculator-distributed.png
diff --git a/java/sca/samples/calculator-distributed/calculator-distributed.svg b/java/sca/contrib/samples/calculator-distributed/calculator-distributed.svg
index be5a4b8185..be5a4b8185 100644
--- a/java/sca/samples/calculator-distributed/calculator-distributed.svg
+++ b/java/sca/contrib/samples/calculator-distributed/calculator-distributed.svg
diff --git a/java/sca/samples/calculator-distributed/cloud.composite b/java/sca/contrib/samples/calculator-distributed/cloud.composite
index 85e2f9c7f3..85e2f9c7f3 100644
--- a/java/sca/samples/calculator-distributed/cloud.composite
+++ b/java/sca/contrib/samples/calculator-distributed/cloud.composite
diff --git a/java/sca/samples/calculator-distributed/domain.composite b/java/sca/contrib/samples/calculator-distributed/domain.composite
index 643e22d0cf..643e22d0cf 100644
--- a/java/sca/samples/calculator-distributed/domain.composite
+++ b/java/sca/contrib/samples/calculator-distributed/domain.composite
diff --git a/java/sca/samples/calculator-distributed/pom.xml b/java/sca/contrib/samples/calculator-distributed/pom.xml
index e1e86d8896..e1e86d8896 100644
--- a/java/sca/samples/calculator-distributed/pom.xml
+++ b/java/sca/contrib/samples/calculator-distributed/pom.xml
diff --git a/java/sca/samples/calculator-distributed/src/main/java/calculator/AddService.java b/java/sca/contrib/samples/calculator-distributed/src/main/java/calculator/AddService.java
index dd7ecb827d..dd7ecb827d 100644
--- a/java/sca/samples/calculator-distributed/src/main/java/calculator/AddService.java
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/java/calculator/AddService.java
diff --git a/java/sca/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java b/java/sca/contrib/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
index e9b7e254e5..e9b7e254e5 100644
--- a/java/sca/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java b/java/sca/contrib/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/contrib/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
index c927500cc7..c927500cc7 100644
--- a/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca/samples/calculator-distributed/src/main/java/calculator/DivideService.java b/java/sca/contrib/samples/calculator-distributed/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/java/sca/samples/calculator-distributed/src/main/java/calculator/DivideService.java
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/java/calculator/DivideService.java
diff --git a/java/sca/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java b/java/sca/contrib/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/java/sca/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java b/java/sca/contrib/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/java/sca/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca/contrib/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/java/sca/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca/samples/calculator-distributed/src/main/java/calculator/SubtractService.java b/java/sca/contrib/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
index f03b9b94d4..f03b9b94d4 100644
--- a/java/sca/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
diff --git a/java/sca/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java b/java/sca/contrib/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
index 1010207154..1010207154 100644
--- a/java/sca/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java b/java/sca/contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
index 87021505b3..87021505b3 100644
--- a/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
diff --git a/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java b/java/sca/contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
index 50600eaedc..50600eaedc 100644
--- a/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
diff --git a/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java b/java/sca/contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
index 95d8934665..95d8934665 100644
--- a/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
diff --git a/java/sca/samples/calculator-distributed/src/main/java/node/LaunchDomain.java b/java/sca/contrib/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
index 8b4fe566a1..8b4fe566a1 100644
--- a/java/sca/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
diff --git a/java/sca/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite b/java/sca/contrib/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
index ed7fe55abc..ed7fe55abc 100644
--- a/java/sca/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
diff --git a/java/sca/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite b/java/sca/contrib/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
index 8f29cc17aa..8f29cc17aa 100644
--- a/java/sca/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
diff --git a/java/sca/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite b/java/sca/contrib/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
index 9ad132b0d4..9ad132b0d4 100644
--- a/java/sca/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
diff --git a/java/sca/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite b/java/sca/contrib/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
index 172676a3c7..172676a3c7 100644
--- a/java/sca/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
diff --git a/java/sca/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/java/sca/contrib/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
index 1b1c0291e2..1b1c0291e2 100644
--- a/java/sca/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite b/java/sca/contrib/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
index b770dbe8d4..b770dbe8d4 100644
--- a/java/sca/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
diff --git a/java/sca/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/java/sca/contrib/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 6c0ffe4ac0..6c0ffe4ac0 100644
--- a/java/sca/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite b/java/sca/contrib/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
index 66caf0d17b..66caf0d17b 100644
--- a/java/sca/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
diff --git a/java/sca/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/java/sca/contrib/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
index 8c311553c3..8c311553c3 100644
--- a/java/sca/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java b/java/sca/contrib/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
index 2a6f3af002..2a6f3af002 100644
--- a/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
+++ b/java/sca/contrib/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
diff --git a/java/sca/samples/calculator-distributed/workspace.xml b/java/sca/contrib/samples/calculator-distributed/workspace.xml
index 7d6d3dbdbd..7d6d3dbdbd 100644
--- a/java/sca/samples/calculator-distributed/workspace.xml
+++ b/java/sca/contrib/samples/calculator-distributed/workspace.xml
diff --git a/java/sca/samples/calculator-implementation-policies/README b/java/sca/contrib/samples/calculator-implementation-policies/README
index bd66eee1c9..bd66eee1c9 100644
--- a/java/sca/samples/calculator-implementation-policies/README
+++ b/java/sca/contrib/samples/calculator-implementation-policies/README
diff --git a/java/sca/samples/calculator-implementation-policies/build.xml b/java/sca/contrib/samples/calculator-implementation-policies/build.xml
index 7afa23a07f..7afa23a07f 100644
--- a/java/sca/samples/calculator-implementation-policies/build.xml
+++ b/java/sca/contrib/samples/calculator-implementation-policies/build.xml
diff --git a/java/sca/samples/calculator-equinox/calculator.png b/java/sca/contrib/samples/calculator-implementation-policies/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/java/sca/samples/calculator-equinox/calculator.png
+++ b/java/sca/contrib/samples/calculator-implementation-policies/calculator.png
diff --git a/java/sca/samples/calculator-equinox/calculator.svg b/java/sca/contrib/samples/calculator-implementation-policies/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/java/sca/samples/calculator-equinox/calculator.svg
+++ b/java/sca/contrib/samples/calculator-implementation-policies/calculator.svg
diff --git a/java/sca/samples/calculator-implementation-policies/pom.xml b/java/sca/contrib/samples/calculator-implementation-policies/pom.xml
index 7bc0be2dca..7bc0be2dca 100644
--- a/java/sca/samples/calculator-implementation-policies/pom.xml
+++ b/java/sca/contrib/samples/calculator-implementation-policies/pom.xml
diff --git a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
index 5a1e7a638a..5a1e7a638a 100644
--- a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
+++ b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
diff --git a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
index caf4d358df..caf4d358df 100644
--- a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
index 2bce187049..2bce187049 100644
--- a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
+++ b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
diff --git a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
+++ b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
index d3fa7a8f41..d3fa7a8f41 100644
--- a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
+++ b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
diff --git a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
+++ b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
+++ b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
diff --git a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
index b48fb90148..b48fb90148 100644
--- a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
+++ b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
diff --git a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
index fe4097640b..fe4097640b 100644
--- a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
+++ b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
diff --git a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
index 595626e672..595626e672 100644
--- a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
+++ b/java/sca/contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
diff --git a/java/sca/samples/calculator-implementation-policies/src/main/resources/Calculator.composite b/java/sca/contrib/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
index d91bf88d96..d91bf88d96 100644
--- a/java/sca/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
+++ b/java/sca/contrib/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
diff --git a/java/sca/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config b/java/sca/contrib/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
index 0e7cb86633..0e7cb86633 100644
--- a/java/sca/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
+++ b/java/sca/contrib/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
diff --git a/java/sca/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties b/java/sca/contrib/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
index f62125eaa9..f62125eaa9 100644
--- a/java/sca/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
+++ b/java/sca/contrib/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
diff --git a/java/sca/samples/calculator-implementation-policies/src/main/resources/definitions.xml b/java/sca/contrib/samples/calculator-implementation-policies/src/main/resources/definitions.xml
index 6cccde0d13..6cccde0d13 100644
--- a/java/sca/samples/calculator-implementation-policies/src/main/resources/definitions.xml
+++ b/java/sca/contrib/samples/calculator-implementation-policies/src/main/resources/definitions.xml
diff --git a/java/sca/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java b/java/sca/contrib/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
index 157570c3df..157570c3df 100644
--- a/java/sca/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
+++ b/java/sca/contrib/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
diff --git a/java/sca/samples/calculator-lean/README b/java/sca/contrib/samples/calculator-lean/README
index a8aff232c6..a8aff232c6 100644
--- a/java/sca/samples/calculator-lean/README
+++ b/java/sca/contrib/samples/calculator-lean/README
diff --git a/java/sca/samples/calculator-implementation-policies/calculator.png b/java/sca/contrib/samples/calculator-lean/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/java/sca/samples/calculator-implementation-policies/calculator.png
+++ b/java/sca/contrib/samples/calculator-lean/calculator.png
diff --git a/java/sca/samples/calculator-lean/calculator.svg b/java/sca/contrib/samples/calculator-lean/calculator.svg
index 0615925c50..0615925c50 100644
--- a/java/sca/samples/calculator-lean/calculator.svg
+++ b/java/sca/contrib/samples/calculator-lean/calculator.svg
diff --git a/java/sca/samples/calculator-lean/pom.xml b/java/sca/contrib/samples/calculator-lean/pom.xml
index a68887b9b5..a68887b9b5 100644
--- a/java/sca/samples/calculator-lean/pom.xml
+++ b/java/sca/contrib/samples/calculator-lean/pom.xml
diff --git a/java/sca/samples/calculator-equinox/src/main/java/calculator/AddService.java b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/java/sca/samples/calculator-equinox/src/main/java/calculator/AddService.java
+++ b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/AddService.java
diff --git a/java/sca/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/java/sca/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
index d56aa86e09..d56aa86e09 100644
--- a/java/sca/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
+++ b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
diff --git a/java/sca/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/java/sca/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
+++ b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/java/sca/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca/samples/calculator-equinox/src/main/java/calculator/DivideService.java b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/java/sca/samples/calculator-equinox/src/main/java/calculator/DivideService.java
+++ b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/DivideService.java
diff --git a/java/sca/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/java/sca/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/java/sca/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
+++ b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/java/sca/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca/samples/calculator-equinox/src/main/java/calculator/SubtractService.java b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/java/sca/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
+++ b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/SubtractService.java
diff --git a/java/sca/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/java/sca/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca/samples/calculator-equinox/src/main/resources/Calculator.composite b/java/sca/contrib/samples/calculator-lean/src/main/resources/Calculator.composite
index 913081b9be..913081b9be 100644
--- a/java/sca/samples/calculator-equinox/src/main/resources/Calculator.composite
+++ b/java/sca/contrib/samples/calculator-lean/src/main/resources/Calculator.composite
diff --git a/java/sca/samples/calculator-lean/src/main/resources/CalculatorTest.composite b/java/sca/contrib/samples/calculator-lean/src/main/resources/CalculatorTest.composite
index 906e2a3918..906e2a3918 100644
--- a/java/sca/samples/calculator-lean/src/main/resources/CalculatorTest.composite
+++ b/java/sca/contrib/samples/calculator-lean/src/main/resources/CalculatorTest.composite
diff --git a/java/sca/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java b/java/sca/contrib/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
index 94dc747734..94dc747734 100644
--- a/java/sca/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
+++ b/java/sca/contrib/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
diff --git a/java/sca/samples/calculator-rcp/build.properties b/java/sca/contrib/samples/calculator-rcp/build.properties
index 0530eb648b..0530eb648b 100644
--- a/java/sca/samples/calculator-rcp/build.properties
+++ b/java/sca/contrib/samples/calculator-rcp/build.properties
diff --git a/java/sca/samples/calculator-rcp/icons/alt_window_16.gif b/java/sca/contrib/samples/calculator-rcp/icons/alt_window_16.gif
index 05626b17d8..05626b17d8 100644
--- a/java/sca/samples/calculator-rcp/icons/alt_window_16.gif
+++ b/java/sca/contrib/samples/calculator-rcp/icons/alt_window_16.gif
diff --git a/java/sca/samples/calculator-rcp/icons/alt_window_32.gif b/java/sca/contrib/samples/calculator-rcp/icons/alt_window_32.gif
index b432f88339..b432f88339 100644
--- a/java/sca/samples/calculator-rcp/icons/alt_window_32.gif
+++ b/java/sca/contrib/samples/calculator-rcp/icons/alt_window_32.gif
diff --git a/java/sca/samples/calculator-rcp/plugin.xml b/java/sca/contrib/samples/calculator-rcp/plugin.xml
index 1fb5acd9b5..1fb5acd9b5 100644
--- a/java/sca/samples/calculator-rcp/plugin.xml
+++ b/java/sca/contrib/samples/calculator-rcp/plugin.xml
diff --git a/java/sca/samples/calculator-rcp/pom.xml b/java/sca/contrib/samples/calculator-rcp/pom.xml
index 0e5214cdd0..0e5214cdd0 100644
--- a/java/sca/samples/calculator-rcp/pom.xml
+++ b/java/sca/contrib/samples/calculator-rcp/pom.xml
diff --git a/java/sca/samples/calculator-lean/src/main/resources/Calculator.composite b/java/sca/contrib/samples/calculator-rcp/src/main/java/Calculator.composite
index 913081b9be..913081b9be 100644
--- a/java/sca/samples/calculator-lean/src/main/resources/Calculator.composite
+++ b/java/sca/contrib/samples/calculator-rcp/src/main/java/Calculator.composite
diff --git a/java/sca/samples/calculator-lean/src/main/java/calculator/AddService.java b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/java/sca/samples/calculator-lean/src/main/java/calculator/AddService.java
+++ b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/AddService.java
diff --git a/java/sca/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/java/sca/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java
index afd5ea48fc..afd5ea48fc 100644
--- a/java/sca/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java
+++ b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java
diff --git a/java/sca/samples/calculator-rcp/src/main/java/calculator/CalculatorService.java b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/java/sca/samples/calculator-rcp/src/main/java/calculator/CalculatorService.java
+++ b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java
index 39f55ca31f..39f55ca31f 100644
--- a/java/sca/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca/samples/calculator-lean/src/main/java/calculator/DivideService.java b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/java/sca/samples/calculator-lean/src/main/java/calculator/DivideService.java
+++ b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/DivideService.java
diff --git a/java/sca/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/java/sca/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca/samples/calculator-lean/src/main/java/calculator/MultiplyService.java b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/java/sca/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
+++ b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/java/sca/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca/samples/calculator-lean/src/main/java/calculator/SubtractService.java b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/java/sca/samples/calculator-lean/src/main/java/calculator/SubtractService.java
+++ b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/SubtractService.java
diff --git a/java/sca/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/java/sca/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
index 50f68dcb01..50f68dcb01 100644
--- a/java/sca/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
+++ b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
diff --git a/java/sca/samples/calculator-rcp/src/main/java/calculator/rcp/Application.java b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Application.java
index 5ce6522fed..5ce6522fed 100644
--- a/java/sca/samples/calculator-rcp/src/main/java/calculator/rcp/Application.java
+++ b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Application.java
diff --git a/java/sca/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationActionBarAdvisor.java b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationActionBarAdvisor.java
index 2fccfb2d77..2fccfb2d77 100644
--- a/java/sca/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationActionBarAdvisor.java
+++ b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationActionBarAdvisor.java
diff --git a/java/sca/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchAdvisor.java b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchAdvisor.java
index ac1893509c..ac1893509c 100644
--- a/java/sca/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchAdvisor.java
+++ b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchAdvisor.java
diff --git a/java/sca/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchWindowAdvisor.java b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchWindowAdvisor.java
index 6378decf20..6378decf20 100644
--- a/java/sca/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchWindowAdvisor.java
+++ b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchWindowAdvisor.java
diff --git a/java/sca/samples/calculator-rcp/src/main/java/calculator/rcp/Perspective.java b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Perspective.java
index 445b4b65b2..445b4b65b2 100644
--- a/java/sca/samples/calculator-rcp/src/main/java/calculator/rcp/Perspective.java
+++ b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Perspective.java
diff --git a/java/sca/samples/calculator-rcp/src/main/java/calculator/rcp/View.java b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/View.java
index f95c1e029c..f95c1e029c 100644
--- a/java/sca/samples/calculator-rcp/src/main/java/calculator/rcp/View.java
+++ b/java/sca/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/View.java
diff --git a/java/sca/samples/calculator-script/README b/java/sca/contrib/samples/calculator-script/README
index ab1dda13df..ab1dda13df 100644
--- a/java/sca/samples/calculator-script/README
+++ b/java/sca/contrib/samples/calculator-script/README
diff --git a/java/sca/samples/calculator-script/build.xml b/java/sca/contrib/samples/calculator-script/build.xml
index 429d638ca5..429d638ca5 100644
--- a/java/sca/samples/calculator-script/build.xml
+++ b/java/sca/contrib/samples/calculator-script/build.xml
diff --git a/java/sca/samples/calculator-script/calculator-script.png b/java/sca/contrib/samples/calculator-script/calculator-script.png
index d3f8c491c3..d3f8c491c3 100644
--- a/java/sca/samples/calculator-script/calculator-script.png
+++ b/java/sca/contrib/samples/calculator-script/calculator-script.png
diff --git a/java/sca/samples/calculator-script/calculator-script.svg b/java/sca/contrib/samples/calculator-script/calculator-script.svg
index 16939f9310..16939f9310 100644
--- a/java/sca/samples/calculator-script/calculator-script.svg
+++ b/java/sca/contrib/samples/calculator-script/calculator-script.svg
diff --git a/java/sca/samples/calculator-script/pom.xml b/java/sca/contrib/samples/calculator-script/pom.xml
index 4ed19c0751..4ed19c0751 100644
--- a/java/sca/samples/calculator-script/pom.xml
+++ b/java/sca/contrib/samples/calculator-script/pom.xml
diff --git a/java/sca/samples/calculator-script/src/main/java/calculator/AddService.java b/java/sca/contrib/samples/calculator-script/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/java/sca/samples/calculator-script/src/main/java/calculator/AddService.java
+++ b/java/sca/contrib/samples/calculator-script/src/main/java/calculator/AddService.java
diff --git a/java/sca/samples/calculator-script/src/main/java/calculator/CalculatorClient.java b/java/sca/contrib/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
index 243d1562dc..243d1562dc 100644
--- a/java/sca/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
+++ b/java/sca/contrib/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
diff --git a/java/sca/samples/calculator-script/src/main/java/calculator/CalculatorService.java b/java/sca/contrib/samples/calculator-script/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/java/sca/samples/calculator-script/src/main/java/calculator/CalculatorService.java
+++ b/java/sca/contrib/samples/calculator-script/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/contrib/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
index 39f55ca31f..39f55ca31f 100644
--- a/java/sca/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca/samples/calculator-script/src/main/java/calculator/DivideService.java b/java/sca/contrib/samples/calculator-script/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/java/sca/samples/calculator-script/src/main/java/calculator/DivideService.java
+++ b/java/sca/contrib/samples/calculator-script/src/main/java/calculator/DivideService.java
diff --git a/java/sca/samples/calculator-rcp/src/main/java/calculator/MultiplyService.java b/java/sca/contrib/samples/calculator-script/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/java/sca/samples/calculator-rcp/src/main/java/calculator/MultiplyService.java
+++ b/java/sca/contrib/samples/calculator-script/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca/samples/calculator-script/src/main/java/calculator/SubtractService.java b/java/sca/contrib/samples/calculator-script/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/java/sca/samples/calculator-script/src/main/java/calculator/SubtractService.java
+++ b/java/sca/contrib/samples/calculator-script/src/main/java/calculator/SubtractService.java
diff --git a/java/sca/samples/calculator-script/src/main/resources/Calculator.composite b/java/sca/contrib/samples/calculator-script/src/main/resources/Calculator.composite
index 8a765e6153..8a765e6153 100644
--- a/java/sca/samples/calculator-script/src/main/resources/Calculator.composite
+++ b/java/sca/contrib/samples/calculator-script/src/main/resources/Calculator.composite
diff --git a/java/sca/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js b/java/sca/contrib/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
index 1d4d221364..1d4d221364 100644
--- a/java/sca/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
+++ b/java/sca/contrib/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
diff --git a/java/sca/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy b/java/sca/contrib/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/java/sca/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/java/sca/contrib/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/java/sca/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py b/java/sca/contrib/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
index d6f27ca7f5..d6f27ca7f5 100644
--- a/java/sca/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/java/sca/contrib/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/java/sca/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb b/java/sca/contrib/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
index 132a1d13b0..132a1d13b0 100644
--- a/java/sca/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/java/sca/contrib/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/java/sca/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java b/java/sca/contrib/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
index fea8f62110..fea8f62110 100644
--- a/java/sca/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
+++ b/java/sca/contrib/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
diff --git a/java/sca/samples/calculator-webapp/README b/java/sca/contrib/samples/calculator-webapp/README
index c88b92b206..c88b92b206 100644
--- a/java/sca/samples/calculator-webapp/README
+++ b/java/sca/contrib/samples/calculator-webapp/README
diff --git a/java/sca/samples/calculator-webapp/calculator-web.png b/java/sca/contrib/samples/calculator-webapp/calculator-web.png
index 896ddc4093..896ddc4093 100644
--- a/java/sca/samples/calculator-webapp/calculator-web.png
+++ b/java/sca/contrib/samples/calculator-webapp/calculator-web.png
diff --git a/java/sca/samples/calculator-webapp/calculator-web.svg b/java/sca/contrib/samples/calculator-webapp/calculator-web.svg
index 00ed27556f..00ed27556f 100644
--- a/java/sca/samples/calculator-webapp/calculator-web.svg
+++ b/java/sca/contrib/samples/calculator-webapp/calculator-web.svg
diff --git a/java/sca/samples/calculator-webapp/pom.xml b/java/sca/contrib/samples/calculator-webapp/pom.xml
index d2152897dc..d2152897dc 100644
--- a/java/sca/samples/calculator-webapp/pom.xml
+++ b/java/sca/contrib/samples/calculator-webapp/pom.xml
diff --git a/java/sca/samples/calculator-webapp/src/main/java/calculator/AddService.java b/java/sca/contrib/samples/calculator-webapp/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/java/sca/samples/calculator-webapp/src/main/java/calculator/AddService.java
+++ b/java/sca/contrib/samples/calculator-webapp/src/main/java/calculator/AddService.java
diff --git a/java/sca/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/java/sca/contrib/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/java/sca/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java b/java/sca/contrib/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/java/sca/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
+++ b/java/sca/contrib/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/contrib/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index 0f03d6e7a1..0f03d6e7a1 100644
--- a/java/sca/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca/samples/calculator-webapp/src/main/java/calculator/DivideService.java b/java/sca/contrib/samples/calculator-webapp/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/java/sca/samples/calculator-webapp/src/main/java/calculator/DivideService.java
+++ b/java/sca/contrib/samples/calculator-webapp/src/main/java/calculator/DivideService.java
diff --git a/java/sca/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/java/sca/contrib/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/java/sca/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java b/java/sca/contrib/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/java/sca/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
+++ b/java/sca/contrib/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca/contrib/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/java/sca/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca/samples/calculator-webapp/src/main/java/calculator/SubtractService.java b/java/sca/contrib/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/java/sca/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
+++ b/java/sca/contrib/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
diff --git a/java/sca/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/java/sca/contrib/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/java/sca/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca/contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 57d39cd8d8..57d39cd8d8 100644
--- a/java/sca/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/java/sca/contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/java/sca/samples/calculator-webapp/src/main/webapp/WEB-INF/web.composite b/java/sca/contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/web.composite
index 50c23af0b2..50c23af0b2 100644
--- a/java/sca/samples/calculator-webapp/src/main/webapp/WEB-INF/web.composite
+++ b/java/sca/contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/java/sca/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca/contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
index b5a828d55b..b5a828d55b 100644
--- a/java/sca/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca/samples/calculator-webapp/src/main/webapp/calc.jsp b/java/sca/contrib/samples/calculator-webapp/src/main/webapp/calc.jsp
index 4bc5c984dd..4bc5c984dd 100644
--- a/java/sca/samples/calculator-webapp/src/main/webapp/calc.jsp
+++ b/java/sca/contrib/samples/calculator-webapp/src/main/webapp/calc.jsp
diff --git a/java/sca/samples/calculator-ws-secure-webapp/README b/java/sca/contrib/samples/calculator-ws-secure-webapp/README
index d0d3307b3a..d0d3307b3a 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/README
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/README
diff --git a/java/sca/samples/calculator-ws-secure-webapp/calculator-web.png b/java/sca/contrib/samples/calculator-ws-secure-webapp/calculator-web.png
index f482b8d1c8..f482b8d1c8 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/calculator-web.png
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/calculator-web.png
diff --git a/java/sca/samples/calculator-ws-secure-webapp/calculator-web.svg b/java/sca/contrib/samples/calculator-ws-secure-webapp/calculator-web.svg
index 1b7015b156..1b7015b156 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/calculator-web.svg
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/calculator-web.svg
diff --git a/java/sca/samples/calculator-ws-secure-webapp/pom.xml b/java/sca/contrib/samples/calculator-ws-secure-webapp/pom.xml
index c6d24f4806..c6d24f4806 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/pom.xml
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/pom.xml
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
index c7e6383559..c7e6383559 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
index c79c7b0395..c79c7b0395 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
index 4787b728f4..4787b728f4 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index 0f03d6e7a1..0f03d6e7a1 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
index 8f6af2f224..8f6af2f224 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
index 9625c0d692..9625c0d692 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
index 23a62680c5..23a62680c5 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
index 4d511f887e..4d511f887e 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index 858e87a34f..858e87a34f 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
index b6b244244b..b6b244244b 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
index 4611669bbd..4611669bbd 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/security.properties b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
index 8ef9928018..8ef9928018 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
index fe09ab2e1b..fe09ab2e1b 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index d5c02e354d..d5c02e354d 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
index d3a62d39f4..d3a62d39f4 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
index 4c4366747d..4c4366747d 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
+++ b/java/sca/contrib/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
diff --git a/java/sca/samples/calculator-ws-webapp/README b/java/sca/contrib/samples/calculator-ws-webapp/README
index a6e6c897e4..a6e6c897e4 100644
--- a/java/sca/samples/calculator-ws-webapp/README
+++ b/java/sca/contrib/samples/calculator-ws-webapp/README
diff --git a/java/sca/samples/calculator-ws-webapp/calculator-web.png b/java/sca/contrib/samples/calculator-ws-webapp/calculator-web.png
index f482b8d1c8..f482b8d1c8 100644
--- a/java/sca/samples/calculator-ws-webapp/calculator-web.png
+++ b/java/sca/contrib/samples/calculator-ws-webapp/calculator-web.png
diff --git a/java/sca/samples/calculator-ws-webapp/calculator-web.svg b/java/sca/contrib/samples/calculator-ws-webapp/calculator-web.svg
index 1b7015b156..1b7015b156 100644
--- a/java/sca/samples/calculator-ws-webapp/calculator-web.svg
+++ b/java/sca/contrib/samples/calculator-ws-webapp/calculator-web.svg
diff --git a/java/sca/samples/calculator-ws-webapp/pom.xml b/java/sca/contrib/samples/calculator-ws-webapp/pom.xml
index e0543d94a8..e0543d94a8 100644
--- a/java/sca/samples/calculator-ws-webapp/pom.xml
+++ b/java/sca/contrib/samples/calculator-ws-webapp/pom.xml
diff --git a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
index c7e6383559..c7e6383559 100644
--- a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
+++ b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
diff --git a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
index 0af6d681ce..0af6d681ce 100644
--- a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
index 4787b728f4..4787b728f4 100644
--- a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
+++ b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index 0f03d6e7a1..0f03d6e7a1 100644
--- a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
+++ b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
diff --git a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
+++ b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
+++ b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
diff --git a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/java/sca/contrib/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca/samples/calculator-ws-webapp/src/main/resources/Calculator.composite b/java/sca/contrib/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
index 6415d5a896..6415d5a896 100644
--- a/java/sca/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
+++ b/java/sca/contrib/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
diff --git a/java/sca/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca/contrib/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
index fe09ab2e1b..fe09ab2e1b 100644
--- a/java/sca/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca/contrib/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 59bbb0de83..59bbb0de83 100644
--- a/java/sca/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/java/sca/contrib/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/java/sca/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca/contrib/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
index d3a62d39f4..d3a62d39f4 100644
--- a/java/sca/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/contrib/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca/samples/calculator-ws-webapp/src/main/webapp/calc.jsp b/java/sca/contrib/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
index 4c4366747d..4c4366747d 100644
--- a/java/sca/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
+++ b/java/sca/contrib/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
diff --git a/java/sca/samples/calculator2/README b/java/sca/contrib/samples/calculator2/README
index ceb532faed..ceb532faed 100644
--- a/java/sca/samples/calculator2/README
+++ b/java/sca/contrib/samples/calculator2/README
diff --git a/java/sca/samples/calculator2/build.xml b/java/sca/contrib/samples/calculator2/build.xml
index c4b755ef94..c4b755ef94 100644
--- a/java/sca/samples/calculator2/build.xml
+++ b/java/sca/contrib/samples/calculator2/build.xml
diff --git a/java/sca/samples/calculator-lean/calculator.png b/java/sca/contrib/samples/calculator2/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/java/sca/samples/calculator-lean/calculator.png
+++ b/java/sca/contrib/samples/calculator2/calculator.png
diff --git a/java/sca/samples/calculator2/calculator.svg b/java/sca/contrib/samples/calculator2/calculator.svg
index 0615925c50..0615925c50 100644
--- a/java/sca/samples/calculator2/calculator.svg
+++ b/java/sca/contrib/samples/calculator2/calculator.svg
diff --git a/java/sca/samples/calculator2/pom.xml b/java/sca/contrib/samples/calculator2/pom.xml
index 1f95585cbe..1f95585cbe 100644
--- a/java/sca/samples/calculator2/pom.xml
+++ b/java/sca/contrib/samples/calculator2/pom.xml
diff --git a/java/sca/samples/calculator-rcp/src/main/java/calculator/AddService.java b/java/sca/contrib/samples/calculator2/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/java/sca/samples/calculator-rcp/src/main/java/calculator/AddService.java
+++ b/java/sca/contrib/samples/calculator2/src/main/java/calculator/AddService.java
diff --git a/java/sca/samples/calculator-rcp/src/main/java/calculator/AddServiceImpl.java b/java/sca/contrib/samples/calculator2/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/java/sca/samples/calculator-rcp/src/main/java/calculator/AddServiceImpl.java
+++ b/java/sca/contrib/samples/calculator2/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca/samples/calculator2/src/main/java/calculator/CalculatorClient.java b/java/sca/contrib/samples/calculator2/src/main/java/calculator/CalculatorClient.java
index 9d180bf52e..9d180bf52e 100644
--- a/java/sca/samples/calculator2/src/main/java/calculator/CalculatorClient.java
+++ b/java/sca/contrib/samples/calculator2/src/main/java/calculator/CalculatorClient.java
diff --git a/java/sca/samples/calculator-lean/src/main/java/calculator/CalculatorService.java b/java/sca/contrib/samples/calculator2/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/java/sca/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
+++ b/java/sca/contrib/samples/calculator2/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/contrib/samples/calculator2/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/java/sca/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/java/sca/contrib/samples/calculator2/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca/samples/calculator-rcp/src/main/java/calculator/DivideService.java b/java/sca/contrib/samples/calculator2/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/java/sca/samples/calculator-rcp/src/main/java/calculator/DivideService.java
+++ b/java/sca/contrib/samples/calculator2/src/main/java/calculator/DivideService.java
diff --git a/java/sca/samples/calculator-rcp/src/main/java/calculator/DivideServiceImpl.java b/java/sca/contrib/samples/calculator2/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/java/sca/samples/calculator-rcp/src/main/java/calculator/DivideServiceImpl.java
+++ b/java/sca/contrib/samples/calculator2/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca/samples/calculator-script/src/main/java/calculator/MultiplyService.java b/java/sca/contrib/samples/calculator2/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/java/sca/samples/calculator-script/src/main/java/calculator/MultiplyService.java
+++ b/java/sca/contrib/samples/calculator2/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca/samples/calculator-rcp/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca/contrib/samples/calculator2/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/java/sca/samples/calculator-rcp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/java/sca/contrib/samples/calculator2/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca/samples/calculator-rcp/src/main/java/calculator/SubtractService.java b/java/sca/contrib/samples/calculator2/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/java/sca/samples/calculator-rcp/src/main/java/calculator/SubtractService.java
+++ b/java/sca/contrib/samples/calculator2/src/main/java/calculator/SubtractService.java
diff --git a/java/sca/samples/calculator-rcp/src/main/java/calculator/SubtractServiceImpl.java b/java/sca/contrib/samples/calculator2/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/java/sca/samples/calculator-rcp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/java/sca/contrib/samples/calculator2/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca/samples/calculator2/src/main/resources/Calculator.composite b/java/sca/contrib/samples/calculator2/src/main/resources/Calculator.composite
index 90872041b0..90872041b0 100644
--- a/java/sca/samples/calculator2/src/main/resources/Calculator.composite
+++ b/java/sca/contrib/samples/calculator2/src/main/resources/Calculator.composite
diff --git a/java/sca/samples/calculator2/src/test/java/calculator/CalculatorTestCase.java b/java/sca/contrib/samples/calculator2/src/test/java/calculator/CalculatorTestCase.java
index 775ad15537..775ad15537 100644
--- a/java/sca/samples/calculator2/src/test/java/calculator/CalculatorTestCase.java
+++ b/java/sca/contrib/samples/calculator2/src/test/java/calculator/CalculatorTestCase.java
diff --git a/java/sca/samples/callback-ws-client/README b/java/sca/contrib/samples/callback-ws-client/README
index 66121362c9..66121362c9 100644
--- a/java/sca/samples/callback-ws-client/README
+++ b/java/sca/contrib/samples/callback-ws-client/README
diff --git a/java/sca/samples/callback-ws-client/build.xml b/java/sca/contrib/samples/callback-ws-client/build.xml
index 8698c6018d..8698c6018d 100644
--- a/java/sca/samples/callback-ws-client/build.xml
+++ b/java/sca/contrib/samples/callback-ws-client/build.xml
diff --git a/java/sca/samples/callback-ws-client/callback-ws-client.png b/java/sca/contrib/samples/callback-ws-client/callback-ws-client.png
index 802ef604a7..802ef604a7 100644
--- a/java/sca/samples/callback-ws-client/callback-ws-client.png
+++ b/java/sca/contrib/samples/callback-ws-client/callback-ws-client.png
diff --git a/java/sca/samples/callback-ws-client/callback-ws-client.svg b/java/sca/contrib/samples/callback-ws-client/callback-ws-client.svg
index f49aeadbbf..f49aeadbbf 100644
--- a/java/sca/samples/callback-ws-client/callback-ws-client.svg
+++ b/java/sca/contrib/samples/callback-ws-client/callback-ws-client.svg
diff --git a/java/sca/samples/callback-ws-client/pom.xml b/java/sca/contrib/samples/callback-ws-client/pom.xml
index 4ac9e6cf81..4ac9e6cf81 100644
--- a/java/sca/samples/callback-ws-client/pom.xml
+++ b/java/sca/contrib/samples/callback-ws-client/pom.xml
diff --git a/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClient.java b/java/sca/contrib/samples/callback-ws-client/src/main/java/myapp/MyClient.java
index 329edbe1c8..329edbe1c8 100644
--- a/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClient.java
+++ b/java/sca/contrib/samples/callback-ws-client/src/main/java/myapp/MyClient.java
diff --git a/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java b/java/sca/contrib/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
index 4f3a3bb63b..4f3a3bb63b 100644
--- a/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
+++ b/java/sca/contrib/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
diff --git a/java/sca/samples/callback-ws-client/src/main/java/myserver/MyService.java b/java/sca/contrib/samples/callback-ws-client/src/main/java/myserver/MyService.java
index 9bc056318b..9bc056318b 100644
--- a/java/sca/samples/callback-ws-client/src/main/java/myserver/MyService.java
+++ b/java/sca/contrib/samples/callback-ws-client/src/main/java/myserver/MyService.java
diff --git a/java/sca/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java b/java/sca/contrib/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
index caef8fcc98..caef8fcc98 100644
--- a/java/sca/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
+++ b/java/sca/contrib/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
diff --git a/java/sca/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml b/java/sca/contrib/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
index 314747d548..314747d548 100644
--- a/java/sca/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/callback-ws-client/src/main/resources/myapp.composite b/java/sca/contrib/samples/callback-ws-client/src/main/resources/myapp.composite
index 5b776d6df8..5b776d6df8 100644
--- a/java/sca/samples/callback-ws-client/src/main/resources/myapp.composite
+++ b/java/sca/contrib/samples/callback-ws-client/src/main/resources/myapp.composite
diff --git a/java/sca/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java b/java/sca/contrib/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
index fb2f6952c4..fb2f6952c4 100644
--- a/java/sca/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
+++ b/java/sca/contrib/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
diff --git a/java/sca/samples/callback-ws-service/README b/java/sca/contrib/samples/callback-ws-service/README
index 2c65f745a6..2c65f745a6 100644
--- a/java/sca/samples/callback-ws-service/README
+++ b/java/sca/contrib/samples/callback-ws-service/README
diff --git a/java/sca/samples/callback-ws-service/build.xml b/java/sca/contrib/samples/callback-ws-service/build.xml
index c91dd88a8c..c91dd88a8c 100644
--- a/java/sca/samples/callback-ws-service/build.xml
+++ b/java/sca/contrib/samples/callback-ws-service/build.xml
diff --git a/java/sca/samples/callback-ws-service/callback-ws-service.png b/java/sca/contrib/samples/callback-ws-service/callback-ws-service.png
index 772ac38431..772ac38431 100644
--- a/java/sca/samples/callback-ws-service/callback-ws-service.png
+++ b/java/sca/contrib/samples/callback-ws-service/callback-ws-service.png
diff --git a/java/sca/samples/callback-ws-service/callback-ws-service.svg b/java/sca/contrib/samples/callback-ws-service/callback-ws-service.svg
index ff0a1d307b..ff0a1d307b 100644
--- a/java/sca/samples/callback-ws-service/callback-ws-service.svg
+++ b/java/sca/contrib/samples/callback-ws-service/callback-ws-service.svg
diff --git a/java/sca/samples/callback-ws-service/pom.xml b/java/sca/contrib/samples/callback-ws-service/pom.xml
index e39b4480a7..e39b4480a7 100644
--- a/java/sca/samples/callback-ws-service/pom.xml
+++ b/java/sca/contrib/samples/callback-ws-service/pom.xml
diff --git a/java/sca/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java b/java/sca/contrib/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
index 75ef05bc48..75ef05bc48 100644
--- a/java/sca/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
+++ b/java/sca/contrib/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
diff --git a/java/sca/samples/callback-ws-service/src/main/java/myserver/MyService.java b/java/sca/contrib/samples/callback-ws-service/src/main/java/myserver/MyService.java
index 9bc056318b..9bc056318b 100644
--- a/java/sca/samples/callback-ws-service/src/main/java/myserver/MyService.java
+++ b/java/sca/contrib/samples/callback-ws-service/src/main/java/myserver/MyService.java
diff --git a/java/sca/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java b/java/sca/contrib/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
index caef8fcc98..caef8fcc98 100644
--- a/java/sca/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
+++ b/java/sca/contrib/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
diff --git a/java/sca/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java b/java/sca/contrib/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
index 98833338f0..98833338f0 100644
--- a/java/sca/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
+++ b/java/sca/contrib/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
diff --git a/java/sca/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml b/java/sca/contrib/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
index 35f7f60c2e..35f7f60c2e 100644
--- a/java/sca/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/callback-ws-service/src/main/resources/callbackws.composite b/java/sca/contrib/samples/callback-ws-service/src/main/resources/callbackws.composite
index a09e638896..a09e638896 100644
--- a/java/sca/samples/callback-ws-service/src/main/resources/callbackws.composite
+++ b/java/sca/contrib/samples/callback-ws-service/src/main/resources/callbackws.composite
diff --git a/java/sca/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java b/java/sca/contrib/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
index e87667cc3e..e87667cc3e 100644
--- a/java/sca/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
+++ b/java/sca/contrib/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
diff --git a/java/sca/samples/callbacks-jms/README b/java/sca/contrib/samples/callbacks-jms/README
index b5e130e2fc..b5e130e2fc 100644
--- a/java/sca/samples/callbacks-jms/README
+++ b/java/sca/contrib/samples/callbacks-jms/README
diff --git a/java/sca/samples/callbacks-jms/build.xml b/java/sca/contrib/samples/callbacks-jms/build.xml
index 665feeca71..665feeca71 100644
--- a/java/sca/samples/callbacks-jms/build.xml
+++ b/java/sca/contrib/samples/callbacks-jms/build.xml
diff --git a/java/sca/samples/callbacks-jms/pom.xml b/java/sca/contrib/samples/callbacks-jms/pom.xml
index d7bef36033..d7bef36033 100644
--- a/java/sca/samples/callbacks-jms/pom.xml
+++ b/java/sca/contrib/samples/callbacks-jms/pom.xml
diff --git a/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java b/java/sca/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java
index 12533ff610..12533ff610 100644
--- a/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java
+++ b/java/sca/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java
diff --git a/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java b/java/sca/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java
index 69f5751379..69f5751379 100644
--- a/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java
+++ b/java/sca/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java
diff --git a/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java b/java/sca/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java
index 882bcf8479..882bcf8479 100644
--- a/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java
+++ b/java/sca/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java
diff --git a/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderService.java b/java/sca/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderService.java
index d0161b1498..d0161b1498 100644
--- a/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderService.java
+++ b/java/sca/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderService.java
diff --git a/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java b/java/sca/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java
index 757fe3ae41..757fe3ae41 100644
--- a/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java
+++ b/java/sca/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java
diff --git a/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java b/java/sca/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java
index 9de7307391..9de7307391 100644
--- a/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java
+++ b/java/sca/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java
diff --git a/java/sca/samples/callbacks-jms/src/main/resources/callbacks.composite b/java/sca/contrib/samples/callbacks-jms/src/main/resources/callbacks.composite
index 94dd29c45d..94dd29c45d 100644
--- a/java/sca/samples/callbacks-jms/src/main/resources/callbacks.composite
+++ b/java/sca/contrib/samples/callbacks-jms/src/main/resources/callbacks.composite
diff --git a/java/sca/samples/callbacks-jms/src/main/resources/jndi.properties b/java/sca/contrib/samples/callbacks-jms/src/main/resources/jndi.properties
index 698aeb1711..698aeb1711 100644
--- a/java/sca/samples/callbacks-jms/src/main/resources/jndi.properties
+++ b/java/sca/contrib/samples/callbacks-jms/src/main/resources/jndi.properties
diff --git a/java/sca/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java b/java/sca/contrib/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java
index 967fc42c64..967fc42c64 100644
--- a/java/sca/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java
+++ b/java/sca/contrib/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java
diff --git a/java/sca/samples/chat-webapp/README b/java/sca/contrib/samples/chat-webapp/README
index 09b9c6f6be..09b9c6f6be 100644
--- a/java/sca/samples/chat-webapp/README
+++ b/java/sca/contrib/samples/chat-webapp/README
diff --git a/java/sca/samples/chat-webapp/chat-webapp.png b/java/sca/contrib/samples/chat-webapp/chat-webapp.png
index fdf540d243..fdf540d243 100644
--- a/java/sca/samples/chat-webapp/chat-webapp.png
+++ b/java/sca/contrib/samples/chat-webapp/chat-webapp.png
diff --git a/java/sca/samples/chat-webapp/chat-webapp.svg b/java/sca/contrib/samples/chat-webapp/chat-webapp.svg
index b37c1dc590..b37c1dc590 100644
--- a/java/sca/samples/chat-webapp/chat-webapp.svg
+++ b/java/sca/contrib/samples/chat-webapp/chat-webapp.svg
diff --git a/java/sca/samples/chat-webapp/pom.xml b/java/sca/contrib/samples/chat-webapp/pom.xml
index 93fa269cf4..93fa269cf4 100644
--- a/java/sca/samples/chat-webapp/pom.xml
+++ b/java/sca/contrib/samples/chat-webapp/pom.xml
diff --git a/java/sca/samples/chat-webapp/src/main/java/sample/ChatService.java b/java/sca/contrib/samples/chat-webapp/src/main/java/sample/ChatService.java
index bf34675b8a..bf34675b8a 100644
--- a/java/sca/samples/chat-webapp/src/main/java/sample/ChatService.java
+++ b/java/sca/contrib/samples/chat-webapp/src/main/java/sample/ChatService.java
diff --git a/java/sca/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java b/java/sca/contrib/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
index f0725dd60c..f0725dd60c 100644
--- a/java/sca/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
+++ b/java/sca/contrib/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
diff --git a/java/sca/samples/chat-webapp/src/main/resources/chat.composite b/java/sca/contrib/samples/chat-webapp/src/main/resources/chat.composite
index c9ce95e2dc..c9ce95e2dc 100644
--- a/java/sca/samples/chat-webapp/src/main/resources/chat.composite
+++ b/java/sca/contrib/samples/chat-webapp/src/main/resources/chat.composite
diff --git a/java/sca/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca/contrib/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 897849ff8d..897849ff8d 100644
--- a/java/sca/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca/contrib/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
index 97d91fec56..97d91fec56 100644
--- a/java/sca/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/contrib/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca/samples/chat-webapp/src/main/webapp/chat.html b/java/sca/contrib/samples/chat-webapp/src/main/webapp/chat.html
index 7a449a906a..7a449a906a 100644
--- a/java/sca/samples/chat-webapp/src/main/webapp/chat.html
+++ b/java/sca/contrib/samples/chat-webapp/src/main/webapp/chat.html
diff --git a/java/sca/samples/chat2-webapp/README b/java/sca/contrib/samples/chat2-webapp/README
index 0186006211..0186006211 100644
--- a/java/sca/samples/chat2-webapp/README
+++ b/java/sca/contrib/samples/chat2-webapp/README
diff --git a/java/sca/samples/chat2-webapp/build.xml b/java/sca/contrib/samples/chat2-webapp/build.xml
index 2d3fc0c5f3..2d3fc0c5f3 100644
--- a/java/sca/samples/chat2-webapp/build.xml
+++ b/java/sca/contrib/samples/chat2-webapp/build.xml
diff --git a/java/sca/samples/chat2-webapp/pom.xml b/java/sca/contrib/samples/chat2-webapp/pom.xml
index e35891561b..e35891561b 100644
--- a/java/sca/samples/chat2-webapp/pom.xml
+++ b/java/sca/contrib/samples/chat2-webapp/pom.xml
diff --git a/java/sca/samples/chat2-webapp/src/main/java/sample/ChatCallback.java b/java/sca/contrib/samples/chat2-webapp/src/main/java/sample/ChatCallback.java
index 261eb12124..261eb12124 100644
--- a/java/sca/samples/chat2-webapp/src/main/java/sample/ChatCallback.java
+++ b/java/sca/contrib/samples/chat2-webapp/src/main/java/sample/ChatCallback.java
diff --git a/java/sca/samples/chat2-webapp/src/main/java/sample/ChatService.java b/java/sca/contrib/samples/chat2-webapp/src/main/java/sample/ChatService.java
index a5aff8f316..a5aff8f316 100644
--- a/java/sca/samples/chat2-webapp/src/main/java/sample/ChatService.java
+++ b/java/sca/contrib/samples/chat2-webapp/src/main/java/sample/ChatService.java
diff --git a/java/sca/samples/chat2-webapp/src/main/java/sample/ChatServiceImpl.java b/java/sca/contrib/samples/chat2-webapp/src/main/java/sample/ChatServiceImpl.java
index fd22fb70e8..fd22fb70e8 100644
--- a/java/sca/samples/chat2-webapp/src/main/java/sample/ChatServiceImpl.java
+++ b/java/sca/contrib/samples/chat2-webapp/src/main/java/sample/ChatServiceImpl.java
diff --git a/java/sca/samples/chat2-webapp/src/main/resources/chat.composite b/java/sca/contrib/samples/chat2-webapp/src/main/resources/chat.composite
index 93a10d0fdf..93a10d0fdf 100644
--- a/java/sca/samples/chat2-webapp/src/main/resources/chat.composite
+++ b/java/sca/contrib/samples/chat2-webapp/src/main/resources/chat.composite
diff --git a/java/sca/samples/chat2-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca/contrib/samples/chat2-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 897849ff8d..897849ff8d 100644
--- a/java/sca/samples/chat2-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/chat2-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/chat2-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca/contrib/samples/chat2-webapp/src/main/webapp/WEB-INF/web.xml
index 6919372e87..6919372e87 100644
--- a/java/sca/samples/chat2-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/contrib/samples/chat2-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca/samples/chat2-webapp/src/main/webapp/chat.html b/java/sca/contrib/samples/chat2-webapp/src/main/webapp/chat.html
index a063e27f8e..a063e27f8e 100644
--- a/java/sca/samples/chat2-webapp/src/main/webapp/chat.html
+++ b/java/sca/contrib/samples/chat2-webapp/src/main/webapp/chat.html
diff --git a/java/sca/samples/customer-dojo-webapp/README b/java/sca/contrib/samples/customer-dojo-webapp/README
index 9c1729123f..9c1729123f 100644
--- a/java/sca/samples/customer-dojo-webapp/README
+++ b/java/sca/contrib/samples/customer-dojo-webapp/README
diff --git a/java/sca/samples/customer-dojo-webapp/build-dojo.xml b/java/sca/contrib/samples/customer-dojo-webapp/build-dojo.xml
index 534a1dacd9..534a1dacd9 100644
--- a/java/sca/samples/customer-dojo-webapp/build-dojo.xml
+++ b/java/sca/contrib/samples/customer-dojo-webapp/build-dojo.xml
diff --git a/java/sca/samples/customer-dojo-webapp/build.xml b/java/sca/contrib/samples/customer-dojo-webapp/build.xml
index 95813af65a..95813af65a 100644
--- a/java/sca/samples/customer-dojo-webapp/build.xml
+++ b/java/sca/contrib/samples/customer-dojo-webapp/build.xml
diff --git a/java/sca/samples/customer-dojo-webapp/customer-dojo-jsonrpc.png b/java/sca/contrib/samples/customer-dojo-webapp/customer-dojo-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/java/sca/samples/customer-dojo-webapp/customer-dojo-jsonrpc.png
+++ b/java/sca/contrib/samples/customer-dojo-webapp/customer-dojo-jsonrpc.png
diff --git a/java/sca/samples/customer-dojo-webapp/customer-dojo-jsonrpc.svg b/java/sca/contrib/samples/customer-dojo-webapp/customer-dojo-jsonrpc.svg
index d5c3bc5d3e..d5c3bc5d3e 100644
--- a/java/sca/samples/customer-dojo-webapp/customer-dojo-jsonrpc.svg
+++ b/java/sca/contrib/samples/customer-dojo-webapp/customer-dojo-jsonrpc.svg
diff --git a/java/sca/samples/customer-dojo-webapp/customer.sql b/java/sca/contrib/samples/customer-dojo-webapp/customer.sql
index a3caf8e050..a3caf8e050 100644
--- a/java/sca/samples/customer-dojo-webapp/customer.sql
+++ b/java/sca/contrib/samples/customer-dojo-webapp/customer.sql
diff --git a/java/sca/samples/customer-dojo-webapp/pom.xml b/java/sca/contrib/samples/customer-dojo-webapp/pom.xml
index 2474a561fb..2474a561fb 100644
--- a/java/sca/samples/customer-dojo-webapp/pom.xml
+++ b/java/sca/contrib/samples/customer-dojo-webapp/pom.xml
diff --git a/java/sca/samples/customer-dojo-webapp/src/main/java/customer/Customer.java b/java/sca/contrib/samples/customer-dojo-webapp/src/main/java/customer/Customer.java
index 6d207ea2ef..6d207ea2ef 100644
--- a/java/sca/samples/customer-dojo-webapp/src/main/java/customer/Customer.java
+++ b/java/sca/contrib/samples/customer-dojo-webapp/src/main/java/customer/Customer.java
diff --git a/java/sca/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java b/java/sca/contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java
index 5ad39aad5c..5ad39aad5c 100644
--- a/java/sca/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java
+++ b/java/sca/contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java
diff --git a/java/sca/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java b/java/sca/contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java
index c0a2f25f15..c0a2f25f15 100644
--- a/java/sca/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java
+++ b/java/sca/contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java
diff --git a/java/sca/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java b/java/sca/contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java
index b3c965f1f7..b3c965f1f7 100644
--- a/java/sca/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java
+++ b/java/sca/contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java
diff --git a/java/sca/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java b/java/sca/contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java
index 2bd49e2cf1..2bd49e2cf1 100644
--- a/java/sca/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java
+++ b/java/sca/contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java
diff --git a/java/sca/samples/customer-dojo-webapp/src/main/java/launch/Launch.java b/java/sca/contrib/samples/customer-dojo-webapp/src/main/java/launch/Launch.java
index d7f88b8dd4..d7f88b8dd4 100644
--- a/java/sca/samples/customer-dojo-webapp/src/main/java/launch/Launch.java
+++ b/java/sca/contrib/samples/customer-dojo-webapp/src/main/java/launch/Launch.java
diff --git a/java/sca/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml b/java/sca/contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml
index 64be295302..64be295302 100644
--- a/java/sca/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml
+++ b/java/sca/contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml
diff --git a/java/sca/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml b/java/sca/contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml
index 5674dede06..5674dede06 100644
--- a/java/sca/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml
+++ b/java/sca/contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml
diff --git a/java/sca/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml b/java/sca/contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml
index 136326d1d3..136326d1d3 100644
--- a/java/sca/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/customer-dojo-webapp/src/main/resources/customer.composite b/java/sca/contrib/samples/customer-dojo-webapp/src/main/resources/customer.composite
index 8b8a413499..8b8a413499 100644
--- a/java/sca/samples/customer-dojo-webapp/src/main/resources/customer.composite
+++ b/java/sca/contrib/samples/customer-dojo-webapp/src/main/resources/customer.composite
diff --git a/java/sca/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca/contrib/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 32f11ab9d0..32f11ab9d0 100644
--- a/java/sca/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca/contrib/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 3e72bf29a4..3e72bf29a4 100644
--- a/java/sca/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/java/sca/contrib/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/java/sca/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca/contrib/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml
index d90b4a7d62..d90b4a7d62 100644
--- a/java/sca/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/contrib/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca/samples/customer-dojo-webapp/src/main/webapp/customer.jsp b/java/sca/contrib/samples/customer-dojo-webapp/src/main/webapp/customer.jsp
index f7e864053e..f7e864053e 100644
--- a/java/sca/samples/customer-dojo-webapp/src/main/webapp/customer.jsp
+++ b/java/sca/contrib/samples/customer-dojo-webapp/src/main/webapp/customer.jsp
diff --git a/java/sca/samples/customer-dojo/README b/java/sca/contrib/samples/customer-dojo/README
index 9c1729123f..9c1729123f 100644
--- a/java/sca/samples/customer-dojo/README
+++ b/java/sca/contrib/samples/customer-dojo/README
diff --git a/java/sca/samples/customer-dojo/build-dojo.xml b/java/sca/contrib/samples/customer-dojo/build-dojo.xml
index 8c6bd99484..8c6bd99484 100644
--- a/java/sca/samples/customer-dojo/build-dojo.xml
+++ b/java/sca/contrib/samples/customer-dojo/build-dojo.xml
diff --git a/java/sca/samples/customer-dojo/build.xml b/java/sca/contrib/samples/customer-dojo/build.xml
index 95813af65a..95813af65a 100644
--- a/java/sca/samples/customer-dojo/build.xml
+++ b/java/sca/contrib/samples/customer-dojo/build.xml
diff --git a/java/sca/samples/customer-dojo/customer-dojo-jsonrpc.png b/java/sca/contrib/samples/customer-dojo/customer-dojo-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/java/sca/samples/customer-dojo/customer-dojo-jsonrpc.png
+++ b/java/sca/contrib/samples/customer-dojo/customer-dojo-jsonrpc.png
diff --git a/java/sca/samples/customer-dojo/customer-dojo-jsonrpc.svg b/java/sca/contrib/samples/customer-dojo/customer-dojo-jsonrpc.svg
index d5c3bc5d3e..d5c3bc5d3e 100644
--- a/java/sca/samples/customer-dojo/customer-dojo-jsonrpc.svg
+++ b/java/sca/contrib/samples/customer-dojo/customer-dojo-jsonrpc.svg
diff --git a/java/sca/samples/customer-dojo/customer.sql b/java/sca/contrib/samples/customer-dojo/customer.sql
index a3caf8e050..a3caf8e050 100644
--- a/java/sca/samples/customer-dojo/customer.sql
+++ b/java/sca/contrib/samples/customer-dojo/customer.sql
diff --git a/java/sca/samples/customer-dojo/pom.xml b/java/sca/contrib/samples/customer-dojo/pom.xml
index 5c64caaad4..5c64caaad4 100644
--- a/java/sca/samples/customer-dojo/pom.xml
+++ b/java/sca/contrib/samples/customer-dojo/pom.xml
diff --git a/java/sca/samples/customer-dojo/src/main/java/customer/Customer.java b/java/sca/contrib/samples/customer-dojo/src/main/java/customer/Customer.java
index 6d207ea2ef..6d207ea2ef 100644
--- a/java/sca/samples/customer-dojo/src/main/java/customer/Customer.java
+++ b/java/sca/contrib/samples/customer-dojo/src/main/java/customer/Customer.java
diff --git a/java/sca/samples/customer-dojo/src/main/java/customer/CustomerCollection.java b/java/sca/contrib/samples/customer-dojo/src/main/java/customer/CustomerCollection.java
index 5ad39aad5c..5ad39aad5c 100644
--- a/java/sca/samples/customer-dojo/src/main/java/customer/CustomerCollection.java
+++ b/java/sca/contrib/samples/customer-dojo/src/main/java/customer/CustomerCollection.java
diff --git a/java/sca/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java b/java/sca/contrib/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java
index c0a2f25f15..c0a2f25f15 100644
--- a/java/sca/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java
+++ b/java/sca/contrib/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java
diff --git a/java/sca/samples/customer-dojo/src/main/java/customer/CustomerService.java b/java/sca/contrib/samples/customer-dojo/src/main/java/customer/CustomerService.java
index b3c965f1f7..b3c965f1f7 100644
--- a/java/sca/samples/customer-dojo/src/main/java/customer/CustomerService.java
+++ b/java/sca/contrib/samples/customer-dojo/src/main/java/customer/CustomerService.java
diff --git a/java/sca/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java b/java/sca/contrib/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java
index 2bd49e2cf1..2bd49e2cf1 100644
--- a/java/sca/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java
+++ b/java/sca/contrib/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java
diff --git a/java/sca/samples/customer-dojo/src/main/java/launch/Launch.java b/java/sca/contrib/samples/customer-dojo/src/main/java/launch/Launch.java
index a51ab605bc..a51ab605bc 100644
--- a/java/sca/samples/customer-dojo/src/main/java/launch/Launch.java
+++ b/java/sca/contrib/samples/customer-dojo/src/main/java/launch/Launch.java
diff --git a/java/sca/samples/customer-dojo/src/main/resources/META-INF/orm.xml b/java/sca/contrib/samples/customer-dojo/src/main/resources/META-INF/orm.xml
index 64be295302..64be295302 100644
--- a/java/sca/samples/customer-dojo/src/main/resources/META-INF/orm.xml
+++ b/java/sca/contrib/samples/customer-dojo/src/main/resources/META-INF/orm.xml
diff --git a/java/sca/samples/customer-dojo/src/main/resources/META-INF/persistence.xml b/java/sca/contrib/samples/customer-dojo/src/main/resources/META-INF/persistence.xml
index 5add897279..5add897279 100644
--- a/java/sca/samples/customer-dojo/src/main/resources/META-INF/persistence.xml
+++ b/java/sca/contrib/samples/customer-dojo/src/main/resources/META-INF/persistence.xml
diff --git a/java/sca/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml b/java/sca/contrib/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml
index 136326d1d3..136326d1d3 100644
--- a/java/sca/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/customer-dojo/src/main/resources/content/customer.html b/java/sca/contrib/samples/customer-dojo/src/main/resources/content/customer.html
index dbc8aad9d0..dbc8aad9d0 100644
--- a/java/sca/samples/customer-dojo/src/main/resources/content/customer.html
+++ b/java/sca/contrib/samples/customer-dojo/src/main/resources/content/customer.html
diff --git a/java/sca/samples/customer-dojo/src/main/resources/customer.composite b/java/sca/contrib/samples/customer-dojo/src/main/resources/customer.composite
index 4c370f2a9f..4c370f2a9f 100644
--- a/java/sca/samples/customer-dojo/src/main/resources/customer.composite
+++ b/java/sca/contrib/samples/customer-dojo/src/main/resources/customer.composite
diff --git a/java/sca/samples/databinding-echo/README b/java/sca/contrib/samples/databinding-echo/README
index 67c1aa32d5..67c1aa32d5 100644
--- a/java/sca/samples/databinding-echo/README
+++ b/java/sca/contrib/samples/databinding-echo/README
diff --git a/java/sca/samples/databinding-echo/build.xml b/java/sca/contrib/samples/databinding-echo/build.xml
index 7f2483f6fb..7f2483f6fb 100644
--- a/java/sca/samples/databinding-echo/build.xml
+++ b/java/sca/contrib/samples/databinding-echo/build.xml
diff --git a/java/sca/samples/databinding-echo/databinding-echo.png b/java/sca/contrib/samples/databinding-echo/databinding-echo.png
index afbbfff285..afbbfff285 100644
--- a/java/sca/samples/databinding-echo/databinding-echo.png
+++ b/java/sca/contrib/samples/databinding-echo/databinding-echo.png
diff --git a/java/sca/samples/databinding-echo/databinding-echo.svg b/java/sca/contrib/samples/databinding-echo/databinding-echo.svg
index 87964abf86..87964abf86 100644
--- a/java/sca/samples/databinding-echo/databinding-echo.svg
+++ b/java/sca/contrib/samples/databinding-echo/databinding-echo.svg
diff --git a/java/sca/samples/databinding-echo/pom.xml b/java/sca/contrib/samples/databinding-echo/pom.xml
index 3010c7e89e..3010c7e89e 100644
--- a/java/sca/samples/databinding-echo/pom.xml
+++ b/java/sca/contrib/samples/databinding-echo/pom.xml
diff --git a/java/sca/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java b/java/sca/contrib/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
index 29a5e5c9ad..29a5e5c9ad 100644
--- a/java/sca/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
+++ b/java/sca/contrib/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
diff --git a/java/sca/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java b/java/sca/contrib/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
index e98cd55bcf..e98cd55bcf 100644
--- a/java/sca/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
+++ b/java/sca/contrib/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
diff --git a/java/sca/samples/databinding-echo/src/main/java/dbecho/Echo.java b/java/sca/contrib/samples/databinding-echo/src/main/java/dbecho/Echo.java
index b47a9c1b85..b47a9c1b85 100644
--- a/java/sca/samples/databinding-echo/src/main/java/dbecho/Echo.java
+++ b/java/sca/contrib/samples/databinding-echo/src/main/java/dbecho/Echo.java
diff --git a/java/sca/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java b/java/sca/contrib/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
index 9ec3819899..9ec3819899 100644
--- a/java/sca/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
+++ b/java/sca/contrib/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
diff --git a/java/sca/samples/databinding-echo/src/main/java/dbecho/Interface1.java b/java/sca/contrib/samples/databinding-echo/src/main/java/dbecho/Interface1.java
index 9fff3bb4b9..9fff3bb4b9 100644
--- a/java/sca/samples/databinding-echo/src/main/java/dbecho/Interface1.java
+++ b/java/sca/contrib/samples/databinding-echo/src/main/java/dbecho/Interface1.java
diff --git a/java/sca/samples/databinding-echo/src/main/java/dbecho/Interface2.java b/java/sca/contrib/samples/databinding-echo/src/main/java/dbecho/Interface2.java
index 61ed7951e4..61ed7951e4 100644
--- a/java/sca/samples/databinding-echo/src/main/java/dbecho/Interface2.java
+++ b/java/sca/contrib/samples/databinding-echo/src/main/java/dbecho/Interface2.java
diff --git a/java/sca/samples/databinding-echo/src/main/resources/EchoDataBinding.composite b/java/sca/contrib/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
index 30b77a6152..30b77a6152 100644
--- a/java/sca/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
+++ b/java/sca/contrib/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
diff --git a/java/sca/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl b/java/sca/contrib/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
index ef2308aa73..ef2308aa73 100644
--- a/java/sca/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
+++ b/java/sca/contrib/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
diff --git a/java/sca/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java b/java/sca/contrib/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
index 43434d8cee..43434d8cee 100644
--- a/java/sca/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
+++ b/java/sca/contrib/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
diff --git a/java/sca/samples/domain-management/README b/java/sca/contrib/samples/domain-management/README
index 6280a28028..6280a28028 100644
--- a/java/sca/samples/domain-management/README
+++ b/java/sca/contrib/samples/domain-management/README
diff --git a/java/sca/samples/domain-management/pom.xml b/java/sca/contrib/samples/domain-management/pom.xml
index a64e411922..a64e411922 100644
--- a/java/sca/samples/domain-management/pom.xml
+++ b/java/sca/contrib/samples/domain-management/pom.xml
diff --git a/java/sca/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java b/java/sca/contrib/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
index 28eede693d..28eede693d 100644
--- a/java/sca/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
+++ b/java/sca/contrib/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
diff --git a/java/sca/samples/domain-management/src/main/java/manager/DistributeComponents.java b/java/sca/contrib/samples/domain-management/src/main/java/manager/DistributeComponents.java
index def0a1894f..def0a1894f 100644
--- a/java/sca/samples/domain-management/src/main/java/manager/DistributeComponents.java
+++ b/java/sca/contrib/samples/domain-management/src/main/java/manager/DistributeComponents.java
diff --git a/java/sca/samples/domain-management/src/main/java/manager/ListComponents.java b/java/sca/contrib/samples/domain-management/src/main/java/manager/ListComponents.java
index 27cb31d57f..27cb31d57f 100644
--- a/java/sca/samples/domain-management/src/main/java/manager/ListComponents.java
+++ b/java/sca/contrib/samples/domain-management/src/main/java/manager/ListComponents.java
diff --git a/java/sca/samples/domain-management/src/main/java/manager/ListDependencies.java b/java/sca/contrib/samples/domain-management/src/main/java/manager/ListDependencies.java
index 1bf8124682..1bf8124682 100644
--- a/java/sca/samples/domain-management/src/main/java/manager/ListDependencies.java
+++ b/java/sca/contrib/samples/domain-management/src/main/java/manager/ListDependencies.java
diff --git a/java/sca/samples/domain-management/src/main/java/manager/ListDeployables.java b/java/sca/contrib/samples/domain-management/src/main/java/manager/ListDeployables.java
index f5f0b9c655..f5f0b9c655 100644
--- a/java/sca/samples/domain-management/src/main/java/manager/ListDeployables.java
+++ b/java/sca/contrib/samples/domain-management/src/main/java/manager/ListDeployables.java
diff --git a/java/sca/samples/domain-management/src/main/java/manager/WireComponents.java b/java/sca/contrib/samples/domain-management/src/main/java/manager/WireComponents.java
index d24d5c67c9..d24d5c67c9 100644
--- a/java/sca/samples/domain-management/src/main/java/manager/WireComponents.java
+++ b/java/sca/contrib/samples/domain-management/src/main/java/manager/WireComponents.java
diff --git a/java/sca/samples/domain-management/src/test/java/services/Cart.java b/java/sca/contrib/samples/domain-management/src/test/java/services/Cart.java
index 3fb5439bc3..3fb5439bc3 100644
--- a/java/sca/samples/domain-management/src/test/java/services/Cart.java
+++ b/java/sca/contrib/samples/domain-management/src/test/java/services/Cart.java
diff --git a/java/sca/samples/domain-management/src/test/java/services/Item.java b/java/sca/contrib/samples/domain-management/src/test/java/services/Item.java
index 81cefcdbef..81cefcdbef 100644
--- a/java/sca/samples/domain-management/src/test/java/services/Item.java
+++ b/java/sca/contrib/samples/domain-management/src/test/java/services/Item.java
diff --git a/java/sca/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java b/java/sca/contrib/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java
index f053ec9f48..f053ec9f48 100644
--- a/java/sca/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java
+++ b/java/sca/contrib/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java
diff --git a/java/sca/samples/domain-management/src/test/java/services/ShoppingCartImpl.java b/java/sca/contrib/samples/domain-management/src/test/java/services/ShoppingCartImpl.java
index 9ef59df7a8..9ef59df7a8 100644
--- a/java/sca/samples/domain-management/src/test/java/services/ShoppingCartImpl.java
+++ b/java/sca/contrib/samples/domain-management/src/test/java/services/ShoppingCartImpl.java
diff --git a/java/sca/samples/domain-management/src/test/resources/assembly/assets.xml b/java/sca/contrib/samples/domain-management/src/test/resources/assembly/assets.xml
index 10693a89e6..10693a89e6 100644
--- a/java/sca/samples/domain-management/src/test/resources/assembly/assets.xml
+++ b/java/sca/contrib/samples/domain-management/src/test/resources/assembly/assets.xml
diff --git a/java/sca/samples/domain-management/src/test/resources/assembly/client.xml b/java/sca/contrib/samples/domain-management/src/test/resources/assembly/client.xml
index 5b34693bee..5b34693bee 100644
--- a/java/sca/samples/domain-management/src/test/resources/assembly/client.xml
+++ b/java/sca/contrib/samples/domain-management/src/test/resources/assembly/client.xml
diff --git a/java/sca/samples/domain-management/src/test/resources/assembly/store.xml b/java/sca/contrib/samples/domain-management/src/test/resources/assembly/store.xml
index d19b7eb161..d19b7eb161 100644
--- a/java/sca/samples/domain-management/src/test/resources/assembly/store.xml
+++ b/java/sca/contrib/samples/domain-management/src/test/resources/assembly/store.xml
diff --git a/java/sca/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml b/java/sca/contrib/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
index 33fe814c3a..33fe814c3a 100644
--- a/java/sca/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml b/java/sca/contrib/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml
index 14e1cdb672..14e1cdb672 100644
--- a/java/sca/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/domain-management/src/test/resources/client/client.composite b/java/sca/contrib/samples/domain-management/src/test/resources/client/client.composite
index 1279b319c4..1279b319c4 100644
--- a/java/sca/samples/domain-management/src/test/resources/client/client.composite
+++ b/java/sca/contrib/samples/domain-management/src/test/resources/client/client.composite
diff --git a/java/sca/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml b/java/sca/contrib/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml
index 52348106f2..52348106f2 100644
--- a/java/sca/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/domain-management/src/test/resources/store/store.composite b/java/sca/contrib/samples/domain-management/src/test/resources/store/store.composite
index d4f18771d8..d4f18771d8 100644
--- a/java/sca/samples/domain-management/src/test/resources/store/store.composite
+++ b/java/sca/contrib/samples/domain-management/src/test/resources/store/store.composite
diff --git a/java/sca/samples/domain-webapp/README b/java/sca/contrib/samples/domain-webapp/README
index c01a0dd39a..c01a0dd39a 100644
--- a/java/sca/samples/domain-webapp/README
+++ b/java/sca/contrib/samples/domain-webapp/README
diff --git a/java/sca/samples/domain-webapp/build.xml b/java/sca/contrib/samples/domain-webapp/build.xml
index e008e3c9f0..e008e3c9f0 100644
--- a/java/sca/samples/domain-webapp/build.xml
+++ b/java/sca/contrib/samples/domain-webapp/build.xml
diff --git a/java/sca/samples/domain-webapp/pom.xml b/java/sca/contrib/samples/domain-webapp/pom.xml
index 0b4309a244..0b4309a244 100644
--- a/java/sca/samples/domain-webapp/pom.xml
+++ b/java/sca/contrib/samples/domain-webapp/pom.xml
diff --git a/java/sca/samples/domain-webapp/src/main/java/node/DomainServer.java b/java/sca/contrib/samples/domain-webapp/src/main/java/node/DomainServer.java
index ea3cddc01b..ea3cddc01b 100644
--- a/java/sca/samples/domain-webapp/src/main/java/node/DomainServer.java
+++ b/java/sca/contrib/samples/domain-webapp/src/main/java/node/DomainServer.java
diff --git a/java/sca/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml b/java/sca/contrib/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml
index fbe5880db6..fbe5880db6 100755
--- a/java/sca/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/domain-webapp/src/main/resources/domain.composite b/java/sca/contrib/samples/domain-webapp/src/main/resources/domain.composite
index dbaaebd3c7..dbaaebd3c7 100644
--- a/java/sca/samples/domain-webapp/src/main/resources/domain.composite
+++ b/java/sca/contrib/samples/domain-webapp/src/main/resources/domain.composite
diff --git a/java/sca/samples/domain-webapp/src/main/resources/webroot/index.html b/java/sca/contrib/samples/domain-webapp/src/main/resources/webroot/index.html
index 425bd73734..425bd73734 100644
--- a/java/sca/samples/domain-webapp/src/main/resources/webroot/index.html
+++ b/java/sca/contrib/samples/domain-webapp/src/main/resources/webroot/index.html
diff --git a/java/sca/samples/domain-webapp/src/main/resources/webroot/node.png b/java/sca/contrib/samples/domain-webapp/src/main/resources/webroot/node.png
index b3c949d224..b3c949d224 100644
--- a/java/sca/samples/domain-webapp/src/main/resources/webroot/node.png
+++ b/java/sca/contrib/samples/domain-webapp/src/main/resources/webroot/node.png
diff --git a/java/sca/samples/domain-webapp/src/main/resources/webroot/style.css b/java/sca/contrib/samples/domain-webapp/src/main/resources/webroot/style.css
index f5bbf23379..f5bbf23379 100644
--- a/java/sca/samples/domain-webapp/src/main/resources/webroot/style.css
+++ b/java/sca/contrib/samples/domain-webapp/src/main/resources/webroot/style.css
diff --git a/java/sca/samples/feed-aggregator-webapp/README b/java/sca/contrib/samples/feed-aggregator-webapp/README
index 3668a7705e..3668a7705e 100644
--- a/java/sca/samples/feed-aggregator-webapp/README
+++ b/java/sca/contrib/samples/feed-aggregator-webapp/README
diff --git a/java/sca/samples/feed-aggregator-webapp/feed-aggregator-webapp.png b/java/sca/contrib/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
index 1af95a5eff..1af95a5eff 100644
--- a/java/sca/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
+++ b/java/sca/contrib/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
diff --git a/java/sca/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg b/java/sca/contrib/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
index a861a5c50f..a861a5c50f 100644
--- a/java/sca/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
+++ b/java/sca/contrib/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
diff --git a/java/sca/samples/feed-aggregator-webapp/pom.xml b/java/sca/contrib/samples/feed-aggregator-webapp/pom.xml
index 874327c7b1..874327c7b1 100644
--- a/java/sca/samples/feed-aggregator-webapp/pom.xml
+++ b/java/sca/contrib/samples/feed-aggregator-webapp/pom.xml
diff --git a/java/sca/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java b/java/sca/contrib/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
index 2c90c0db8c..2c90c0db8c 100644
--- a/java/sca/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
+++ b/java/sca/contrib/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
diff --git a/java/sca/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java b/java/sca/contrib/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
index dec073c36b..dec073c36b 100644
--- a/java/sca/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
+++ b/java/sca/contrib/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
diff --git a/java/sca/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java b/java/sca/contrib/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
index 354ef2d369..354ef2d369 100644
--- a/java/sca/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
+++ b/java/sca/contrib/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
diff --git a/java/sca/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite b/java/sca/contrib/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
index 736563098f..736563098f 100644
--- a/java/sca/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
+++ b/java/sca/contrib/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
diff --git a/java/sca/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca/contrib/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
index b67fe843ca..b67fe843ca 100644
--- a/java/sca/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca/contrib/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
index dea3980e4d..dea3980e4d 100644
--- a/java/sca/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/contrib/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca/samples/feed-aggregator-webapp/src/main/webapp/index.html b/java/sca/contrib/samples/feed-aggregator-webapp/src/main/webapp/index.html
index 7b33391a87..7b33391a87 100644
--- a/java/sca/samples/feed-aggregator-webapp/src/main/webapp/index.html
+++ b/java/sca/contrib/samples/feed-aggregator-webapp/src/main/webapp/index.html
diff --git a/java/sca/samples/feed-aggregator/README b/java/sca/contrib/samples/feed-aggregator/README
index f73baec2fd..f73baec2fd 100644
--- a/java/sca/samples/feed-aggregator/README
+++ b/java/sca/contrib/samples/feed-aggregator/README
diff --git a/java/sca/samples/feed-aggregator/build.xml b/java/sca/contrib/samples/feed-aggregator/build.xml
index 0ab6fed7fc..0ab6fed7fc 100644
--- a/java/sca/samples/feed-aggregator/build.xml
+++ b/java/sca/contrib/samples/feed-aggregator/build.xml
diff --git a/java/sca/samples/feed-aggregator/feed-aggregator.png b/java/sca/contrib/samples/feed-aggregator/feed-aggregator.png
index c8fea8a7b8..c8fea8a7b8 100644
--- a/java/sca/samples/feed-aggregator/feed-aggregator.png
+++ b/java/sca/contrib/samples/feed-aggregator/feed-aggregator.png
diff --git a/java/sca/samples/feed-aggregator/feed-aggregator.svg b/java/sca/contrib/samples/feed-aggregator/feed-aggregator.svg
index 72fe6a00ac..72fe6a00ac 100644
--- a/java/sca/samples/feed-aggregator/feed-aggregator.svg
+++ b/java/sca/contrib/samples/feed-aggregator/feed-aggregator.svg
diff --git a/java/sca/samples/feed-aggregator/pom.xml b/java/sca/contrib/samples/feed-aggregator/pom.xml
index ae2aee112c..ae2aee112c 100644
--- a/java/sca/samples/feed-aggregator/pom.xml
+++ b/java/sca/contrib/samples/feed-aggregator/pom.xml
diff --git a/java/sca/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java b/java/sca/contrib/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
index 999e9d5520..999e9d5520 100644
--- a/java/sca/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
+++ b/java/sca/contrib/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
diff --git a/java/sca/samples/feed-aggregator/src/main/java/feed/Sort.java b/java/sca/contrib/samples/feed-aggregator/src/main/java/feed/Sort.java
index dec073c36b..dec073c36b 100644
--- a/java/sca/samples/feed-aggregator/src/main/java/feed/Sort.java
+++ b/java/sca/contrib/samples/feed-aggregator/src/main/java/feed/Sort.java
diff --git a/java/sca/samples/feed-aggregator/src/main/java/feed/SortImpl.java b/java/sca/contrib/samples/feed-aggregator/src/main/java/feed/SortImpl.java
index 354ef2d369..354ef2d369 100644
--- a/java/sca/samples/feed-aggregator/src/main/java/feed/SortImpl.java
+++ b/java/sca/contrib/samples/feed-aggregator/src/main/java/feed/SortImpl.java
diff --git a/java/sca/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java b/java/sca/contrib/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java
index 1c549f7cd2..1c549f7cd2 100644
--- a/java/sca/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java
+++ b/java/sca/contrib/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java
diff --git a/java/sca/samples/feed-aggregator/src/main/resources/FeedAggregator.composite b/java/sca/contrib/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
index 8a3a53b4d5..8a3a53b4d5 100644
--- a/java/sca/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
+++ b/java/sca/contrib/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
diff --git a/java/sca/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTest.java b/java/sca/contrib/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTest.java
index 9fdfe711be..9fdfe711be 100644
--- a/java/sca/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTest.java
+++ b/java/sca/contrib/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTest.java
diff --git a/java/sca/samples/helloworld-bpel-ws/README b/java/sca/contrib/samples/helloworld-bpel-ws/README
index 5c669f5da5..5c669f5da5 100644
--- a/java/sca/samples/helloworld-bpel-ws/README
+++ b/java/sca/contrib/samples/helloworld-bpel-ws/README
diff --git a/java/sca/samples/helloworld-bpel-ws/build.xml b/java/sca/contrib/samples/helloworld-bpel-ws/build.xml
index c8917007f1..c8917007f1 100644
--- a/java/sca/samples/helloworld-bpel-ws/build.xml
+++ b/java/sca/contrib/samples/helloworld-bpel-ws/build.xml
diff --git a/java/sca/samples/helloworld-bpel-ws/helloworld-bpel.png b/java/sca/contrib/samples/helloworld-bpel-ws/helloworld-bpel.png
index 5f53a3c5d1..5f53a3c5d1 100644
--- a/java/sca/samples/helloworld-bpel-ws/helloworld-bpel.png
+++ b/java/sca/contrib/samples/helloworld-bpel-ws/helloworld-bpel.png
diff --git a/java/sca/samples/helloworld-bpel-ws/helloworld-bpel.svg b/java/sca/contrib/samples/helloworld-bpel-ws/helloworld-bpel.svg
index 5a98f1a07c..5a98f1a07c 100644
--- a/java/sca/samples/helloworld-bpel-ws/helloworld-bpel.svg
+++ b/java/sca/contrib/samples/helloworld-bpel-ws/helloworld-bpel.svg
diff --git a/java/sca/samples/helloworld-bpel-ws/pom.xml b/java/sca/contrib/samples/helloworld-bpel-ws/pom.xml
index 09cb2cbd53..09cb2cbd53 100644
--- a/java/sca/samples/helloworld-bpel-ws/pom.xml
+++ b/java/sca/contrib/samples/helloworld-bpel-ws/pom.xml
diff --git a/java/sca/samples/helloworld-bpel-ws/src/main/java/helloworld/BPELClient.java b/java/sca/contrib/samples/helloworld-bpel-ws/src/main/java/helloworld/BPELClient.java
index 971a5373e9..971a5373e9 100644
--- a/java/sca/samples/helloworld-bpel-ws/src/main/java/helloworld/BPELClient.java
+++ b/java/sca/contrib/samples/helloworld-bpel-ws/src/main/java/helloworld/BPELClient.java
diff --git a/java/sca/samples/helloworld-bpel-ws/src/main/resources/deploy.xml b/java/sca/contrib/samples/helloworld-bpel-ws/src/main/resources/deploy.xml
index d9d4363832..d9d4363832 100644
--- a/java/sca/samples/helloworld-bpel-ws/src/main/resources/deploy.xml
+++ b/java/sca/contrib/samples/helloworld-bpel-ws/src/main/resources/deploy.xml
diff --git a/java/sca/samples/helloworld-bpel-ws/src/main/resources/helloworld.bpel b/java/sca/contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.bpel
index a88aa7960c..a88aa7960c 100644
--- a/java/sca/samples/helloworld-bpel-ws/src/main/resources/helloworld.bpel
+++ b/java/sca/contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.bpel
diff --git a/java/sca/samples/helloworld-bpel-ws/src/main/resources/helloworld.componentType b/java/sca/contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.componentType
index 70273245d7..70273245d7 100644
--- a/java/sca/samples/helloworld-bpel-ws/src/main/resources/helloworld.componentType
+++ b/java/sca/contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.componentType
diff --git a/java/sca/samples/helloworld-bpel-ws/src/main/resources/helloworld.composite b/java/sca/contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.composite
index 97262109e6..97262109e6 100644
--- a/java/sca/samples/helloworld-bpel-ws/src/main/resources/helloworld.composite
+++ b/java/sca/contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.composite
diff --git a/java/sca/samples/helloworld-bpel-ws/src/main/resources/helloworld.wsdl b/java/sca/contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.wsdl
index 1cb338b283..1cb338b283 100644
--- a/java/sca/samples/helloworld-bpel-ws/src/main/resources/helloworld.wsdl
+++ b/java/sca/contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.wsdl
diff --git a/java/sca/samples/helloworld-bpel-ws/src/main/resources/log4j.properties b/java/sca/contrib/samples/helloworld-bpel-ws/src/main/resources/log4j.properties
index c1bc0a0b81..c1bc0a0b81 100644
--- a/java/sca/samples/helloworld-bpel-ws/src/main/resources/log4j.properties
+++ b/java/sca/contrib/samples/helloworld-bpel-ws/src/main/resources/log4j.properties
diff --git a/java/sca/samples/helloworld-bpel-ws/src/test/java/helloworld/BPELHelloWorldTestCase.java b/java/sca/contrib/samples/helloworld-bpel-ws/src/test/java/helloworld/BPELHelloWorldTestCase.java
index 6ad63f87d9..6ad63f87d9 100644
--- a/java/sca/samples/helloworld-bpel-ws/src/test/java/helloworld/BPELHelloWorldTestCase.java
+++ b/java/sca/contrib/samples/helloworld-bpel-ws/src/test/java/helloworld/BPELHelloWorldTestCase.java
diff --git a/java/sca/samples/helloworld-bpel/README b/java/sca/contrib/samples/helloworld-bpel/README
index bf5f500ef3..bf5f500ef3 100644
--- a/java/sca/samples/helloworld-bpel/README
+++ b/java/sca/contrib/samples/helloworld-bpel/README
diff --git a/java/sca/samples/helloworld-bpel/build.xml b/java/sca/contrib/samples/helloworld-bpel/build.xml
index 890a6427b8..890a6427b8 100644
--- a/java/sca/samples/helloworld-bpel/build.xml
+++ b/java/sca/contrib/samples/helloworld-bpel/build.xml
diff --git a/java/sca/samples/helloworld-bpel/helloworld-bpel.png b/java/sca/contrib/samples/helloworld-bpel/helloworld-bpel.png
index 5f53a3c5d1..5f53a3c5d1 100644
--- a/java/sca/samples/helloworld-bpel/helloworld-bpel.png
+++ b/java/sca/contrib/samples/helloworld-bpel/helloworld-bpel.png
diff --git a/java/sca/samples/helloworld-bpel/helloworld-bpel.svg b/java/sca/contrib/samples/helloworld-bpel/helloworld-bpel.svg
index 5a98f1a07c..5a98f1a07c 100644
--- a/java/sca/samples/helloworld-bpel/helloworld-bpel.svg
+++ b/java/sca/contrib/samples/helloworld-bpel/helloworld-bpel.svg
diff --git a/java/sca/samples/helloworld-bpel/pom.xml b/java/sca/contrib/samples/helloworld-bpel/pom.xml
index d93676d77d..d93676d77d 100644
--- a/java/sca/samples/helloworld-bpel/pom.xml
+++ b/java/sca/contrib/samples/helloworld-bpel/pom.xml
diff --git a/java/sca/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java b/java/sca/contrib/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
index 1826c885c4..1826c885c4 100644
--- a/java/sca/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
+++ b/java/sca/contrib/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
diff --git a/java/sca/samples/helloworld-bpel/src/main/resources/deploy.xml b/java/sca/contrib/samples/helloworld-bpel/src/main/resources/deploy.xml
index 9bd95b2c58..9bd95b2c58 100644
--- a/java/sca/samples/helloworld-bpel/src/main/resources/deploy.xml
+++ b/java/sca/contrib/samples/helloworld-bpel/src/main/resources/deploy.xml
diff --git a/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.bpel b/java/sca/contrib/samples/helloworld-bpel/src/main/resources/helloworld.bpel
index a88aa7960c..a88aa7960c 100644
--- a/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/java/sca/contrib/samples/helloworld-bpel/src/main/resources/helloworld.bpel
diff --git a/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.componentType b/java/sca/contrib/samples/helloworld-bpel/src/main/resources/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.componentType
+++ b/java/sca/contrib/samples/helloworld-bpel/src/main/resources/helloworld.componentType
diff --git a/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.composite b/java/sca/contrib/samples/helloworld-bpel/src/main/resources/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.composite
+++ b/java/sca/contrib/samples/helloworld-bpel/src/main/resources/helloworld.composite
diff --git a/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.wsdl b/java/sca/contrib/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/java/sca/contrib/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
diff --git a/java/sca/samples/helloworld-bpel/src/main/resources/log4j.properties b/java/sca/contrib/samples/helloworld-bpel/src/main/resources/log4j.properties
index 8649a71550..8649a71550 100644
--- a/java/sca/samples/helloworld-bpel/src/main/resources/log4j.properties
+++ b/java/sca/contrib/samples/helloworld-bpel/src/main/resources/log4j.properties
diff --git a/java/sca/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java b/java/sca/contrib/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
index 1caaa78878..1caaa78878 100644
--- a/java/sca/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
+++ b/java/sca/contrib/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
diff --git a/java/sca/samples/helloworld-distributed/README b/java/sca/contrib/samples/helloworld-distributed/README
index 9462ae4218..9462ae4218 100644
--- a/java/sca/samples/helloworld-distributed/README
+++ b/java/sca/contrib/samples/helloworld-distributed/README
diff --git a/java/sca/samples/helloworld-distributed/helloworld-node/README b/java/sca/contrib/samples/helloworld-distributed/helloworld-node/README
index 9462ae4218..9462ae4218 100644
--- a/java/sca/samples/helloworld-distributed/helloworld-node/README
+++ b/java/sca/contrib/samples/helloworld-distributed/helloworld-node/README
diff --git a/java/sca/samples/helloworld-distributed/helloworld-node/pom.xml b/java/sca/contrib/samples/helloworld-distributed/helloworld-node/pom.xml
index 1cdedf7d15..1cdedf7d15 100644
--- a/java/sca/samples/helloworld-distributed/helloworld-node/pom.xml
+++ b/java/sca/contrib/samples/helloworld-distributed/helloworld-node/pom.xml
diff --git a/java/sca/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java b/java/sca/contrib/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java
index e2b7c698ac..e2b7c698ac 100644
--- a/java/sca/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java
+++ b/java/sca/contrib/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java
diff --git a/java/sca/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldImpl.java b/java/sca/contrib/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldImpl.java
index 033b4088c8..033b4088c8 100644
--- a/java/sca/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldImpl.java
+++ b/java/sca/contrib/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldImpl.java
diff --git a/java/sca/samples/helloworld-distributed/helloworld-node/src/main/resources/META-INF/sca-deployables/Helloworld.composite b/java/sca/contrib/samples/helloworld-distributed/helloworld-node/src/main/resources/META-INF/sca-deployables/Helloworld.composite
index 0f827390c8..0f827390c8 100644
--- a/java/sca/samples/helloworld-distributed/helloworld-node/src/main/resources/META-INF/sca-deployables/Helloworld.composite
+++ b/java/sca/contrib/samples/helloworld-distributed/helloworld-node/src/main/resources/META-INF/sca-deployables/Helloworld.composite
diff --git a/java/sca/samples/helloworld-distributed/helloworld-webapp/README b/java/sca/contrib/samples/helloworld-distributed/helloworld-webapp/README
index 9462ae4218..9462ae4218 100644
--- a/java/sca/samples/helloworld-distributed/helloworld-webapp/README
+++ b/java/sca/contrib/samples/helloworld-distributed/helloworld-webapp/README
diff --git a/java/sca/samples/helloworld-distributed/helloworld-webapp/build.xml b/java/sca/contrib/samples/helloworld-distributed/helloworld-webapp/build.xml
index ef49524e39..ef49524e39 100644
--- a/java/sca/samples/helloworld-distributed/helloworld-webapp/build.xml
+++ b/java/sca/contrib/samples/helloworld-distributed/helloworld-webapp/build.xml
diff --git a/java/sca/samples/helloworld-distributed/helloworld-webapp/pom.xml b/java/sca/contrib/samples/helloworld-distributed/helloworld-webapp/pom.xml
index b298c4eb62..b298c4eb62 100644
--- a/java/sca/samples/helloworld-distributed/helloworld-webapp/pom.xml
+++ b/java/sca/contrib/samples/helloworld-distributed/helloworld-webapp/pom.xml
diff --git a/java/sca/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java b/java/sca/contrib/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java
index 04918244f0..04918244f0 100644
--- a/java/sca/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java
+++ b/java/sca/contrib/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java
diff --git a/java/sca/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.composite b/java/sca/contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.composite
index 0e8de1be42..0e8de1be42 100644
--- a/java/sca/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.composite
+++ b/java/sca/contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/java/sca/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca/contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml
index 1eefec1c48..1eefec1c48 100644
--- a/java/sca/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/hello.jsp b/java/sca/contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/hello.jsp
index 873329cf7c..873329cf7c 100644
--- a/java/sca/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/hello.jsp
+++ b/java/sca/contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/hello.jsp
diff --git a/java/sca/samples/helloworld-dojo-webapp/README b/java/sca/contrib/samples/helloworld-dojo-webapp/README
index 38392a13b6..38392a13b6 100644
--- a/java/sca/samples/helloworld-dojo-webapp/README
+++ b/java/sca/contrib/samples/helloworld-dojo-webapp/README
diff --git a/java/sca/samples/helloworld-dojo-webapp/build-dojo.xml b/java/sca/contrib/samples/helloworld-dojo-webapp/build-dojo.xml
index 534a1dacd9..534a1dacd9 100644
--- a/java/sca/samples/helloworld-dojo-webapp/build-dojo.xml
+++ b/java/sca/contrib/samples/helloworld-dojo-webapp/build-dojo.xml
diff --git a/java/sca/samples/helloworld-dojo-webapp/build.xml b/java/sca/contrib/samples/helloworld-dojo-webapp/build.xml
index 95813af65a..95813af65a 100644
--- a/java/sca/samples/helloworld-dojo-webapp/build.xml
+++ b/java/sca/contrib/samples/helloworld-dojo-webapp/build.xml
diff --git a/java/sca/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png b/java/sca/contrib/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/java/sca/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
+++ b/java/sca/contrib/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
diff --git a/java/sca/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg b/java/sca/contrib/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
index d5c3bc5d3e..d5c3bc5d3e 100644
--- a/java/sca/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
+++ b/java/sca/contrib/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
diff --git a/java/sca/samples/helloworld-dojo-webapp/pom.xml b/java/sca/contrib/samples/helloworld-dojo-webapp/pom.xml
index d839ecddc6..d839ecddc6 100644
--- a/java/sca/samples/helloworld-dojo-webapp/pom.xml
+++ b/java/sca/contrib/samples/helloworld-dojo-webapp/pom.xml
diff --git a/java/sca/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java b/java/sca/contrib/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
index 3d8ea24f04..3d8ea24f04 100644
--- a/java/sca/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ b/java/sca/contrib/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
diff --git a/java/sca/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/java/sca/contrib/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
index b4997ba907..b4997ba907 100644
--- a/java/sca/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
+++ b/java/sca/contrib/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
diff --git a/java/sca/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite b/java/sca/contrib/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
index e895ab455d..e895ab455d 100644
--- a/java/sca/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
+++ b/java/sca/contrib/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
diff --git a/java/sca/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html b/java/sca/contrib/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
index 4195f3288c..4195f3288c 100644
--- a/java/sca/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
+++ b/java/sca/contrib/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/java/sca/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca/contrib/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 2c178c1ddc..2c178c1ddc 100644
--- a/java/sca/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca/contrib/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
index 70cd67890a..70cd67890a 100644
--- a/java/sca/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/contrib/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca/samples/helloworld-dojo-webapp/src/main/webapp/style.css b/java/sca/contrib/samples/helloworld-dojo-webapp/src/main/webapp/style.css
index 1071583264..1071583264 100644
--- a/java/sca/samples/helloworld-dojo-webapp/src/main/webapp/style.css
+++ b/java/sca/contrib/samples/helloworld-dojo-webapp/src/main/webapp/style.css
diff --git a/java/sca/samples/helloworld-jms-webapp/README b/java/sca/contrib/samples/helloworld-jms-webapp/README
index 9be2e0b0f6..9be2e0b0f6 100644
--- a/java/sca/samples/helloworld-jms-webapp/README
+++ b/java/sca/contrib/samples/helloworld-jms-webapp/README
diff --git a/java/sca/samples/helloworld-jms-webapp/pom.xml b/java/sca/contrib/samples/helloworld-jms-webapp/pom.xml
index c2d6155233..c2d6155233 100644
--- a/java/sca/samples/helloworld-jms-webapp/pom.xml
+++ b/java/sca/contrib/samples/helloworld-jms-webapp/pom.xml
diff --git a/java/sca/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java b/java/sca/contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
index c24a741ee2..c24a741ee2 100644
--- a/java/sca/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
+++ b/java/sca/contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
diff --git a/java/sca/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java b/java/sca/contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
index 17f997f60d..17f997f60d 100644
--- a/java/sca/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java b/java/sca/contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
index 47756f46aa..47756f46aa 100644
--- a/java/sca/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ b/java/sca/contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml b/java/sca/contrib/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
index 2419887413..2419887413 100644
--- a/java/sca/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
+++ b/java/sca/contrib/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
diff --git a/java/sca/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite b/java/sca/contrib/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
index f6328d156c..f6328d156c 100644
--- a/java/sca/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
+++ b/java/sca/contrib/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
diff --git a/java/sca/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca/contrib/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
index 86710435ae..86710435ae 100644
--- a/java/sca/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/contrib/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp b/java/sca/contrib/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
index bc6ef59a9b..bc6ef59a9b 100644
--- a/java/sca/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
+++ b/java/sca/contrib/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
diff --git a/java/sca/samples/helloworld-jsonrpc-webapp/README b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/README
index 07253d039b..07253d039b 100644
--- a/java/sca/samples/helloworld-jsonrpc-webapp/README
+++ b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/README
diff --git a/java/sca/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/java/sca/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
+++ b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
diff --git a/java/sca/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
index 6ef1f438fb..6ef1f438fb 100644
--- a/java/sca/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
+++ b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
diff --git a/java/sca/samples/helloworld-jsonrpc-webapp/pom.xml b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/pom.xml
index 9d3b27d8cc..9d3b27d8cc 100644
--- a/java/sca/samples/helloworld-jsonrpc-webapp/pom.xml
+++ b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/pom.xml
diff --git a/java/sca/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
index 3d8ea24f04..3d8ea24f04 100644
--- a/java/sca/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
diff --git a/java/sca/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
index 2234e21439..2234e21439 100644
--- a/java/sca/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
+++ b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
diff --git a/java/sca/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
index e895ab455d..e895ab455d 100644
--- a/java/sca/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
+++ b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
diff --git a/java/sca/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
index 75dd9050fa..75dd9050fa 100644
--- a/java/sca/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
+++ b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/java/sca/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
index c8246e15a7..c8246e15a7 100644
--- a/java/sca/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
index 267bed176c..267bed176c 100644
--- a/java/sca/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
index 1071583264..1071583264 100644
--- a/java/sca/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
+++ b/java/sca/contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
diff --git a/java/sca/samples/helloworld-jsp/pom.xml b/java/sca/contrib/samples/helloworld-jsp/pom.xml
index c2604065ca..c2604065ca 100644
--- a/java/sca/samples/helloworld-jsp/pom.xml
+++ b/java/sca/contrib/samples/helloworld-jsp/pom.xml
diff --git a/java/sca/samples/helloworld-jsp/src/main/java/sample/HelloworldService.java b/java/sca/contrib/samples/helloworld-jsp/src/main/java/sample/HelloworldService.java
index 2b92fd4661..2b92fd4661 100644
--- a/java/sca/samples/helloworld-jsp/src/main/java/sample/HelloworldService.java
+++ b/java/sca/contrib/samples/helloworld-jsp/src/main/java/sample/HelloworldService.java
diff --git a/java/sca/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/java/sca/contrib/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
index 2664e75188..2664e75188 100644
--- a/java/sca/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
+++ b/java/sca/contrib/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/java/sca/samples/helloworld-jsp/src/main/webapp/META-INF/sca-deployables/web.composite b/java/sca/contrib/samples/helloworld-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
index 16bc08fc10..16bc08fc10 100644
--- a/java/sca/samples/helloworld-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
+++ b/java/sca/contrib/samples/helloworld-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
diff --git a/java/sca/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/java/sca/contrib/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
index 46285614da..46285614da 100644
--- a/java/sca/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/contrib/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca/samples/helloworld-jsp/src/main/webapp/hello.jsp b/java/sca/contrib/samples/helloworld-jsp/src/main/webapp/hello.jsp
index beac8e457f..beac8e457f 100644
--- a/java/sca/samples/helloworld-jsp/src/main/webapp/hello.jsp
+++ b/java/sca/contrib/samples/helloworld-jsp/src/main/webapp/hello.jsp
diff --git a/java/sca/samples/helloworld-reference-jms/README b/java/sca/contrib/samples/helloworld-reference-jms/README
index 184e67a239..184e67a239 100644
--- a/java/sca/samples/helloworld-reference-jms/README
+++ b/java/sca/contrib/samples/helloworld-reference-jms/README
diff --git a/java/sca/samples/helloworld-reference-jms/build.xml b/java/sca/contrib/samples/helloworld-reference-jms/build.xml
index 4702beed0d..4702beed0d 100644
--- a/java/sca/samples/helloworld-reference-jms/build.xml
+++ b/java/sca/contrib/samples/helloworld-reference-jms/build.xml
diff --git a/java/sca/samples/helloworld-reference-jms/helloworld-reference.png b/java/sca/contrib/samples/helloworld-reference-jms/helloworld-reference.png
index ab80b1f91c..ab80b1f91c 100644
--- a/java/sca/samples/helloworld-reference-jms/helloworld-reference.png
+++ b/java/sca/contrib/samples/helloworld-reference-jms/helloworld-reference.png
diff --git a/java/sca/samples/helloworld-reference-jms/helloworld-reference.svg b/java/sca/contrib/samples/helloworld-reference-jms/helloworld-reference.svg
index 40f4e8f271..40f4e8f271 100644
--- a/java/sca/samples/helloworld-reference-jms/helloworld-reference.svg
+++ b/java/sca/contrib/samples/helloworld-reference-jms/helloworld-reference.svg
diff --git a/java/sca/samples/helloworld-reference-jms/pom.xml b/java/sca/contrib/samples/helloworld-reference-jms/pom.xml
index 77d887509c..77d887509c 100644
--- a/java/sca/samples/helloworld-reference-jms/pom.xml
+++ b/java/sca/contrib/samples/helloworld-reference-jms/pom.xml
diff --git a/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
index 2186c00e57..2186c00e57 100644
--- a/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/java/sca/contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java b/java/sca/contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
index 5bec27a137..5bec27a137 100644
--- a/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
+++ b/java/sca/contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
diff --git a/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java b/java/sca/contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
index ca7c90f23e..ca7c90f23e 100644
--- a/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java b/java/sca/contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
index 27cef47677..27cef47677 100644
--- a/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/java/sca/contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/java/sca/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite b/java/sca/contrib/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
index 3cf1104562..3cf1104562 100644
--- a/java/sca/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
+++ b/java/sca/contrib/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
diff --git a/java/sca/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite b/java/sca/contrib/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
index e692ef8e4c..e692ef8e4c 100644
--- a/java/sca/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
+++ b/java/sca/contrib/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
diff --git a/java/sca/samples/helloworld-reference-jms/src/main/resources/logging.properties b/java/sca/contrib/samples/helloworld-reference-jms/src/main/resources/logging.properties
index a2a4067921..a2a4067921 100644
--- a/java/sca/samples/helloworld-reference-jms/src/main/resources/logging.properties
+++ b/java/sca/contrib/samples/helloworld-reference-jms/src/main/resources/logging.properties
diff --git a/java/sca/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl b/java/sca/contrib/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
index e0ea596dd3..e0ea596dd3 100644
--- a/java/sca/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/java/sca/contrib/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java b/java/sca/contrib/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
index f5380d9ccd..f5380d9ccd 100644
--- a/java/sca/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
+++ b/java/sca/contrib/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
diff --git a/java/sca/samples/helloworld-service-jms/README b/java/sca/contrib/samples/helloworld-service-jms/README
index 49feabaa07..49feabaa07 100644
--- a/java/sca/samples/helloworld-service-jms/README
+++ b/java/sca/contrib/samples/helloworld-service-jms/README
diff --git a/java/sca/samples/helloworld-service-jms/build.xml b/java/sca/contrib/samples/helloworld-service-jms/build.xml
index 330de7f7e5..330de7f7e5 100644
--- a/java/sca/samples/helloworld-service-jms/build.xml
+++ b/java/sca/contrib/samples/helloworld-service-jms/build.xml
diff --git a/java/sca/samples/helloworld-service-jms/helloworld-service.png b/java/sca/contrib/samples/helloworld-service-jms/helloworld-service.png
index ef27c71f54..ef27c71f54 100644
--- a/java/sca/samples/helloworld-service-jms/helloworld-service.png
+++ b/java/sca/contrib/samples/helloworld-service-jms/helloworld-service.png
diff --git a/java/sca/samples/helloworld-service-jms/helloworld-service.svg b/java/sca/contrib/samples/helloworld-service-jms/helloworld-service.svg
index dd7a9dd87d..dd7a9dd87d 100644
--- a/java/sca/samples/helloworld-service-jms/helloworld-service.svg
+++ b/java/sca/contrib/samples/helloworld-service-jms/helloworld-service.svg
diff --git a/java/sca/samples/helloworld-service-jms/pom.xml b/java/sca/contrib/samples/helloworld-service-jms/pom.xml
index c2be08fa75..c2be08fa75 100644
--- a/java/sca/samples/helloworld-service-jms/pom.xml
+++ b/java/sca/contrib/samples/helloworld-service-jms/pom.xml
diff --git a/java/sca/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
index 2186c00e57..2186c00e57 100644
--- a/java/sca/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/java/sca/contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java b/java/sca/contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
index d4ea391a00..d4ea391a00 100644
--- a/java/sca/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
+++ b/java/sca/contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
diff --git a/java/sca/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java b/java/sca/contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
index a0081be22d..a0081be22d 100644
--- a/java/sca/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca/samples/helloworld-service-jms/src/main/resources/definitions.xml b/java/sca/contrib/samples/helloworld-service-jms/src/main/resources/definitions.xml
index 8c881ab0bb..8c881ab0bb 100644
--- a/java/sca/samples/helloworld-service-jms/src/main/resources/definitions.xml
+++ b/java/sca/contrib/samples/helloworld-service-jms/src/main/resources/definitions.xml
diff --git a/java/sca/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite b/java/sca/contrib/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
index 3135cdc320..3135cdc320 100644
--- a/java/sca/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
+++ b/java/sca/contrib/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
diff --git a/java/sca/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl b/java/sca/contrib/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
index 3f9e00689e..3f9e00689e 100644
--- a/java/sca/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/java/sca/contrib/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java b/java/sca/contrib/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
index 7930f98716..7930f98716 100644
--- a/java/sca/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
+++ b/java/sca/contrib/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
diff --git a/java/sca/samples/helloworld-servlet/pom.xml b/java/sca/contrib/samples/helloworld-servlet/pom.xml
index 26fa4e62d2..26fa4e62d2 100644
--- a/java/sca/samples/helloworld-servlet/pom.xml
+++ b/java/sca/contrib/samples/helloworld-servlet/pom.xml
diff --git a/java/sca/samples/helloworld-servlet/src/main/java/sample/HelloworldService.java b/java/sca/contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldService.java
index 2b92fd4661..2b92fd4661 100644
--- a/java/sca/samples/helloworld-servlet/src/main/java/sample/HelloworldService.java
+++ b/java/sca/contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldService.java
diff --git a/java/sca/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/java/sca/contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
index 2664e75188..2664e75188 100644
--- a/java/sca/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
+++ b/java/sca/contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/java/sca/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/java/sca/contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
index 6b8af48161..6b8af48161 100644
--- a/java/sca/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
+++ b/java/sca/contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
diff --git a/java/sca/samples/helloworld-servlet/src/main/webapp/META-INF/sca-deployables/web.composite b/java/sca/contrib/samples/helloworld-servlet/src/main/webapp/META-INF/sca-deployables/web.composite
index 23fd33a408..23fd33a408 100644
--- a/java/sca/samples/helloworld-servlet/src/main/webapp/META-INF/sca-deployables/web.composite
+++ b/java/sca/contrib/samples/helloworld-servlet/src/main/webapp/META-INF/sca-deployables/web.composite
diff --git a/java/sca/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/java/sca/contrib/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
index 28cfdd3f6c..28cfdd3f6c 100644
--- a/java/sca/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/contrib/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca/samples/helloworld-servlet/src/main/webapp/hello.html b/java/sca/contrib/samples/helloworld-servlet/src/main/webapp/hello.html
index c4484916aa..c4484916aa 100644
--- a/java/sca/samples/helloworld-servlet/src/main/webapp/hello.html
+++ b/java/sca/contrib/samples/helloworld-servlet/src/main/webapp/hello.html
diff --git a/java/sca/samples/helloworld-web-callback/pom.xml b/java/sca/contrib/samples/helloworld-web-callback/pom.xml
index 4a15d1a8ea..4a15d1a8ea 100644
--- a/java/sca/samples/helloworld-web-callback/pom.xml
+++ b/java/sca/contrib/samples/helloworld-web-callback/pom.xml
diff --git a/java/sca/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java b/java/sca/contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java
index 2ee8e97e51..2ee8e97e51 100644
--- a/java/sca/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java
+++ b/java/sca/contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java
diff --git a/java/sca/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java b/java/sca/contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java
index 9c1e645776..9c1e645776 100644
--- a/java/sca/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java
+++ b/java/sca/contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java
diff --git a/java/sca/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java b/java/sca/contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java
index 5601bcd990..5601bcd990 100644
--- a/java/sca/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java
+++ b/java/sca/contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/java/sca/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/web.composite b/java/sca/contrib/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/web.composite
index fdd5a95f58..fdd5a95f58 100644
--- a/java/sca/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/web.composite
+++ b/java/sca/contrib/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/web.composite
diff --git a/java/sca/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml b/java/sca/contrib/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml
index f29262a147..f29262a147 100644
--- a/java/sca/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/contrib/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca/samples/helloworld-web-callback/src/main/webapp/hello.html b/java/sca/contrib/samples/helloworld-web-callback/src/main/webapp/hello.html
index a52cd5d59e..a52cd5d59e 100644
--- a/java/sca/samples/helloworld-web-callback/src/main/webapp/hello.html
+++ b/java/sca/contrib/samples/helloworld-web-callback/src/main/webapp/hello.html
diff --git a/java/sca/samples/helloworld-web/pom.xml b/java/sca/contrib/samples/helloworld-web/pom.xml
index 48160e795a..48160e795a 100644
--- a/java/sca/samples/helloworld-web/pom.xml
+++ b/java/sca/contrib/samples/helloworld-web/pom.xml
diff --git a/java/sca/samples/helloworld-web/src/main/java/sample/HelloworldService.java b/java/sca/contrib/samples/helloworld-web/src/main/java/sample/HelloworldService.java
index 2b92fd4661..2b92fd4661 100644
--- a/java/sca/samples/helloworld-web/src/main/java/sample/HelloworldService.java
+++ b/java/sca/contrib/samples/helloworld-web/src/main/java/sample/HelloworldService.java
diff --git a/java/sca/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java b/java/sca/contrib/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java
index 2664e75188..2664e75188 100644
--- a/java/sca/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java
+++ b/java/sca/contrib/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/java/sca/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite b/java/sca/contrib/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite
index 20cebc2d53..20cebc2d53 100644
--- a/java/sca/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite
+++ b/java/sca/contrib/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite
diff --git a/java/sca/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml b/java/sca/contrib/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml
index f29262a147..f29262a147 100644
--- a/java/sca/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/contrib/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca/samples/helloworld-web/src/main/webapp/hello.html b/java/sca/contrib/samples/helloworld-web/src/main/webapp/hello.html
index f7f8b2d4a9..f7f8b2d4a9 100644
--- a/java/sca/samples/helloworld-web/src/main/webapp/hello.html
+++ b/java/sca/contrib/samples/helloworld-web/src/main/webapp/hello.html
diff --git a/java/sca/samples/helloworld-ws-deep-webapp/README b/java/sca/contrib/samples/helloworld-ws-deep-webapp/README
index 66040004f8..66040004f8 100644
--- a/java/sca/samples/helloworld-ws-deep-webapp/README
+++ b/java/sca/contrib/samples/helloworld-ws-deep-webapp/README
diff --git a/java/sca/samples/helloworld-ws-deep-webapp/build.xml b/java/sca/contrib/samples/helloworld-ws-deep-webapp/build.xml
index bdb341d26a..bdb341d26a 100644
--- a/java/sca/samples/helloworld-ws-deep-webapp/build.xml
+++ b/java/sca/contrib/samples/helloworld-ws-deep-webapp/build.xml
diff --git a/java/sca/samples/helloworld-ws-deep-webapp/pom.xml b/java/sca/contrib/samples/helloworld-ws-deep-webapp/pom.xml
index 0595f43ec2..0595f43ec2 100644
--- a/java/sca/samples/helloworld-ws-deep-webapp/pom.xml
+++ b/java/sca/contrib/samples/helloworld-ws-deep-webapp/pom.xml
diff --git a/java/sca/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/contrib/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java
index a75187f0d7..a75187f0d7 100644
--- a/java/sca/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/java/sca/contrib/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java b/java/sca/contrib/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java
index 18f74b083f..18f74b083f 100644
--- a/java/sca/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/contrib/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite b/java/sca/contrib/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite
index 114608e4d8..114608e4d8 100644
--- a/java/sca/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite
+++ b/java/sca/contrib/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite
diff --git a/java/sca/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl b/java/sca/contrib/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl
index 0b95fbd14f..0b95fbd14f 100644
--- a/java/sca/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ b/java/sca/contrib/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca/contrib/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml
index 182fd38fd9..182fd38fd9 100644
--- a/java/sca/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/contrib/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca/samples/helloworld-ws-reference-jms/README b/java/sca/contrib/samples/helloworld-ws-reference-jms/README
index abf10ef1f2..abf10ef1f2 100644
--- a/java/sca/samples/helloworld-ws-reference-jms/README
+++ b/java/sca/contrib/samples/helloworld-ws-reference-jms/README
diff --git a/java/sca/samples/helloworld-ws-reference-jms/build.xml b/java/sca/contrib/samples/helloworld-ws-reference-jms/build.xml
index 4f83c8ae9d..4f83c8ae9d 100644
--- a/java/sca/samples/helloworld-ws-reference-jms/build.xml
+++ b/java/sca/contrib/samples/helloworld-ws-reference-jms/build.xml
diff --git a/java/sca/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png b/java/sca/contrib/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/java/sca/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
+++ b/java/sca/contrib/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
diff --git a/java/sca/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg b/java/sca/contrib/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
index 333ad53e0a..333ad53e0a 100644
--- a/java/sca/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
+++ b/java/sca/contrib/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
diff --git a/java/sca/samples/helloworld-ws-reference-jms/pom.xml b/java/sca/contrib/samples/helloworld-ws-reference-jms/pom.xml
index d1e77ca628..d1e77ca628 100644
--- a/java/sca/samples/helloworld-ws-reference-jms/pom.xml
+++ b/java/sca/contrib/samples/helloworld-ws-reference-jms/pom.xml
diff --git a/java/sca/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
index 2186c00e57..2186c00e57 100644
--- a/java/sca/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java b/java/sca/contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
index b3db243a1f..b3db243a1f 100644
--- a/java/sca/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
diff --git a/java/sca/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java b/java/sca/contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
index 8255364e99..8255364e99 100644
--- a/java/sca/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java b/java/sca/contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
index 0dee19550b..0dee19550b 100644
--- a/java/sca/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/java/sca/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite b/java/sca/contrib/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
index d029ba3e1c..d029ba3e1c 100644
--- a/java/sca/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
+++ b/java/sca/contrib/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
diff --git a/java/sca/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite b/java/sca/contrib/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
index a4eb217310..a4eb217310 100644
--- a/java/sca/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
+++ b/java/sca/contrib/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
diff --git a/java/sca/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties b/java/sca/contrib/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/java/sca/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
+++ b/java/sca/contrib/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
diff --git a/java/sca/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl b/java/sca/contrib/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/java/sca/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/java/sca/contrib/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java b/java/sca/contrib/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
index 12b0716b5d..12b0716b5d 100644
--- a/java/sca/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
diff --git a/java/sca/samples/helloworld-ws-reference-lean/README b/java/sca/contrib/samples/helloworld-ws-reference-lean/README
index 13c89ab2f6..13c89ab2f6 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/README
+++ b/java/sca/contrib/samples/helloworld-ws-reference-lean/README
diff --git a/java/sca/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png b/java/sca/contrib/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png
+++ b/java/sca/contrib/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png
diff --git a/java/sca/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg b/java/sca/contrib/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg
index 354ffbae8f..354ffbae8f 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg
+++ b/java/sca/contrib/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg
diff --git a/java/sca/samples/helloworld-ws-reference-lean/pom.xml b/java/sca/contrib/samples/helloworld-ws-reference-lean/pom.xml
index ff6907f223..ff6907f223 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/pom.xml
+++ b/java/sca/contrib/samples/helloworld-ws-reference-lean/pom.xml
diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java
index 7839c2366b..7839c2366b 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java
diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java
index 137894c469..137894c469 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java
diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java
index 663aa4c852..663aa4c852 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java
diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java
index d246225c76..d246225c76 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java
diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java
index 5113a98530..5113a98530 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java
diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java
index 8255364e99..8255364e99 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite
index 991e4b4881..991e4b4881 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite
+++ b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite
diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite
index 6ea14602b3..6ea14602b3 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite
+++ b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite
diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite
index 3d6364f55f..3d6364f55f 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite
+++ b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite
diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite
index 106e9db988..106e9db988 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite
+++ b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite
diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite
index bbac4c3703..bbac4c3703 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite
+++ b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite
diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties
+++ b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties
diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl
index 662c9affac..662c9affac 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl
+++ b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java
index 51b70f47c2..51b70f47c2 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java
index 8226ec884e..8226ec884e 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/java/sca/samples/helloworld-ws-reference-secure/README b/java/sca/contrib/samples/helloworld-ws-reference-secure/README
index 167991c8f7..167991c8f7 100644
--- a/java/sca/samples/helloworld-ws-reference-secure/README
+++ b/java/sca/contrib/samples/helloworld-ws-reference-secure/README
diff --git a/java/sca/samples/helloworld-ws-reference-secure/build.xml b/java/sca/contrib/samples/helloworld-ws-reference-secure/build.xml
index 38f1b7549d..38f1b7549d 100644
--- a/java/sca/samples/helloworld-ws-reference-secure/build.xml
+++ b/java/sca/contrib/samples/helloworld-ws-reference-secure/build.xml
diff --git a/java/sca/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png b/java/sca/contrib/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
index bd2bba41db..bd2bba41db 100644
--- a/java/sca/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
+++ b/java/sca/contrib/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
diff --git a/java/sca/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg b/java/sca/contrib/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
index 333ad53e0a..333ad53e0a 100644
--- a/java/sca/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
+++ b/java/sca/contrib/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
diff --git a/java/sca/samples/helloworld-ws-reference-secure/pom.xml b/java/sca/contrib/samples/helloworld-ws-reference-secure/pom.xml
index 5694276870..5694276870 100644
--- a/java/sca/samples/helloworld-ws-reference-secure/pom.xml
+++ b/java/sca/contrib/samples/helloworld-ws-reference-secure/pom.xml
diff --git a/java/sca/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
index 0f1ebf46d6..0f1ebf46d6 100644
--- a/java/sca/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
diff --git a/java/sca/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
index a21619fc8a..a21619fc8a 100644
--- a/java/sca/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
diff --git a/java/sca/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
index ca7c90f23e..ca7c90f23e 100644
--- a/java/sca/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
index 27cef47677..27cef47677 100644
--- a/java/sca/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index 8b089c7222..8b089c7222 100644
--- a/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
index 0ab3a5a9f1..0ab3a5a9f1 100644
--- a/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
+++ b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
diff --git a/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
index 0b4f2399f0..0b4f2399f0 100644
--- a/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
+++ b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
diff --git a/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
index 904befaf60..904befaf60 100644
--- a/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
+++ b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
diff --git a/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
index 3a4b43222d..3a4b43222d 100644
--- a/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
+++ b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
diff --git a/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
index e6fcc6f4a6..e6fcc6f4a6 100644
--- a/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
+++ b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
index 848c41d1c7..848c41d1c7 100644
--- a/java/sca/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/java/sca/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
index 21f2166560..21f2166560 100644
--- a/java/sca/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/java/sca/samples/helloworld-ws-reference/README b/java/sca/contrib/samples/helloworld-ws-reference/README
index 13c89ab2f6..13c89ab2f6 100644
--- a/java/sca/samples/helloworld-ws-reference/README
+++ b/java/sca/contrib/samples/helloworld-ws-reference/README
diff --git a/java/sca/samples/helloworld-ws-reference/build.xml b/java/sca/contrib/samples/helloworld-ws-reference/build.xml
index 71ee66b31e..71ee66b31e 100644
--- a/java/sca/samples/helloworld-ws-reference/build.xml
+++ b/java/sca/contrib/samples/helloworld-ws-reference/build.xml
diff --git a/java/sca/samples/helloworld-ws-reference/helloworld-ws-reference.png b/java/sca/contrib/samples/helloworld-ws-reference/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/java/sca/samples/helloworld-ws-reference/helloworld-ws-reference.png
+++ b/java/sca/contrib/samples/helloworld-ws-reference/helloworld-ws-reference.png
diff --git a/java/sca/samples/helloworld-ws-reference/helloworld-ws-reference.svg b/java/sca/contrib/samples/helloworld-ws-reference/helloworld-ws-reference.svg
index 354ffbae8f..354ffbae8f 100644
--- a/java/sca/samples/helloworld-ws-reference/helloworld-ws-reference.svg
+++ b/java/sca/contrib/samples/helloworld-ws-reference/helloworld-ws-reference.svg
diff --git a/java/sca/samples/helloworld-ws-reference/pom.xml b/java/sca/contrib/samples/helloworld-ws-reference/pom.xml
index 175f7f7038..175f7f7038 100644
--- a/java/sca/samples/helloworld-ws-reference/pom.xml
+++ b/java/sca/contrib/samples/helloworld-ws-reference/pom.xml
diff --git a/java/sca/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java b/java/sca/contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
index 4559b282fe..4559b282fe 100644
--- a/java/sca/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
diff --git a/java/sca/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java b/java/sca/contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
index 8255364e99..8255364e99 100644
--- a/java/sca/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java b/java/sca/contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
index 0dee19550b..0dee19550b 100644
--- a/java/sca/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/java/sca/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite b/java/sca/contrib/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
index 899ad5ce35..899ad5ce35 100644
--- a/java/sca/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
+++ b/java/sca/contrib/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
diff --git a/java/sca/samples/helloworld-ws-reference/src/main/resources/logging.properties b/java/sca/contrib/samples/helloworld-ws-reference/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/java/sca/samples/helloworld-ws-reference/src/main/resources/logging.properties
+++ b/java/sca/contrib/samples/helloworld-ws-reference/src/main/resources/logging.properties
diff --git a/java/sca/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl b/java/sca/contrib/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
index 662c9affac..662c9affac 100644
--- a/java/sca/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
+++ b/java/sca/contrib/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java b/java/sca/contrib/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
index 7ce89179c2..7ce89179c2 100644
--- a/java/sca/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/java/sca/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java b/java/sca/contrib/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
index 8226ec884e..8226ec884e 100644
--- a/java/sca/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/java/sca/contrib/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/java/sca/samples/helloworld-ws-sdo-webapp/README b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/README
index aa4819927a..aa4819927a 100644
--- a/java/sca/samples/helloworld-ws-sdo-webapp/README
+++ b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/README
diff --git a/java/sca/samples/helloworld-ws-sdo-webapp/build.xml b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/build.xml
index 386008e707..386008e707 100644
--- a/java/sca/samples/helloworld-ws-sdo-webapp/build.xml
+++ b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/build.xml
diff --git a/java/sca/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
index 2590f02a45..2590f02a45 100644
--- a/java/sca/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
+++ b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
diff --git a/java/sca/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
index 56a29db23c..56a29db23c 100644
--- a/java/sca/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
+++ b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
diff --git a/java/sca/samples/helloworld-ws-sdo-webapp/pom.xml b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/pom.xml
index d714663dc8..d714663dc8 100644
--- a/java/sca/samples/helloworld-ws-sdo-webapp/pom.xml
+++ b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/pom.xml
diff --git a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
index 3123223cd3..3123223cd3 100644
--- a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
+++ b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
diff --git a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
index fea4e2a16c..fea4e2a16c 100644
--- a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
+++ b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
diff --git a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
index ed99edb2a2..ed99edb2a2 100644
--- a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
index 34396b1b02..34396b1b02 100644
--- a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
+++ b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
diff --git a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
index fe79094b94..fe79094b94 100644
--- a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
index a0b7c37cd9..a0b7c37cd9 100644
--- a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
+++ b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
diff --git a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
index 4657c6cdc1..4657c6cdc1 100644
--- a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
+++ b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
diff --git a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 6f241cc90c..6f241cc90c 100644
--- a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index b7a7df2c17..b7a7df2c17 100644
--- a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
index 257e65aad4..257e65aad4 100644
--- a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca/samples/helloworld-ws-sdo/README b/java/sca/contrib/samples/helloworld-ws-sdo/README
index be947b1923..be947b1923 100644
--- a/java/sca/samples/helloworld-ws-sdo/README
+++ b/java/sca/contrib/samples/helloworld-ws-sdo/README
diff --git a/java/sca/samples/helloworld-ws-sdo/build.xml b/java/sca/contrib/samples/helloworld-ws-sdo/build.xml
index 401315d424..401315d424 100644
--- a/java/sca/samples/helloworld-ws-sdo/build.xml
+++ b/java/sca/contrib/samples/helloworld-ws-sdo/build.xml
diff --git a/java/sca/samples/helloworld-ws-sdo/helloworld-ws-sdo.png b/java/sca/contrib/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
index bd2bba41db..bd2bba41db 100644
--- a/java/sca/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
+++ b/java/sca/contrib/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
diff --git a/java/sca/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg b/java/sca/contrib/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
index 333ad53e0a..333ad53e0a 100644
--- a/java/sca/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
+++ b/java/sca/contrib/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
diff --git a/java/sca/samples/helloworld-ws-sdo/pom.xml b/java/sca/contrib/samples/helloworld-ws-sdo/pom.xml
index 23c16b4981..23c16b4981 100644
--- a/java/sca/samples/helloworld-ws-sdo/pom.xml
+++ b/java/sca/contrib/samples/helloworld-ws-sdo/pom.xml
diff --git a/java/sca/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java b/java/sca/contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
index de4795ceaf..de4795ceaf 100644
--- a/java/sca/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
+++ b/java/sca/contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
diff --git a/java/sca/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
index c42a4d59c3..c42a4d59c3 100644
--- a/java/sca/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
+++ b/java/sca/contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java b/java/sca/contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/java/sca/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
+++ b/java/sca/contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
diff --git a/java/sca/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java b/java/sca/contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
index 0c3025f0c9..0c3025f0c9 100644
--- a/java/sca/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java b/java/sca/contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
index 711eef63b5..711eef63b5 100644
--- a/java/sca/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/java/sca/contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/java/sca/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite b/java/sca/contrib/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
index c255df2897..c255df2897 100644
--- a/java/sca/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
+++ b/java/sca/contrib/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
diff --git a/java/sca/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite b/java/sca/contrib/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
index d4fba548d5..d4fba548d5 100644
--- a/java/sca/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
+++ b/java/sca/contrib/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
diff --git a/java/sca/samples/helloworld-ws-sdo/src/main/resources/logging.properties b/java/sca/contrib/samples/helloworld-ws-sdo/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/java/sca/samples/helloworld-ws-sdo/src/main/resources/logging.properties
+++ b/java/sca/contrib/samples/helloworld-ws-sdo/src/main/resources/logging.properties
diff --git a/java/sca/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl b/java/sca/contrib/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
index 2ecc0bea43..2ecc0bea43 100644
--- a/java/sca/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
+++ b/java/sca/contrib/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java b/java/sca/contrib/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
index 11564c370f..11564c370f 100644
--- a/java/sca/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/java/sca/contrib/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/java/sca/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java b/java/sca/contrib/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
index 4b0c40dafd..4b0c40dafd 100644
--- a/java/sca/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/java/sca/contrib/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/java/sca/samples/helloworld-ws-service-jms/README b/java/sca/contrib/samples/helloworld-ws-service-jms/README
index 26272b1d91..26272b1d91 100644
--- a/java/sca/samples/helloworld-ws-service-jms/README
+++ b/java/sca/contrib/samples/helloworld-ws-service-jms/README
diff --git a/java/sca/samples/helloworld-ws-service-jms/build.xml b/java/sca/contrib/samples/helloworld-ws-service-jms/build.xml
index 330de7f7e5..330de7f7e5 100644
--- a/java/sca/samples/helloworld-ws-service-jms/build.xml
+++ b/java/sca/contrib/samples/helloworld-ws-service-jms/build.xml
diff --git a/java/sca/samples/helloworld-ws-service-jms/helloworld-ws-service.png b/java/sca/contrib/samples/helloworld-ws-service-jms/helloworld-ws-service.png
index eab29d0bcd..eab29d0bcd 100644
--- a/java/sca/samples/helloworld-ws-service-jms/helloworld-ws-service.png
+++ b/java/sca/contrib/samples/helloworld-ws-service-jms/helloworld-ws-service.png
diff --git a/java/sca/samples/helloworld-ws-service-jms/helloworld-ws-service.svg b/java/sca/contrib/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
index 8d2ae98c82..8d2ae98c82 100644
--- a/java/sca/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
+++ b/java/sca/contrib/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
diff --git a/java/sca/samples/helloworld-ws-service-jms/pom.xml b/java/sca/contrib/samples/helloworld-ws-service-jms/pom.xml
index 90f3e7f297..90f3e7f297 100644
--- a/java/sca/samples/helloworld-ws-service-jms/pom.xml
+++ b/java/sca/contrib/samples/helloworld-ws-service-jms/pom.xml
diff --git a/java/sca/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
index 2186c00e57..2186c00e57 100644
--- a/java/sca/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/java/sca/contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java b/java/sca/contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
index 5454487ff6..5454487ff6 100644
--- a/java/sca/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
+++ b/java/sca/contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
diff --git a/java/sca/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java b/java/sca/contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
index a0081be22d..a0081be22d 100644
--- a/java/sca/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml b/java/sca/contrib/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
index 8c881ab0bb..8c881ab0bb 100644
--- a/java/sca/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
+++ b/java/sca/contrib/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
diff --git a/java/sca/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite b/java/sca/contrib/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
index 67079f738e..67079f738e 100644
--- a/java/sca/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
+++ b/java/sca/contrib/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
diff --git a/java/sca/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite b/java/sca/contrib/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
index 10faf374f3..10faf374f3 100644
--- a/java/sca/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
+++ b/java/sca/contrib/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
diff --git a/java/sca/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl b/java/sca/contrib/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
index 3f9e00689e..3f9e00689e 100644
--- a/java/sca/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/java/sca/contrib/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java b/java/sca/contrib/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
index 34f8605d5d..34f8605d5d 100644
--- a/java/sca/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
+++ b/java/sca/contrib/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
diff --git a/java/sca/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java b/java/sca/contrib/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
index 03d566cc17..03d566cc17 100644
--- a/java/sca/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
+++ b/java/sca/contrib/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
diff --git a/java/sca/samples/helloworld-ws-service-secure/README b/java/sca/contrib/samples/helloworld-ws-service-secure/README
index f32eb08b05..f32eb08b05 100644
--- a/java/sca/samples/helloworld-ws-service-secure/README
+++ b/java/sca/contrib/samples/helloworld-ws-service-secure/README
diff --git a/java/sca/samples/helloworld-ws-service-secure/build.xml b/java/sca/contrib/samples/helloworld-ws-service-secure/build.xml
index 29bbae0173..29bbae0173 100644
--- a/java/sca/samples/helloworld-ws-service-secure/build.xml
+++ b/java/sca/contrib/samples/helloworld-ws-service-secure/build.xml
diff --git a/java/sca/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png b/java/sca/contrib/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
index 6f7d9dd450..6f7d9dd450 100644
--- a/java/sca/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
+++ b/java/sca/contrib/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
diff --git a/java/sca/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg b/java/sca/contrib/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
index 53eb552923..53eb552923 100644
--- a/java/sca/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
+++ b/java/sca/contrib/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
diff --git a/java/sca/samples/helloworld-ws-service-secure/pom.xml b/java/sca/contrib/samples/helloworld-ws-service-secure/pom.xml
index b2a1245d79..b2a1245d79 100644
--- a/java/sca/samples/helloworld-ws-service-secure/pom.xml
+++ b/java/sca/contrib/samples/helloworld-ws-service-secure/pom.xml
diff --git a/java/sca/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
index 2186c00e57..2186c00e57 100644
--- a/java/sca/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
+++ b/java/sca/contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java b/java/sca/contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
index 3d43290380..3d43290380 100644
--- a/java/sca/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
+++ b/java/sca/contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
diff --git a/java/sca/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java b/java/sca/contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
index a0081be22d..a0081be22d 100644
--- a/java/sca/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java b/java/sca/contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
index ded02f09d6..ded02f09d6 100644
--- a/java/sca/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
+++ b/java/sca/contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
diff --git a/java/sca/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml b/java/sca/contrib/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
index 10fa7b8652..10fa7b8652 100644
--- a/java/sca/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
+++ b/java/sca/contrib/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
diff --git a/java/sca/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks b/java/sca/contrib/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
index 0b4f2399f0..0b4f2399f0 100644
--- a/java/sca/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
+++ b/java/sca/contrib/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
diff --git a/java/sca/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite b/java/sca/contrib/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
index d1e18d7929..d1e18d7929 100644
--- a/java/sca/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
+++ b/java/sca/contrib/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
diff --git a/java/sca/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl b/java/sca/contrib/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
index 068229be6f..068229be6f 100644
--- a/java/sca/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
+++ b/java/sca/contrib/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java b/java/sca/contrib/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
index 4a14afcd9d..4a14afcd9d 100644
--- a/java/sca/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
+++ b/java/sca/contrib/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
diff --git a/java/sca/samples/helloworld-ws-service-webapp/README b/java/sca/contrib/samples/helloworld-ws-service-webapp/README
index 66040004f8..66040004f8 100644
--- a/java/sca/samples/helloworld-ws-service-webapp/README
+++ b/java/sca/contrib/samples/helloworld-ws-service-webapp/README
diff --git a/java/sca/samples/helloworld-ws-service-webapp/build.xml b/java/sca/contrib/samples/helloworld-ws-service-webapp/build.xml
index ff850203b3..ff850203b3 100644
--- a/java/sca/samples/helloworld-ws-service-webapp/build.xml
+++ b/java/sca/contrib/samples/helloworld-ws-service-webapp/build.xml
diff --git a/java/sca/samples/helloworld-ws-service-webapp/pom.xml b/java/sca/contrib/samples/helloworld-ws-service-webapp/pom.xml
index 63dd133c2c..63dd133c2c 100644
--- a/java/sca/samples/helloworld-ws-service-webapp/pom.xml
+++ b/java/sca/contrib/samples/helloworld-ws-service-webapp/pom.xml
diff --git a/java/sca/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/contrib/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
index a75187f0d7..a75187f0d7 100644
--- a/java/sca/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/java/sca/contrib/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java b/java/sca/contrib/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
index 18f74b083f..18f74b083f 100644
--- a/java/sca/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/contrib/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl b/java/sca/contrib/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
index 0b95fbd14f..0b95fbd14f 100644
--- a/java/sca/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ b/java/sca/contrib/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite b/java/sca/contrib/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
index 114608e4d8..114608e4d8 100644
--- a/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
+++ b/java/sca/contrib/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
diff --git a/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca/contrib/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index c514922045..c514922045 100644
--- a/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/java/sca/contrib/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca/contrib/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
index 3f3c92fa78..3f3c92fa78 100644
--- a/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/contrib/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca/samples/helloworld-ws-service/README b/java/sca/contrib/samples/helloworld-ws-service/README
index 72417d3160..72417d3160 100644
--- a/java/sca/samples/helloworld-ws-service/README
+++ b/java/sca/contrib/samples/helloworld-ws-service/README
diff --git a/java/sca/samples/helloworld-ws-service/build.xml b/java/sca/contrib/samples/helloworld-ws-service/build.xml
index 7a59628c7b..7a59628c7b 100644
--- a/java/sca/samples/helloworld-ws-service/build.xml
+++ b/java/sca/contrib/samples/helloworld-ws-service/build.xml
diff --git a/java/sca/samples/helloworld-ws-service/helloworld-ws-service.png b/java/sca/contrib/samples/helloworld-ws-service/helloworld-ws-service.png
index eab29d0bcd..eab29d0bcd 100644
--- a/java/sca/samples/helloworld-ws-service/helloworld-ws-service.png
+++ b/java/sca/contrib/samples/helloworld-ws-service/helloworld-ws-service.png
diff --git a/java/sca/samples/helloworld-ws-service/helloworld-ws-service.svg b/java/sca/contrib/samples/helloworld-ws-service/helloworld-ws-service.svg
index 61cd93ead9..61cd93ead9 100644
--- a/java/sca/samples/helloworld-ws-service/helloworld-ws-service.svg
+++ b/java/sca/contrib/samples/helloworld-ws-service/helloworld-ws-service.svg
diff --git a/java/sca/samples/helloworld-ws-service/pom.xml b/java/sca/contrib/samples/helloworld-ws-service/pom.xml
index a895191917..a895191917 100644
--- a/java/sca/samples/helloworld-ws-service/pom.xml
+++ b/java/sca/contrib/samples/helloworld-ws-service/pom.xml
diff --git a/java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
index a75187f0d7..a75187f0d7 100644
--- a/java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
+++ b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
index c37bfcda65..c37bfcda65 100644
--- a/java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
+++ b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
diff --git a/java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
index 513c2e3129..513c2e3129 100644
--- a/java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java
index e472b2bada..e472b2bada 100644
--- a/java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java
+++ b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java
diff --git a/java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Order.java b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Order.java
index 7508887a7d..7508887a7d 100644
--- a/java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Order.java
+++ b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Order.java
diff --git a/java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService.java b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService.java
index a11d733cc9..a11d733cc9 100644
--- a/java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService.java
+++ b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService.java
diff --git a/java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java
index 0e084bf459..0e084bf459 100644
--- a/java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java
+++ b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java
diff --git a/java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java
index 9c8ff711ea..9c8ff711ea 100644
--- a/java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java
+++ b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java
diff --git a/java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java
index 9e7192a0d0..9e7192a0d0 100644
--- a/java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java
+++ b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java
diff --git a/java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java
index 90dbc3f25e..90dbc3f25e 100644
--- a/java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java
+++ b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java
diff --git a/java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Status.java b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Status.java
index 73a1b5c45e..73a1b5c45e 100644
--- a/java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Status.java
+++ b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Status.java
diff --git a/java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/package-info.java b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/package-info.java
index 64c056b7fb..64c056b7fb 100644
--- a/java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/package-info.java
+++ b/java/sca/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/package-info.java
diff --git a/java/sca/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite b/java/sca/contrib/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
index d767625ae7..d767625ae7 100644
--- a/java/sca/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
+++ b/java/sca/contrib/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
diff --git a/java/sca/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/orderws.composite b/java/sca/contrib/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/orderws.composite
index d34891d1af..d34891d1af 100644
--- a/java/sca/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/orderws.composite
+++ b/java/sca/contrib/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/orderws.composite
diff --git a/java/sca/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl b/java/sca/contrib/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
index 454763410c..454763410c 100644
--- a/java/sca/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
+++ b/java/sca/contrib/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca/samples/helloworld-ws-service/src/main/resources/wsdl/orderservice.wsdl b/java/sca/contrib/samples/helloworld-ws-service/src/main/resources/wsdl/orderservice.wsdl
index fd8ef74403..fd8ef74403 100644
--- a/java/sca/samples/helloworld-ws-service/src/main/resources/wsdl/orderservice.wsdl
+++ b/java/sca/contrib/samples/helloworld-ws-service/src/main/resources/wsdl/orderservice.wsdl
diff --git a/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java b/java/sca/contrib/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
index 189332be91..189332be91 100644
--- a/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
+++ b/java/sca/contrib/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
diff --git a/java/sca/samples/host-webapp-calculator/README b/java/sca/contrib/samples/host-webapp-calculator/README
index 690152ff65..690152ff65 100644
--- a/java/sca/samples/host-webapp-calculator/README
+++ b/java/sca/contrib/samples/host-webapp-calculator/README
diff --git a/java/sca/samples/host-webapp-calculator/build.xml b/java/sca/contrib/samples/host-webapp-calculator/build.xml
index bef3f946e9..bef3f946e9 100644
--- a/java/sca/samples/host-webapp-calculator/build.xml
+++ b/java/sca/contrib/samples/host-webapp-calculator/build.xml
diff --git a/java/sca/samples/host-webapp-calculator/calculator-web.png b/java/sca/contrib/samples/host-webapp-calculator/calculator-web.png
index f482b8d1c8..f482b8d1c8 100644
--- a/java/sca/samples/host-webapp-calculator/calculator-web.png
+++ b/java/sca/contrib/samples/host-webapp-calculator/calculator-web.png
diff --git a/java/sca/samples/host-webapp-calculator/calculator-web.svg b/java/sca/contrib/samples/host-webapp-calculator/calculator-web.svg
index 1b7015b156..1b7015b156 100644
--- a/java/sca/samples/host-webapp-calculator/calculator-web.svg
+++ b/java/sca/contrib/samples/host-webapp-calculator/calculator-web.svg
diff --git a/java/sca/samples/host-webapp-calculator/pom.xml b/java/sca/contrib/samples/host-webapp-calculator/pom.xml
index 2e1c719e7d..2e1c719e7d 100644
--- a/java/sca/samples/host-webapp-calculator/pom.xml
+++ b/java/sca/contrib/samples/host-webapp-calculator/pom.xml
diff --git a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddService.java b/java/sca/contrib/samples/host-webapp-calculator/src/main/java/calculator/AddService.java
index 19e43317eb..19e43317eb 100644
--- a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddService.java
+++ b/java/sca/contrib/samples/host-webapp-calculator/src/main/java/calculator/AddService.java
diff --git a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java b/java/sca/contrib/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java
index e96b0faa96..e96b0faa96 100644
--- a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/java/sca/contrib/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca/samples/calculator2/src/main/java/calculator/CalculatorService.java b/java/sca/contrib/samples/host-webapp-calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/java/sca/samples/calculator2/src/main/java/calculator/CalculatorService.java
+++ b/java/sca/contrib/samples/host-webapp-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/contrib/samples/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 39f55ca31f..39f55ca31f 100644
--- a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/java/sca/contrib/samples/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/DivideService.java b/java/sca/contrib/samples/host-webapp-calculator/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/DivideService.java
+++ b/java/sca/contrib/samples/host-webapp-calculator/src/main/java/calculator/DivideService.java
diff --git a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/DivideServiceImpl.java b/java/sca/contrib/samples/host-webapp-calculator/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/java/sca/contrib/samples/host-webapp-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca/samples/calculator2/src/main/java/calculator/MultiplyService.java b/java/sca/contrib/samples/host-webapp-calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/java/sca/samples/calculator2/src/main/java/calculator/MultiplyService.java
+++ b/java/sca/contrib/samples/host-webapp-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca/contrib/samples/host-webapp-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/java/sca/contrib/samples/host-webapp-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/SubtractService.java b/java/sca/contrib/samples/host-webapp-calculator/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/SubtractService.java
+++ b/java/sca/contrib/samples/host-webapp-calculator/src/main/java/calculator/SubtractService.java
diff --git a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/SubtractServiceImpl.java b/java/sca/contrib/samples/host-webapp-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/java/sca/contrib/samples/host-webapp-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca/samples/host-webapp-calculator/src/main/resources/Calculator.composite b/java/sca/contrib/samples/host-webapp-calculator/src/main/resources/Calculator.composite
index 6a00b85f62..6a00b85f62 100644
--- a/java/sca/samples/host-webapp-calculator/src/main/resources/Calculator.composite
+++ b/java/sca/contrib/samples/host-webapp-calculator/src/main/resources/Calculator.composite
diff --git a/java/sca/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml b/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml
index 8e3132eaa1..8e3132eaa1 100644
--- a/java/sca/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml
index 59bbb0de83..59bbb0de83 100644
--- a/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite b/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite
index e839694501..e839694501 100644
--- a/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite
+++ b/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite
diff --git a/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml b/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml
index 701ba48203..701ba48203 100644
--- a/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca/samples/host-webapp-calculator/src/main/webapp/calc.jsp b/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/calc.jsp
index 4c4366747d..4c4366747d 100644
--- a/java/sca/samples/host-webapp-calculator/src/main/webapp/calc.jsp
+++ b/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/calc.jsp
diff --git a/java/sca/samples/implementation-composite/README b/java/sca/contrib/samples/implementation-composite/README
index 27de00e8ef..27de00e8ef 100644
--- a/java/sca/samples/implementation-composite/README
+++ b/java/sca/contrib/samples/implementation-composite/README
diff --git a/java/sca/samples/implementation-composite/build.xml b/java/sca/contrib/samples/implementation-composite/build.xml
index 7aa31aab8b..7aa31aab8b 100644
--- a/java/sca/samples/implementation-composite/build.xml
+++ b/java/sca/contrib/samples/implementation-composite/build.xml
diff --git a/java/sca/samples/implementation-composite/implementation-composite.png b/java/sca/contrib/samples/implementation-composite/implementation-composite.png
index 4c6d71bc03..4c6d71bc03 100644
--- a/java/sca/samples/implementation-composite/implementation-composite.png
+++ b/java/sca/contrib/samples/implementation-composite/implementation-composite.png
diff --git a/java/sca/samples/implementation-composite/implementation-composite.svg b/java/sca/contrib/samples/implementation-composite/implementation-composite.svg
index 0e60354aab..0e60354aab 100644
--- a/java/sca/samples/implementation-composite/implementation-composite.svg
+++ b/java/sca/contrib/samples/implementation-composite/implementation-composite.svg
diff --git a/java/sca/samples/implementation-composite/pom.xml b/java/sca/contrib/samples/implementation-composite/pom.xml
index 91f8af09f3..91f8af09f3 100644
--- a/java/sca/samples/implementation-composite/pom.xml
+++ b/java/sca/contrib/samples/implementation-composite/pom.xml
diff --git a/java/sca/samples/implementation-composite/src/main/java/composite/CompositeClient.java b/java/sca/contrib/samples/implementation-composite/src/main/java/composite/CompositeClient.java
index bf743e1797..bf743e1797 100644
--- a/java/sca/samples/implementation-composite/src/main/java/composite/CompositeClient.java
+++ b/java/sca/contrib/samples/implementation-composite/src/main/java/composite/CompositeClient.java
diff --git a/java/sca/samples/implementation-composite/src/main/java/composite/Source.java b/java/sca/contrib/samples/implementation-composite/src/main/java/composite/Source.java
index d0efcc1df1..d0efcc1df1 100644
--- a/java/sca/samples/implementation-composite/src/main/java/composite/Source.java
+++ b/java/sca/contrib/samples/implementation-composite/src/main/java/composite/Source.java
diff --git a/java/sca/samples/implementation-composite/src/main/java/composite/SourceCallback.java b/java/sca/contrib/samples/implementation-composite/src/main/java/composite/SourceCallback.java
index baa95a8e39..baa95a8e39 100644
--- a/java/sca/samples/implementation-composite/src/main/java/composite/SourceCallback.java
+++ b/java/sca/contrib/samples/implementation-composite/src/main/java/composite/SourceCallback.java
diff --git a/java/sca/samples/implementation-composite/src/main/java/composite/SourceImpl.java b/java/sca/contrib/samples/implementation-composite/src/main/java/composite/SourceImpl.java
index 8e2b347604..8e2b347604 100644
--- a/java/sca/samples/implementation-composite/src/main/java/composite/SourceImpl.java
+++ b/java/sca/contrib/samples/implementation-composite/src/main/java/composite/SourceImpl.java
diff --git a/java/sca/samples/implementation-composite/src/main/java/composite/Target.java b/java/sca/contrib/samples/implementation-composite/src/main/java/composite/Target.java
index 703e72fc10..703e72fc10 100644
--- a/java/sca/samples/implementation-composite/src/main/java/composite/Target.java
+++ b/java/sca/contrib/samples/implementation-composite/src/main/java/composite/Target.java
diff --git a/java/sca/samples/implementation-composite/src/main/java/composite/TargetImpl.java b/java/sca/contrib/samples/implementation-composite/src/main/java/composite/TargetImpl.java
index cd9a9746fa..cd9a9746fa 100644
--- a/java/sca/samples/implementation-composite/src/main/java/composite/TargetImpl.java
+++ b/java/sca/contrib/samples/implementation-composite/src/main/java/composite/TargetImpl.java
diff --git a/java/sca/samples/implementation-composite/src/main/resources/InnerComposite.composite b/java/sca/contrib/samples/implementation-composite/src/main/resources/InnerComposite.composite
index 3376ac8ff5..3376ac8ff5 100644
--- a/java/sca/samples/implementation-composite/src/main/resources/InnerComposite.composite
+++ b/java/sca/contrib/samples/implementation-composite/src/main/resources/InnerComposite.composite
diff --git a/java/sca/samples/implementation-composite/src/main/resources/InnerComposite2.composite b/java/sca/contrib/samples/implementation-composite/src/main/resources/InnerComposite2.composite
index c9eff4fa9d..c9eff4fa9d 100644
--- a/java/sca/samples/implementation-composite/src/main/resources/InnerComposite2.composite
+++ b/java/sca/contrib/samples/implementation-composite/src/main/resources/InnerComposite2.composite
diff --git a/java/sca/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml b/java/sca/contrib/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
index e675fd3624..e675fd3624 100644
--- a/java/sca/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/implementation-composite/src/main/resources/OuterComposite.composite b/java/sca/contrib/samples/implementation-composite/src/main/resources/OuterComposite.composite
index cb1c1e13d4..cb1c1e13d4 100644
--- a/java/sca/samples/implementation-composite/src/main/resources/OuterComposite.composite
+++ b/java/sca/contrib/samples/implementation-composite/src/main/resources/OuterComposite.composite
diff --git a/java/sca/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java b/java/sca/contrib/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
index 9e9a4b44a4..9e9a4b44a4 100644
--- a/java/sca/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
+++ b/java/sca/contrib/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
diff --git a/java/sca/samples/implementation-crud-extension/README b/java/sca/contrib/samples/implementation-crud-extension/README
index 5e8190648f..5e8190648f 100644
--- a/java/sca/samples/implementation-crud-extension/README
+++ b/java/sca/contrib/samples/implementation-crud-extension/README
diff --git a/java/sca/samples/implementation-crud-extension/build.xml b/java/sca/contrib/samples/implementation-crud-extension/build.xml
index 88d308e6fc..88d308e6fc 100644
--- a/java/sca/samples/implementation-crud-extension/build.xml
+++ b/java/sca/contrib/samples/implementation-crud-extension/build.xml
diff --git a/java/sca/samples/implementation-crud-extension/pom.xml b/java/sca/contrib/samples/implementation-crud-extension/pom.xml
index 6e044bd68e..6e044bd68e 100644
--- a/java/sca/samples/implementation-crud-extension/pom.xml
+++ b/java/sca/contrib/samples/implementation-crud-extension/pom.xml
diff --git a/java/sca/samples/implementation-crud-extension/src/main/java/crud/CRUD.java b/java/sca/contrib/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
index b23d85887b..b23d85887b 100644
--- a/java/sca/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
+++ b/java/sca/contrib/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
diff --git a/java/sca/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java b/java/sca/contrib/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
index 49be844f93..49be844f93 100644
--- a/java/sca/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
+++ b/java/sca/contrib/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
diff --git a/java/sca/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java b/java/sca/contrib/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
index fa83c63c1b..fa83c63c1b 100644
--- a/java/sca/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
+++ b/java/sca/contrib/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
diff --git a/java/sca/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java b/java/sca/contrib/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
index cc0795a735..cc0795a735 100644
--- a/java/sca/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
+++ b/java/sca/contrib/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
diff --git a/java/sca/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java b/java/sca/contrib/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
index 2f1e5fcba8..2f1e5fcba8 100644
--- a/java/sca/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
+++ b/java/sca/contrib/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
diff --git a/java/sca/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java b/java/sca/contrib/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
index 383a035e69..383a035e69 100644
--- a/java/sca/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
+++ b/java/sca/contrib/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
diff --git a/java/sca/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java b/java/sca/contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
index b212ee3c9b..b212ee3c9b 100644
--- a/java/sca/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
+++ b/java/sca/contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
diff --git a/java/sca/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java b/java/sca/contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
index 8f11f9d910..8f11f9d910 100644
--- a/java/sca/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
+++ b/java/sca/contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
diff --git a/java/sca/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java b/java/sca/contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
index 4566cb7155..4566cb7155 100644
--- a/java/sca/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
+++ b/java/sca/contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
diff --git a/java/sca/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory b/java/sca/contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
index 3cf5de5fa1..3cf5de5fa1 100644
--- a/java/sca/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
+++ b/java/sca/contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
diff --git a/java/sca/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 17c98cf706..17c98cf706 100644
--- a/java/sca/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/java/sca/contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 527c626418..527c626418 100644
--- a/java/sca/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/java/sca/contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/java/sca/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/java/sca/contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 6ce605197a..6ce605197a 100644
--- a/java/sca/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/java/sca/contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/java/sca/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd b/java/sca/contrib/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
index 447e31bf93..447e31bf93 100644
--- a/java/sca/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
+++ b/java/sca/contrib/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
diff --git a/java/sca/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java b/java/sca/contrib/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
index 0bb5cfc361..0bb5cfc361 100644
--- a/java/sca/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
+++ b/java/sca/contrib/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
diff --git a/java/sca/samples/implementation-crud-extension/src/test/resources/crud.composite b/java/sca/contrib/samples/implementation-crud-extension/src/test/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/java/sca/samples/implementation-crud-extension/src/test/resources/crud.composite
+++ b/java/sca/contrib/samples/implementation-crud-extension/src/test/resources/crud.composite
diff --git a/java/sca/samples/implementation-crud/README b/java/sca/contrib/samples/implementation-crud/README
index 50da631c04..50da631c04 100644
--- a/java/sca/samples/implementation-crud/README
+++ b/java/sca/contrib/samples/implementation-crud/README
diff --git a/java/sca/samples/implementation-crud/build.xml b/java/sca/contrib/samples/implementation-crud/build.xml
index 10b26b5a94..10b26b5a94 100644
--- a/java/sca/samples/implementation-crud/build.xml
+++ b/java/sca/contrib/samples/implementation-crud/build.xml
diff --git a/java/sca/samples/implementation-crud/implementation-crud.png b/java/sca/contrib/samples/implementation-crud/implementation-crud.png
index a292037e7a..a292037e7a 100644
--- a/java/sca/samples/implementation-crud/implementation-crud.png
+++ b/java/sca/contrib/samples/implementation-crud/implementation-crud.png
diff --git a/java/sca/samples/implementation-crud/implementation-crud.svg b/java/sca/contrib/samples/implementation-crud/implementation-crud.svg
index dbb37be208..dbb37be208 100644
--- a/java/sca/samples/implementation-crud/implementation-crud.svg
+++ b/java/sca/contrib/samples/implementation-crud/implementation-crud.svg
diff --git a/java/sca/samples/implementation-crud/pom.xml b/java/sca/contrib/samples/implementation-crud/pom.xml
index 3fb4252e92..3fb4252e92 100644
--- a/java/sca/samples/implementation-crud/pom.xml
+++ b/java/sca/contrib/samples/implementation-crud/pom.xml
diff --git a/java/sca/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java b/java/sca/contrib/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
index ea87cb3001..ea87cb3001 100644
--- a/java/sca/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
+++ b/java/sca/contrib/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
diff --git a/java/sca/samples/implementation-crud/src/main/resources/crud.composite b/java/sca/contrib/samples/implementation-crud/src/main/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/java/sca/samples/implementation-crud/src/main/resources/crud.composite
+++ b/java/sca/contrib/samples/implementation-crud/src/main/resources/crud.composite
diff --git a/java/sca/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java b/java/sca/contrib/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
index 7e0476a8b1..7e0476a8b1 100644
--- a/java/sca/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
+++ b/java/sca/contrib/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
diff --git a/java/sca/samples/implementation-notification/README b/java/sca/contrib/samples/implementation-notification/README
index 7adfa4e5dc..7adfa4e5dc 100644
--- a/java/sca/samples/implementation-notification/README
+++ b/java/sca/contrib/samples/implementation-notification/README
diff --git a/java/sca/samples/implementation-notification/build.xml b/java/sca/contrib/samples/implementation-notification/build.xml
index 110c7b84c1..110c7b84c1 100644
--- a/java/sca/samples/implementation-notification/build.xml
+++ b/java/sca/contrib/samples/implementation-notification/build.xml
diff --git a/java/sca/samples/implementation-notification/implementation-notification.png b/java/sca/contrib/samples/implementation-notification/implementation-notification.png
index 0b7ee34bf7..0b7ee34bf7 100644
--- a/java/sca/samples/implementation-notification/implementation-notification.png
+++ b/java/sca/contrib/samples/implementation-notification/implementation-notification.png
diff --git a/java/sca/samples/implementation-notification/pom.xml b/java/sca/contrib/samples/implementation-notification/pom.xml
index 0ebb3ff7a3..0ebb3ff7a3 100644
--- a/java/sca/samples/implementation-notification/pom.xml
+++ b/java/sca/contrib/samples/implementation-notification/pom.xml
diff --git a/java/sca/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java b/java/sca/contrib/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
index bf8c72e0ce..bf8c72e0ce 100644
--- a/java/sca/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
+++ b/java/sca/contrib/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
diff --git a/java/sca/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java b/java/sca/contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
index 7bbfda2122..7bbfda2122 100644
--- a/java/sca/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
+++ b/java/sca/contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
diff --git a/java/sca/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java b/java/sca/contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
index da32bab58d..da32bab58d 100644
--- a/java/sca/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
+++ b/java/sca/contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
diff --git a/java/sca/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java b/java/sca/contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
index 17d7933d9e..17d7933d9e 100644
--- a/java/sca/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
+++ b/java/sca/contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
diff --git a/java/sca/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java b/java/sca/contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
index e16b509993..e16b509993 100644
--- a/java/sca/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
+++ b/java/sca/contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
diff --git a/java/sca/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType b/java/sca/contrib/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
index 873e200613..873e200613 100644
--- a/java/sca/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/java/sca/contrib/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/java/sca/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite b/java/sca/contrib/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
index bbf2281352..bbf2281352 100644
--- a/java/sca/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/java/sca/contrib/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/java/sca/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java b/java/sca/contrib/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
index 719141c94b..719141c94b 100644
--- a/java/sca/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
+++ b/java/sca/contrib/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
diff --git a/java/sca/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType b/java/sca/contrib/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
index 873e200613..873e200613 100644
--- a/java/sca/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
+++ b/java/sca/contrib/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
diff --git a/java/sca/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite b/java/sca/contrib/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
index bbf2281352..bbf2281352 100644
--- a/java/sca/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
+++ b/java/sca/contrib/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
diff --git a/java/sca/samples/implementation-pojo-extension/README b/java/sca/contrib/samples/implementation-pojo-extension/README
index 3b201779e1..3b201779e1 100644
--- a/java/sca/samples/implementation-pojo-extension/README
+++ b/java/sca/contrib/samples/implementation-pojo-extension/README
diff --git a/java/sca/samples/implementation-pojo-extension/build.xml b/java/sca/contrib/samples/implementation-pojo-extension/build.xml
index 78bae79859..78bae79859 100644
--- a/java/sca/samples/implementation-pojo-extension/build.xml
+++ b/java/sca/contrib/samples/implementation-pojo-extension/build.xml
diff --git a/java/sca/samples/implementation-pojo-extension/pom.xml b/java/sca/contrib/samples/implementation-pojo-extension/pom.xml
index 6fa7ab7f1c..6fa7ab7f1c 100644
--- a/java/sca/samples/implementation-pojo-extension/pom.xml
+++ b/java/sca/contrib/samples/implementation-pojo-extension/pom.xml
diff --git a/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java b/java/sca/contrib/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
index 7c2f5d236f..7c2f5d236f 100644
--- a/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
+++ b/java/sca/contrib/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
diff --git a/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java b/java/sca/contrib/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
index bbcfb3d0dc..bbcfb3d0dc 100644
--- a/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
+++ b/java/sca/contrib/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
diff --git a/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java b/java/sca/contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
index 0dad270a6c..0dad270a6c 100644
--- a/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
+++ b/java/sca/contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
diff --git a/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java b/java/sca/contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
index f2d6871039..f2d6871039 100644
--- a/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
+++ b/java/sca/contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
diff --git a/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java b/java/sca/contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
index 44a2cc0aa8..44a2cc0aa8 100644
--- a/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
+++ b/java/sca/contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
diff --git a/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java b/java/sca/contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
index 0654cb93e5..0654cb93e5 100644
--- a/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
+++ b/java/sca/contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
diff --git a/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java b/java/sca/contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
index 30a9885ea9..30a9885ea9 100644
--- a/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
+++ b/java/sca/contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
diff --git a/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java b/java/sca/contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
index 22f2be09e9..22f2be09e9 100644
--- a/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
+++ b/java/sca/contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
diff --git a/java/sca/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 8337e81c5f..8337e81c5f 100644
--- a/java/sca/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/java/sca/contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 64dd230a15..64dd230a15 100644
--- a/java/sca/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/java/sca/contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/java/sca/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/java/sca/contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index b30ea3b9cf..b30ea3b9cf 100644
--- a/java/sca/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/java/sca/contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/java/sca/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory b/java/sca/contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
index 075af98240..075af98240 100644
--- a/java/sca/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
+++ b/java/sca/contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
diff --git a/java/sca/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd b/java/sca/contrib/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
index c9d170770b..c9d170770b 100644
--- a/java/sca/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
+++ b/java/sca/contrib/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
diff --git a/java/sca/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java b/java/sca/contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
index cc32929f09..cc32929f09 100644
--- a/java/sca/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
+++ b/java/sca/contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
diff --git a/java/sca/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java b/java/sca/contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
index 0580e30aba..0580e30aba 100644
--- a/java/sca/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
+++ b/java/sca/contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java b/java/sca/contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
index 69ab1f567e..69ab1f567e 100644
--- a/java/sca/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
+++ b/java/sca/contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
diff --git a/java/sca/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java b/java/sca/contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
index d8b5f41adc..d8b5f41adc 100644
--- a/java/sca/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/java/sca/contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/java/sca/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType b/java/sca/contrib/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
index a92c5ab8db..a92c5ab8db 100644
--- a/java/sca/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
+++ b/java/sca/contrib/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
diff --git a/java/sca/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite b/java/sca/contrib/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
index c38094dfc9..c38094dfc9 100644
--- a/java/sca/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
+++ b/java/sca/contrib/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
diff --git a/java/sca/samples/loanapplication/pom.xml b/java/sca/contrib/samples/loanapplication/pom.xml
index ad76cde4f1..ad76cde4f1 100644
--- a/java/sca/samples/loanapplication/pom.xml
+++ b/java/sca/contrib/samples/loanapplication/pom.xml
diff --git a/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java b/java/sca/contrib/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
index 4fedb70782..4fedb70782 100644
--- a/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
+++ b/java/sca/contrib/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
diff --git a/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java b/java/sca/contrib/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
index 5183ece867..5183ece867 100644
--- a/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
+++ b/java/sca/contrib/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
diff --git a/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanClient.java b/java/sca/contrib/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
index 7e4438bbff..7e4438bbff 100644
--- a/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
+++ b/java/sca/contrib/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
diff --git a/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java b/java/sca/contrib/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
index 023199b14b..023199b14b 100644
--- a/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
+++ b/java/sca/contrib/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
diff --git a/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanService.java b/java/sca/contrib/samples/loanapplication/src/main/java/loanapplication/LoanService.java
index 8d16b04caf..8d16b04caf 100644
--- a/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanService.java
+++ b/java/sca/contrib/samples/loanapplication/src/main/java/loanapplication/LoanService.java
diff --git a/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java b/java/sca/contrib/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
index a88dc0b56b..a88dc0b56b 100644
--- a/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
+++ b/java/sca/contrib/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
diff --git a/java/sca/samples/loanapplication/src/main/resources/loanapplication.composite b/java/sca/contrib/samples/loanapplication/src/main/resources/loanapplication.composite
index 3aa8d030b7..3aa8d030b7 100644
--- a/java/sca/samples/loanapplication/src/main/resources/loanapplication.composite
+++ b/java/sca/contrib/samples/loanapplication/src/main/resources/loanapplication.composite
diff --git a/java/sca/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java b/java/sca/contrib/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
index e88e48a53a..e88e48a53a 100644
--- a/java/sca/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
+++ b/java/sca/contrib/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
diff --git a/java/sca/samples/osgi-supplychain/README b/java/sca/contrib/samples/osgi-supplychain/README
index 11fecf2ae8..11fecf2ae8 100644
--- a/java/sca/samples/osgi-supplychain/README
+++ b/java/sca/contrib/samples/osgi-supplychain/README
diff --git a/java/sca/samples/osgi-supplychain/build-bundles.xml b/java/sca/contrib/samples/osgi-supplychain/build-bundles.xml
index 7a31e6016b..7a31e6016b 100644
--- a/java/sca/samples/osgi-supplychain/build-bundles.xml
+++ b/java/sca/contrib/samples/osgi-supplychain/build-bundles.xml
diff --git a/java/sca/samples/osgi-supplychain/build.xml b/java/sca/contrib/samples/osgi-supplychain/build.xml
index 2e103e5a15..2e103e5a15 100644
--- a/java/sca/samples/osgi-supplychain/build.xml
+++ b/java/sca/contrib/samples/osgi-supplychain/build.xml
diff --git a/java/sca/samples/osgi-supplychain/osgi-supplychain.png b/java/sca/contrib/samples/osgi-supplychain/osgi-supplychain.png
index 2bec57ac8a..2bec57ac8a 100644
--- a/java/sca/samples/osgi-supplychain/osgi-supplychain.png
+++ b/java/sca/contrib/samples/osgi-supplychain/osgi-supplychain.png
diff --git a/java/sca/samples/osgi-supplychain/osgi-supplychain.svg b/java/sca/contrib/samples/osgi-supplychain/osgi-supplychain.svg
index 43cb427944..43cb427944 100644
--- a/java/sca/samples/osgi-supplychain/osgi-supplychain.svg
+++ b/java/sca/contrib/samples/osgi-supplychain/osgi-supplychain.svg
diff --git a/java/sca/samples/osgi-supplychain/pom.xml b/java/sca/contrib/samples/osgi-supplychain/pom.xml
index a3140094c5..a3140094c5 100644
--- a/java/sca/samples/osgi-supplychain/pom.xml
+++ b/java/sca/contrib/samples/osgi-supplychain/pom.xml
diff --git a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
index 5f40054ada..5f40054ada 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
index 64814487cb..64814487cb 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
index b70ddede4f..b70ddede4f 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
diff --git a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index cad0749218..cad0749218 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a1c7fce60a..a1c7fce60a 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 4647a716c7..4647a716c7 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index 4c2c8d7604..4c2c8d7604 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index 1b7fb15bf1..1b7fb15bf1 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e97331c06c..e97331c06c 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
diff --git a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 8f1276c4e7..8f1276c4e7 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index 0f88cca213..0f88cca213 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index f55a068ede..f55a068ede 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
diff --git a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index 3c0bc6aa83..3c0bc6aa83 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 600f3f0c74..600f3f0c74 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index b8bca97bd0..b8bca97bd0 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/Customer.componentType b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/Customer.componentType
index 5c61a0961c..5c61a0961c 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/Customer.componentType
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/Customer.componentType
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
index 87a184d968..87a184d968 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
index 872ab6601a..872ab6601a 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/DSShipper.componentType b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
index 57fcbbc5d1..57fcbbc5d1 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
index 75fa8029f7..75fa8029f7 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/Retailer.componentType b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/Retailer.componentType
index 15185f2bf9..15185f2bf9 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/Retailer.componentType
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/Retailer.componentType
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/Shipper.componentType b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/Shipper.componentType
index 675597d80b..675597d80b 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/Shipper.componentType
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/Shipper.componentType
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/Warehouse.componentType b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
index 6e1ac3e5a9..6e1ac3e5a9 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
index 88d79e5219..88d79e5219 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
index d95ef5d582..d95ef5d582 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
index de7ac7ec7a..de7ac7ec7a 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
index 21241a6899..21241a6899 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
index b5c5a862be..b5c5a862be 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
index 5b368afd5b..5b368afd5b 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
index 47897d16ca..47897d16ca 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
index cae7fdfde2..cae7fdfde2 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
index f5333c7caa..f5333c7caa 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
index d894309b71..d894309b71 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
index 6166549e5a..6166549e5a 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
index fc86a76784..fc86a76784 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/supplychain.composite b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/supplychain.composite
index 0bbfed9176..0bbfed9176 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/supplychain.composite
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/supplychain.composite
diff --git a/java/sca/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
index d1e11168e2..d1e11168e2 100644
--- a/java/sca/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
+++ b/java/sca/contrib/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
diff --git a/java/sca/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/java/sca/contrib/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
index ff15c0d9a2..ff15c0d9a2 100644
--- a/java/sca/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ b/java/sca/contrib/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/java/sca/samples/photo-gallery/README b/java/sca/contrib/samples/photo-gallery/README
index c66edea985..c66edea985 100644
--- a/java/sca/samples/photo-gallery/README
+++ b/java/sca/contrib/samples/photo-gallery/README
diff --git a/java/sca/samples/photo-gallery/build.xml b/java/sca/contrib/samples/photo-gallery/build.xml
index 652afc3570..652afc3570 100644
--- a/java/sca/samples/photo-gallery/build.xml
+++ b/java/sca/contrib/samples/photo-gallery/build.xml
diff --git a/java/sca/samples/photo-gallery/photo-gallery.png b/java/sca/contrib/samples/photo-gallery/photo-gallery.png
index da413edeee..da413edeee 100644
--- a/java/sca/samples/photo-gallery/photo-gallery.png
+++ b/java/sca/contrib/samples/photo-gallery/photo-gallery.png
diff --git a/java/sca/samples/photo-gallery/photo-gallery.svg b/java/sca/contrib/samples/photo-gallery/photo-gallery.svg
index 74f8ecd36d..74f8ecd36d 100644
--- a/java/sca/samples/photo-gallery/photo-gallery.svg
+++ b/java/sca/contrib/samples/photo-gallery/photo-gallery.svg
diff --git a/java/sca/samples/photo-gallery/pom.xml b/java/sca/contrib/samples/photo-gallery/pom.xml
index b96a89f0fc..b96a89f0fc 100644
--- a/java/sca/samples/photo-gallery/pom.xml
+++ b/java/sca/contrib/samples/photo-gallery/pom.xml
diff --git a/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGallery.java b/java/sca/contrib/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
index 1007cd49b0..1007cd49b0 100644
--- a/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
+++ b/java/sca/contrib/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
diff --git a/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java b/java/sca/contrib/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
index d07dc63592..d07dc63592 100644
--- a/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
+++ b/java/sca/contrib/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
diff --git a/java/sca/samples/photo-gallery/src/main/java/services/Album.java b/java/sca/contrib/samples/photo-gallery/src/main/java/services/Album.java
index d614b6a504..d614b6a504 100644
--- a/java/sca/samples/photo-gallery/src/main/java/services/Album.java
+++ b/java/sca/contrib/samples/photo-gallery/src/main/java/services/Album.java
diff --git a/java/sca/samples/photo-gallery/src/main/java/services/AlbumImpl.java b/java/sca/contrib/samples/photo-gallery/src/main/java/services/AlbumImpl.java
index 3cdc56e641..3cdc56e641 100644
--- a/java/sca/samples/photo-gallery/src/main/java/services/AlbumImpl.java
+++ b/java/sca/contrib/samples/photo-gallery/src/main/java/services/AlbumImpl.java
diff --git a/java/sca/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java b/java/sca/contrib/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
index 8ede831ea0..8ede831ea0 100644
--- a/java/sca/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
+++ b/java/sca/contrib/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
diff --git a/java/sca/samples/photo-gallery/src/main/resources/gallery.html b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery.html
index f6566e88ec..f6566e88ec 100644
--- a/java/sca/samples/photo-gallery/src/main/resources/gallery.html
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery.html
diff --git a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg
index 9437b321e2..9437b321e2 100644
--- a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg
diff --git a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg
index 07f37ec505..07f37ec505 100644
--- a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg
diff --git a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg
index 2193784271..2193784271 100644
--- a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg
diff --git a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg
index 1532ee2c1b..1532ee2c1b 100644
--- a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg
diff --git a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg
index 17ffd73aec..17ffd73aec 100644
--- a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg
diff --git a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg
index 19e9ec37df..19e9ec37df 100644
--- a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg
diff --git a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg
index 022416dbce..022416dbce 100644
--- a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg
diff --git a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg
index c78a974714..c78a974714 100644
--- a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg
diff --git a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg
index a98070925a..a98070925a 100644
--- a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg
diff --git a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg
index dc83889116..dc83889116 100644
--- a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg
diff --git a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg
index 0e33548135..0e33548135 100644
--- a/java/sca/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg
diff --git a/java/sca/samples/photo-gallery/src/main/resources/index.gif b/java/sca/contrib/samples/photo-gallery/src/main/resources/index.gif
index 7599ac7686..7599ac7686 100755
--- a/java/sca/samples/photo-gallery/src/main/resources/index.gif
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/index.gif
diff --git a/java/sca/samples/photo-gallery/src/main/resources/index_on.gif b/java/sca/contrib/samples/photo-gallery/src/main/resources/index_on.gif
index 153e9879d6..153e9879d6 100755
--- a/java/sca/samples/photo-gallery/src/main/resources/index_on.gif
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/index_on.gif
diff --git a/java/sca/samples/photo-gallery/src/main/resources/next.gif b/java/sca/contrib/samples/photo-gallery/src/main/resources/next.gif
index 002eaf6951..002eaf6951 100755
--- a/java/sca/samples/photo-gallery/src/main/resources/next.gif
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/next.gif
diff --git a/java/sca/samples/photo-gallery/src/main/resources/next_disabled.gif b/java/sca/contrib/samples/photo-gallery/src/main/resources/next_disabled.gif
index 38b1298453..38b1298453 100755
--- a/java/sca/samples/photo-gallery/src/main/resources/next_disabled.gif
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/next_disabled.gif
diff --git a/java/sca/samples/photo-gallery/src/main/resources/next_on.gif b/java/sca/contrib/samples/photo-gallery/src/main/resources/next_on.gif
index 4e5bb3e7ef..4e5bb3e7ef 100755
--- a/java/sca/samples/photo-gallery/src/main/resources/next_on.gif
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/next_on.gif
diff --git a/java/sca/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite b/java/sca/contrib/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
index 23190de555..23190de555 100644
--- a/java/sca/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
diff --git a/java/sca/samples/photo-gallery/src/main/resources/photo-gallery.composite b/java/sca/contrib/samples/photo-gallery/src/main/resources/photo-gallery.composite
index 0bb3c4b4db..0bb3c4b4db 100644
--- a/java/sca/samples/photo-gallery/src/main/resources/photo-gallery.composite
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/photo-gallery.composite
diff --git a/java/sca/samples/photo-gallery/src/main/resources/prev.gif b/java/sca/contrib/samples/photo-gallery/src/main/resources/prev.gif
index 4eea10f1dc..4eea10f1dc 100755
--- a/java/sca/samples/photo-gallery/src/main/resources/prev.gif
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/prev.gif
diff --git a/java/sca/samples/photo-gallery/src/main/resources/prev_disabled.gif b/java/sca/contrib/samples/photo-gallery/src/main/resources/prev_disabled.gif
index 7e35f07076..7e35f07076 100755
--- a/java/sca/samples/photo-gallery/src/main/resources/prev_disabled.gif
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/prev_disabled.gif
diff --git a/java/sca/samples/photo-gallery/src/main/resources/prev_on.gif b/java/sca/contrib/samples/photo-gallery/src/main/resources/prev_on.gif
index 3ef9a776bb..3ef9a776bb 100755
--- a/java/sca/samples/photo-gallery/src/main/resources/prev_on.gif
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/prev_on.gif
diff --git a/java/sca/samples/photo-gallery/src/main/resources/show_slide.gif b/java/sca/contrib/samples/photo-gallery/src/main/resources/show_slide.gif
index a5b6a15c2b..a5b6a15c2b 100644
--- a/java/sca/samples/photo-gallery/src/main/resources/show_slide.gif
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/show_slide.gif
diff --git a/java/sca/samples/photo-gallery/src/main/resources/space.gif b/java/sca/contrib/samples/photo-gallery/src/main/resources/space.gif
index 170fe82b65..170fe82b65 100644
--- a/java/sca/samples/photo-gallery/src/main/resources/space.gif
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/space.gif
diff --git a/java/sca/samples/photo-gallery/src/main/resources/styles.css b/java/sca/contrib/samples/photo-gallery/src/main/resources/styles.css
index d23d949858..d23d949858 100755
--- a/java/sca/samples/photo-gallery/src/main/resources/styles.css
+++ b/java/sca/contrib/samples/photo-gallery/src/main/resources/styles.css
diff --git a/java/sca/samples/quote-xquery/README b/java/sca/contrib/samples/quote-xquery/README
index cf8a4609a6..cf8a4609a6 100644
--- a/java/sca/samples/quote-xquery/README
+++ b/java/sca/contrib/samples/quote-xquery/README
diff --git a/java/sca/samples/quote-xquery/build.xml b/java/sca/contrib/samples/quote-xquery/build.xml
index a3a5acf102..a3a5acf102 100644
--- a/java/sca/samples/quote-xquery/build.xml
+++ b/java/sca/contrib/samples/quote-xquery/build.xml
diff --git a/java/sca/samples/quote-xquery/pom.xml b/java/sca/contrib/samples/quote-xquery/pom.xml
index 2fa134132c..2fa134132c 100644
--- a/java/sca/samples/quote-xquery/pom.xml
+++ b/java/sca/contrib/samples/quote-xquery/pom.xml
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
index 81396b056a..81396b056a 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
+++ b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
index fb097c46f8..fb097c46f8 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
+++ b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
index c54febcd14..c54febcd14 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
+++ b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
index ebe0cd51ae..ebe0cd51ae 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
+++ b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
index 92341ea26f..92341ea26f 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
+++ b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
index d2d175430b..d2d175430b 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
+++ b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
index 5669738c98..5669738c98 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
+++ b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
index 1a71abab81..1a71abab81 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
+++ b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
index 5aea04bfb1..5aea04bfb1 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
+++ b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
index 26331381a8..26331381a8 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
+++ b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
index 8ed02dc1ef..8ed02dc1ef 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
+++ b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
index 103d19e59d..103d19e59d 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
+++ b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
index cfd201f883..cfd201f883 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
+++ b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
index 26bcfe9707..26bcfe9707 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
+++ b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
index adc852acd4..adc852acd4 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
+++ b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
index 3fa3cdb637..3fa3cdb637 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
+++ b/java/sca/contrib/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
diff --git a/java/sca/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq b/java/sca/contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
index d504f40f04..d504f40f04 100644
--- a/java/sca/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
+++ b/java/sca/contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
diff --git a/java/sca/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq b/java/sca/contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
index cc50da164a..cc50da164a 100644
--- a/java/sca/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
+++ b/java/sca/contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
diff --git a/java/sca/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq b/java/sca/contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
index cf41ab528d..cf41ab528d 100644
--- a/java/sca/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
+++ b/java/sca/contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
diff --git a/java/sca/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd b/java/sca/contrib/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
index e7f3e67068..e7f3e67068 100644
--- a/java/sca/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
+++ b/java/sca/contrib/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
diff --git a/java/sca/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd b/java/sca/contrib/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
index 4c437586ef..4c437586ef 100644
--- a/java/sca/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
+++ b/java/sca/contrib/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
diff --git a/java/sca/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd b/java/sca/contrib/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
index 4f64850056..4f64850056 100644
--- a/java/sca/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
+++ b/java/sca/contrib/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
diff --git a/java/sca/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl b/java/sca/contrib/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
index 96c2af138a..96c2af138a 100644
--- a/java/sca/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
+++ b/java/sca/contrib/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
diff --git a/java/sca/samples/quote-xquery/src/main/resources/xqueryquotews.composite b/java/sca/contrib/samples/quote-xquery/src/main/resources/xqueryquotews.composite
index 9e35e2ecb2..9e35e2ecb2 100644
--- a/java/sca/samples/quote-xquery/src/main/resources/xqueryquotews.composite
+++ b/java/sca/contrib/samples/quote-xquery/src/main/resources/xqueryquotews.composite
diff --git a/java/sca/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite b/java/sca/contrib/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
index 35306b9f89..35306b9f89 100644
--- a/java/sca/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
+++ b/java/sca/contrib/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
diff --git a/java/sca/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java b/java/sca/contrib/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
index 9555532b3e..9555532b3e 100644
--- a/java/sca/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
+++ b/java/sca/contrib/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
diff --git a/java/sca/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java b/java/sca/contrib/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
index 9a4be5bda6..9a4be5bda6 100644
--- a/java/sca/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
+++ b/java/sca/contrib/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
diff --git a/java/sca/samples/simple-bigbank-spring/README b/java/sca/contrib/samples/simple-bigbank-spring/README
index bb44d63719..bb44d63719 100644
--- a/java/sca/samples/simple-bigbank-spring/README
+++ b/java/sca/contrib/samples/simple-bigbank-spring/README
diff --git a/java/sca/samples/simple-bigbank-spring/build-dojo.xml b/java/sca/contrib/samples/simple-bigbank-spring/build-dojo.xml
index 9d282c2dd2..9d282c2dd2 100644
--- a/java/sca/samples/simple-bigbank-spring/build-dojo.xml
+++ b/java/sca/contrib/samples/simple-bigbank-spring/build-dojo.xml
diff --git a/java/sca/samples/simple-bigbank-spring/build.xml b/java/sca/contrib/samples/simple-bigbank-spring/build.xml
index ecc2596d71..ecc2596d71 100644
--- a/java/sca/samples/simple-bigbank-spring/build.xml
+++ b/java/sca/contrib/samples/simple-bigbank-spring/build.xml
diff --git a/java/sca/samples/simple-bigbank-spring/pom.xml b/java/sca/contrib/samples/simple-bigbank-spring/pom.xml
index 5e71de9a6b..5e71de9a6b 100644
--- a/java/sca/samples/simple-bigbank-spring/pom.xml
+++ b/java/sca/contrib/samples/simple-bigbank-spring/pom.xml
diff --git a/java/sca/samples/simple-bigbank-spring/simple-bigbank-spring.png b/java/sca/contrib/samples/simple-bigbank-spring/simple-bigbank-spring.png
index 593c047f6a..593c047f6a 100644
--- a/java/sca/samples/simple-bigbank-spring/simple-bigbank-spring.png
+++ b/java/sca/contrib/samples/simple-bigbank-spring/simple-bigbank-spring.png
diff --git a/java/sca/samples/simple-bigbank-spring/simple-bigbank-spring.svg b/java/sca/contrib/samples/simple-bigbank-spring/simple-bigbank-spring.svg
index c64f6de6b9..c64f6de6b9 100644
--- a/java/sca/samples/simple-bigbank-spring/simple-bigbank-spring.svg
+++ b/java/sca/contrib/samples/simple-bigbank-spring/simple-bigbank-spring.svg
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
index 1625ff5b65..1625ff5b65 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
index 7c9082b944..7c9082b944 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
index 6252697ffe..6252697ffe 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
index 3f81f48fb9..3f81f48fb9 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java
index 8596181d7f..8596181d7f 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java
index 2b086ec467..2b086ec467 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
index bcac678cd7..bcac678cd7 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java
index 070cfe12db..070cfe12db 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
index 7682b729c3..7682b729c3 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java
index 9f06a71bae..9f06a71bae 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java
index f86fda7c0f..f86fda7c0f 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
index 488146ebeb..488146ebeb 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java
index 66a0ba0e63..66a0ba0e63 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
index f7b940f873..f7b940f873 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
index 241347e417..241347e417 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
index be86627882..be86627882 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/resources/BigBank.composite b/java/sca/contrib/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
index ea2dbc7e1c..ea2dbc7e1c 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite b/java/sca/contrib/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite
index 4bb2ce61ef..4bb2ce61ef 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite b/java/sca/contrib/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite
index 97dff499ba..97dff499ba 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml b/java/sca/contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
index 899d8d7d62..899d8d7d62 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml b/java/sca/contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml
index b9e26bf81b..b9e26bf81b 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF b/java/sca/contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF
index 32fa070ffb..32fa070ffb 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml b/java/sca/contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml
index b30f821f7e..b30f821f7e 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/resources/web/style.css b/java/sca/contrib/samples/simple-bigbank-spring/src/main/resources/web/style.css
index 1071583264..1071583264 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/resources/web/style.css
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/main/resources/web/style.css
diff --git a/java/sca/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java b/java/sca/contrib/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
index d82e383e46..d82e383e46 100644
--- a/java/sca/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
+++ b/java/sca/contrib/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
diff --git a/java/sca/samples/simple-bigbank/README b/java/sca/contrib/samples/simple-bigbank/README
index acbe93a4d3..acbe93a4d3 100644
--- a/java/sca/samples/simple-bigbank/README
+++ b/java/sca/contrib/samples/simple-bigbank/README
diff --git a/java/sca/samples/simple-bigbank/build.xml b/java/sca/contrib/samples/simple-bigbank/build.xml
index a814014eae..a814014eae 100644
--- a/java/sca/samples/simple-bigbank/build.xml
+++ b/java/sca/contrib/samples/simple-bigbank/build.xml
diff --git a/java/sca/samples/simple-bigbank/pom.xml b/java/sca/contrib/samples/simple-bigbank/pom.xml
index 82cbdfe4b6..82cbdfe4b6 100644
--- a/java/sca/samples/simple-bigbank/pom.xml
+++ b/java/sca/contrib/samples/simple-bigbank/pom.xml
diff --git a/java/sca/samples/simple-bigbank/simple-bigbank.png b/java/sca/contrib/samples/simple-bigbank/simple-bigbank.png
index 593c047f6a..593c047f6a 100644
--- a/java/sca/samples/simple-bigbank/simple-bigbank.png
+++ b/java/sca/contrib/samples/simple-bigbank/simple-bigbank.png
diff --git a/java/sca/samples/simple-bigbank/simple-bigbank.svg b/java/sca/contrib/samples/simple-bigbank/simple-bigbank.svg
index c64f6de6b9..c64f6de6b9 100644
--- a/java/sca/samples/simple-bigbank/simple-bigbank.svg
+++ b/java/sca/contrib/samples/simple-bigbank/simple-bigbank.svg
diff --git a/java/sca/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
index 1625ff5b65..1625ff5b65 100644
--- a/java/sca/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
+++ b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
diff --git a/java/sca/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
index 7c9082b944..7c9082b944 100644
--- a/java/sca/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
+++ b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
diff --git a/java/sca/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
index 7a3c184cb2..7a3c184cb2 100644
--- a/java/sca/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/java/sca/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
index a5ae7b3955..a5ae7b3955 100644
--- a/java/sca/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
+++ b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
diff --git a/java/sca/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
index c354de387b..c354de387b 100644
--- a/java/sca/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
+++ b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
diff --git a/java/sca/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
index 000acb935c..000acb935c 100644
--- a/java/sca/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
+++ b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
diff --git a/java/sca/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
index 11bdff757e..11bdff757e 100644
--- a/java/sca/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
+++ b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
diff --git a/java/sca/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
index b791024076..b791024076 100644
--- a/java/sca/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
+++ b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
diff --git a/java/sca/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
index 86246a3f84..86246a3f84 100644
--- a/java/sca/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
+++ b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
diff --git a/java/sca/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
index edbf910d37..edbf910d37 100644
--- a/java/sca/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
+++ b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
diff --git a/java/sca/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 0512d40b0b..0512d40b0b 100644
--- a/java/sca/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/java/sca/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
index 4770c214ab..4770c214ab 100644
--- a/java/sca/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/java/sca/contrib/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/java/sca/samples/simple-bigbank/src/main/resources/Account.composite b/java/sca/contrib/samples/simple-bigbank/src/main/resources/Account.composite
index e71615e27e..e71615e27e 100644
--- a/java/sca/samples/simple-bigbank/src/main/resources/Account.composite
+++ b/java/sca/contrib/samples/simple-bigbank/src/main/resources/Account.composite
diff --git a/java/sca/samples/simple-bigbank/src/main/resources/BigBank.composite b/java/sca/contrib/samples/simple-bigbank/src/main/resources/BigBank.composite
index c870f39cab..c870f39cab 100644
--- a/java/sca/samples/simple-bigbank/src/main/resources/BigBank.composite
+++ b/java/sca/contrib/samples/simple-bigbank/src/main/resources/BigBank.composite
diff --git a/java/sca/samples/simple-bigbank/src/main/resources/StockQuote.composite b/java/sca/contrib/samples/simple-bigbank/src/main/resources/StockQuote.composite
index 4f29c14851..4f29c14851 100644
--- a/java/sca/samples/simple-bigbank/src/main/resources/StockQuote.composite
+++ b/java/sca/contrib/samples/simple-bigbank/src/main/resources/StockQuote.composite
diff --git a/java/sca/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java b/java/sca/contrib/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
index ba6c1dd797..ba6c1dd797 100644
--- a/java/sca/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
+++ b/java/sca/contrib/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
diff --git a/java/sca/samples/simple-callback-ws/README b/java/sca/contrib/samples/simple-callback-ws/README
index 6b27718f74..6b27718f74 100644
--- a/java/sca/samples/simple-callback-ws/README
+++ b/java/sca/contrib/samples/simple-callback-ws/README
diff --git a/java/sca/samples/simple-callback-ws/build.xml b/java/sca/contrib/samples/simple-callback-ws/build.xml
index 10b69bd395..10b69bd395 100644
--- a/java/sca/samples/simple-callback-ws/build.xml
+++ b/java/sca/contrib/samples/simple-callback-ws/build.xml
diff --git a/java/sca/samples/simple-callback-ws/pom.xml b/java/sca/contrib/samples/simple-callback-ws/pom.xml
index 5b5d5e666b..5b5d5e666b 100644
--- a/java/sca/samples/simple-callback-ws/pom.xml
+++ b/java/sca/contrib/samples/simple-callback-ws/pom.xml
diff --git a/java/sca/samples/simple-callback-ws/simple-callback-ws.png b/java/sca/contrib/samples/simple-callback-ws/simple-callback-ws.png
index 1b6353f5cf..1b6353f5cf 100644
--- a/java/sca/samples/simple-callback-ws/simple-callback-ws.png
+++ b/java/sca/contrib/samples/simple-callback-ws/simple-callback-ws.png
diff --git a/java/sca/samples/simple-callback-ws/simple-callback-ws.svg b/java/sca/contrib/samples/simple-callback-ws/simple-callback-ws.svg
index 7d9e3de510..7d9e3de510 100644
--- a/java/sca/samples/simple-callback-ws/simple-callback-ws.svg
+++ b/java/sca/contrib/samples/simple-callback-ws/simple-callback-ws.svg
diff --git a/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java b/java/sca/contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
index 4cc00d6d0f..4cc00d6d0f 100644
--- a/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
+++ b/java/sca/contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
diff --git a/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java b/java/sca/contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
index 7ecb51036f..7ecb51036f 100644
--- a/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
+++ b/java/sca/contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
diff --git a/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java b/java/sca/contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
index 7a72f50964..7a72f50964 100644
--- a/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
+++ b/java/sca/contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
diff --git a/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java b/java/sca/contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
index dd26439619..dd26439619 100644
--- a/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
+++ b/java/sca/contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java b/java/sca/contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
index 6a31d90458..6a31d90458 100644
--- a/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
+++ b/java/sca/contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java b/java/sca/contrib/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
index eeb0e52163..eeb0e52163 100644
--- a/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
+++ b/java/sca/contrib/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/java/sca/samples/simple-callback-ws/src/main/resources/simplecallback.composite b/java/sca/contrib/samples/simple-callback-ws/src/main/resources/simplecallback.composite
index 53e7fe66af..53e7fe66af 100644
--- a/java/sca/samples/simple-callback-ws/src/main/resources/simplecallback.composite
+++ b/java/sca/contrib/samples/simple-callback-ws/src/main/resources/simplecallback.composite
diff --git a/java/sca/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl b/java/sca/contrib/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
index 8a6465de3a..8a6465de3a 100644
--- a/java/sca/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
+++ b/java/sca/contrib/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
diff --git a/java/sca/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java b/java/sca/contrib/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
index 580a7f6b0c..580a7f6b0c 100644
--- a/java/sca/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ b/java/sca/contrib/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/java/sca/samples/simple-callback/README b/java/sca/contrib/samples/simple-callback/README
index 719376f254..719376f254 100644
--- a/java/sca/samples/simple-callback/README
+++ b/java/sca/contrib/samples/simple-callback/README
diff --git a/java/sca/samples/simple-callback/build.xml b/java/sca/contrib/samples/simple-callback/build.xml
index 47d1ea4bc1..47d1ea4bc1 100644
--- a/java/sca/samples/simple-callback/build.xml
+++ b/java/sca/contrib/samples/simple-callback/build.xml
diff --git a/java/sca/samples/simple-callback/pom.xml b/java/sca/contrib/samples/simple-callback/pom.xml
index 056aef6a1e..056aef6a1e 100644
--- a/java/sca/samples/simple-callback/pom.xml
+++ b/java/sca/contrib/samples/simple-callback/pom.xml
diff --git a/java/sca/samples/simple-callback/simple-callback.png b/java/sca/contrib/samples/simple-callback/simple-callback.png
index 1b6353f5cf..1b6353f5cf 100644
--- a/java/sca/samples/simple-callback/simple-callback.png
+++ b/java/sca/contrib/samples/simple-callback/simple-callback.png
diff --git a/java/sca/samples/simple-callback/simple-callback.svg b/java/sca/contrib/samples/simple-callback/simple-callback.svg
index 484b65df9d..484b65df9d 100644
--- a/java/sca/samples/simple-callback/simple-callback.svg
+++ b/java/sca/contrib/samples/simple-callback/simple-callback.svg
diff --git a/java/sca/samples/simple-callback/src/main/java/simplecallback/MyClient.java b/java/sca/contrib/samples/simple-callback/src/main/java/simplecallback/MyClient.java
index 4cc00d6d0f..4cc00d6d0f 100644
--- a/java/sca/samples/simple-callback/src/main/java/simplecallback/MyClient.java
+++ b/java/sca/contrib/samples/simple-callback/src/main/java/simplecallback/MyClient.java
diff --git a/java/sca/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java b/java/sca/contrib/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
index 18e159edc3..18e159edc3 100644
--- a/java/sca/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
+++ b/java/sca/contrib/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
diff --git a/java/sca/samples/simple-callback/src/main/java/simplecallback/MyService.java b/java/sca/contrib/samples/simple-callback/src/main/java/simplecallback/MyService.java
index a065408954..a065408954 100644
--- a/java/sca/samples/simple-callback/src/main/java/simplecallback/MyService.java
+++ b/java/sca/contrib/samples/simple-callback/src/main/java/simplecallback/MyService.java
diff --git a/java/sca/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java b/java/sca/contrib/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
index b27eea44f5..b27eea44f5 100644
--- a/java/sca/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
+++ b/java/sca/contrib/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/java/sca/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java b/java/sca/contrib/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
index dc5493babe..dc5493babe 100644
--- a/java/sca/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
+++ b/java/sca/contrib/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/java/sca/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java b/java/sca/contrib/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
index b8987fcd07..b8987fcd07 100644
--- a/java/sca/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
+++ b/java/sca/contrib/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/java/sca/samples/simple-callback/src/main/resources/simplecallback.composite b/java/sca/contrib/samples/simple-callback/src/main/resources/simplecallback.composite
index 33e6f60601..33e6f60601 100644
--- a/java/sca/samples/simple-callback/src/main/resources/simplecallback.composite
+++ b/java/sca/contrib/samples/simple-callback/src/main/resources/simplecallback.composite
diff --git a/java/sca/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java b/java/sca/contrib/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
index cbaab8af83..cbaab8af83 100644
--- a/java/sca/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ b/java/sca/contrib/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/java/sca/samples/spi-implementation-pojo/pom.xml b/java/sca/contrib/samples/spi-implementation-pojo/pom.xml
index 870c67b5f2..870c67b5f2 100644
--- a/java/sca/samples/spi-implementation-pojo/pom.xml
+++ b/java/sca/contrib/samples/spi-implementation-pojo/pom.xml
diff --git a/java/sca/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java b/java/sca/contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
index 73104c3166..73104c3166 100644
--- a/java/sca/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
+++ b/java/sca/contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
diff --git a/java/sca/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java b/java/sca/contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
index 43efae32ca..43efae32ca 100644
--- a/java/sca/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
+++ b/java/sca/contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
diff --git a/java/sca/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java b/java/sca/contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
index b33d9a3644..b33d9a3644 100644
--- a/java/sca/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
+++ b/java/sca/contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
diff --git a/java/sca/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java b/java/sca/contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
index 92c92eb309..92c92eb309 100644
--- a/java/sca/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
+++ b/java/sca/contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
diff --git a/java/sca/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator b/java/sca/contrib/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
index 95ee37c1aa..95ee37c1aa 100644
--- a/java/sca/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
+++ b/java/sca/contrib/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
diff --git a/java/sca/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java b/java/sca/contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
index cc32929f09..cc32929f09 100644
--- a/java/sca/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
+++ b/java/sca/contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
diff --git a/java/sca/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java b/java/sca/contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
index 02af1ccf22..02af1ccf22 100644
--- a/java/sca/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
+++ b/java/sca/contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java b/java/sca/contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
index 5813fda330..5813fda330 100644
--- a/java/sca/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/java/sca/contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/java/sca/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite b/java/sca/contrib/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
index fa9cecc160..fa9cecc160 100644
--- a/java/sca/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
+++ b/java/sca/contrib/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
diff --git a/java/sca/samples/spring-bigbank-calculator/README b/java/sca/contrib/samples/spring-bigbank-calculator/README
index 3869ea6a12..3869ea6a12 100644
--- a/java/sca/samples/spring-bigbank-calculator/README
+++ b/java/sca/contrib/samples/spring-bigbank-calculator/README
diff --git a/java/sca/samples/spring-bigbank-calculator/build.xml b/java/sca/contrib/samples/spring-bigbank-calculator/build.xml
index 9d69ee9ba0..9d69ee9ba0 100644
--- a/java/sca/samples/spring-bigbank-calculator/build.xml
+++ b/java/sca/contrib/samples/spring-bigbank-calculator/build.xml
diff --git a/java/sca/samples/spring-bigbank-calculator/pom.xml b/java/sca/contrib/samples/spring-bigbank-calculator/pom.xml
index 5f2b2452ab..5f2b2452ab 100644
--- a/java/sca/samples/spring-bigbank-calculator/pom.xml
+++ b/java/sca/contrib/samples/spring-bigbank-calculator/pom.xml
diff --git a/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java
index ecaa4e28de..ecaa4e28de 100644
--- a/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java
+++ b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java
diff --git a/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java
index 66a0ba0e63..66a0ba0e63 100644
--- a/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java
+++ b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java
diff --git a/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
index 665dbbf9ac..665dbbf9ac 100644
--- a/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
+++ b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
diff --git a/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java
index 22e9d58a94..22e9d58a94 100644
--- a/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java
+++ b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java
diff --git a/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java
index ba3d43448e..ba3d43448e 100644
--- a/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java
+++ b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java
diff --git a/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java
index 17691af0e8..17691af0e8 100644
--- a/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java
+++ b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java
diff --git a/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
index c6a230fcb4..c6a230fcb4 100644
--- a/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
+++ b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
diff --git a/java/sca/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite
index 504a4ccfcd..504a4ccfcd 100644
--- a/java/sca/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite
+++ b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite
diff --git a/java/sca/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml
index 42e5f824f9..42e5f824f9 100644
--- a/java/sca/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml
+++ b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml
diff --git a/java/sca/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
index 6f11106ddd..6f11106ddd 100644
--- a/java/sca/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
+++ b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
diff --git a/java/sca/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/java/sca/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/java/sca/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
index cfd96f287a..cfd96f287a 100644
--- a/java/sca/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/java/sca/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
index 8e7a884d41..8e7a884d41 100644
--- a/java/sca/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/java/sca/contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/java/sca/samples/spring-bigbank-calculator/src/test/java/bigbank/calculator/CalculatorServiceTestCase.java b/java/sca/contrib/samples/spring-bigbank-calculator/src/test/java/bigbank/calculator/CalculatorServiceTestCase.java
index 02a11485cd..02a11485cd 100644
--- a/java/sca/samples/spring-bigbank-calculator/src/test/java/bigbank/calculator/CalculatorServiceTestCase.java
+++ b/java/sca/contrib/samples/spring-bigbank-calculator/src/test/java/bigbank/calculator/CalculatorServiceTestCase.java
diff --git a/java/sca/samples/spring-bigbank-checkaccount/README b/java/sca/contrib/samples/spring-bigbank-checkaccount/README
index 17b71e7590..17b71e7590 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/README
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/README
diff --git a/java/sca/samples/spring-bigbank-checkaccount/build.xml b/java/sca/contrib/samples/spring-bigbank-checkaccount/build.xml
index 26d71c146f..26d71c146f 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/build.xml
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/build.xml
diff --git a/java/sca/samples/spring-bigbank-checkaccount/pom.xml b/java/sca/contrib/samples/spring-bigbank-checkaccount/pom.xml
index b46074b8c8..b46074b8c8 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/pom.xml
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/pom.xml
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
index 9737ac27eb..9737ac27eb 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java
index 4d8b03fc7d..4d8b03fc7d 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
index 3ed3086dbd..3ed3086dbd 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
index 562314230a..562314230a 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
index ad17ab8cf5..ad17ab8cf5 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
index 7b44a28bc9..7b44a28bc9 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
index bbd5b0c325..bbd5b0c325 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
index cb26ca809d..cb26ca809d 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
index 5c692df4ec..5c692df4ec 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
index 24da9878a5..24da9878a5 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
index b023adf907..b023adf907 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
index 96a5b2ca1f..96a5b2ca1f 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite
index 371a1afd32..371a1afd32 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 6491a0d326..6491a0d326 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index b1bce4339d..b1bce4339d 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index d6bfe2167e..d6bfe2167e 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml
index 0ce1440ddf..0ce1440ddf 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml
index 6b2338f611..6b2338f611 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/test/java/bigbank/checkaccount/CheckAccountServiceTestCase.java b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/test/java/bigbank/checkaccount/CheckAccountServiceTestCase.java
index a45630278b..a45630278b 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/test/java/bigbank/checkaccount/CheckAccountServiceTestCase.java
+++ b/java/sca/contrib/samples/spring-bigbank-checkaccount/src/test/java/bigbank/checkaccount/CheckAccountServiceTestCase.java
diff --git a/java/sca/samples/spring-bigbank-stockquote/README b/java/sca/contrib/samples/spring-bigbank-stockquote/README
index b90bafeb59..b90bafeb59 100644
--- a/java/sca/samples/spring-bigbank-stockquote/README
+++ b/java/sca/contrib/samples/spring-bigbank-stockquote/README
diff --git a/java/sca/samples/spring-bigbank-stockquote/build.xml b/java/sca/contrib/samples/spring-bigbank-stockquote/build.xml
index 1b38a40495..1b38a40495 100644
--- a/java/sca/samples/spring-bigbank-stockquote/build.xml
+++ b/java/sca/contrib/samples/spring-bigbank-stockquote/build.xml
diff --git a/java/sca/samples/spring-bigbank-stockquote/pom.xml b/java/sca/contrib/samples/spring-bigbank-stockquote/pom.xml
index 4bf37e88fa..4bf37e88fa 100644
--- a/java/sca/samples/spring-bigbank-stockquote/pom.xml
+++ b/java/sca/contrib/samples/spring-bigbank-stockquote/pom.xml
diff --git a/java/sca/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/java/sca/contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 833cc50f71..833cc50f71 100644
--- a/java/sca/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/java/sca/contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/java/sca/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java b/java/sca/contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java
index d6db2bd182..d6db2bd182 100644
--- a/java/sca/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/java/sca/contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/java/sca/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java b/java/sca/contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java
index 643f9a187c..643f9a187c 100644
--- a/java/sca/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java
+++ b/java/sca/contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java
diff --git a/java/sca/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java b/java/sca/contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java
index da96f29b0c..da96f29b0c 100644
--- a/java/sca/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java
+++ b/java/sca/contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java
diff --git a/java/sca/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml b/java/sca/contrib/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml
index 87dd006b5a..87dd006b5a 100644
--- a/java/sca/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml
+++ b/java/sca/contrib/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml
diff --git a/java/sca/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite b/java/sca/contrib/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite
index 06544c6883..06544c6883 100644
--- a/java/sca/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite
+++ b/java/sca/contrib/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite
diff --git a/java/sca/samples/spring-bigbank-stockquote/src/test/java/bigbank/stockquote/StockQuoteServiceTestCase.java b/java/sca/contrib/samples/spring-bigbank-stockquote/src/test/java/bigbank/stockquote/StockQuoteServiceTestCase.java
index 4b36d0694d..4b36d0694d 100644
--- a/java/sca/samples/spring-bigbank-stockquote/src/test/java/bigbank/stockquote/StockQuoteServiceTestCase.java
+++ b/java/sca/contrib/samples/spring-bigbank-stockquote/src/test/java/bigbank/stockquote/StockQuoteServiceTestCase.java
diff --git a/java/sca/samples/store-distributed/README b/java/sca/contrib/samples/store-distributed/README
index 46e71bf51e..46e71bf51e 100644
--- a/java/sca/samples/store-distributed/README
+++ b/java/sca/contrib/samples/store-distributed/README
diff --git a/java/sca/samples/store-distributed/build.xml b/java/sca/contrib/samples/store-distributed/build.xml
index 652afc3570..652afc3570 100644
--- a/java/sca/samples/store-distributed/build.xml
+++ b/java/sca/contrib/samples/store-distributed/build.xml
diff --git a/java/sca/samples/store-distributed/cloud.composite b/java/sca/contrib/samples/store-distributed/cloud.composite
index 7bd13d5b6f..7bd13d5b6f 100644
--- a/java/sca/samples/store-distributed/cloud.composite
+++ b/java/sca/contrib/samples/store-distributed/cloud.composite
diff --git a/java/sca/samples/store-distributed/domain.composite b/java/sca/contrib/samples/store-distributed/domain.composite
index 6898c454af..6898c454af 100644
--- a/java/sca/samples/store-distributed/domain.composite
+++ b/java/sca/contrib/samples/store-distributed/domain.composite
diff --git a/java/sca/samples/store-distributed/pom.xml b/java/sca/contrib/samples/store-distributed/pom.xml
index e812ae0b10..e812ae0b10 100644
--- a/java/sca/samples/store-distributed/pom.xml
+++ b/java/sca/contrib/samples/store-distributed/pom.xml
diff --git a/java/sca/samples/store-distributed/src/main/java/node/LaunchDomain.java b/java/sca/contrib/samples/store-distributed/src/main/java/node/LaunchDomain.java
index dd19f6b49b..dd19f6b49b 100644
--- a/java/sca/samples/store-distributed/src/main/java/node/LaunchDomain.java
+++ b/java/sca/contrib/samples/store-distributed/src/main/java/node/LaunchDomain.java
diff --git a/java/sca/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java b/java/sca/contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java
index 9016e515fb..9016e515fb 100644
--- a/java/sca/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java
+++ b/java/sca/contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java
diff --git a/java/sca/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java b/java/sca/contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java
index 2b387aec82..2b387aec82 100644
--- a/java/sca/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java
+++ b/java/sca/contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java
diff --git a/java/sca/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java b/java/sca/contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java
index fb138e484f..fb138e484f 100644
--- a/java/sca/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java
+++ b/java/sca/contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java
diff --git a/java/sca/samples/store-distributed/src/main/java/services/Cart.java b/java/sca/contrib/samples/store-distributed/src/main/java/services/Cart.java
index 3fb5439bc3..3fb5439bc3 100644
--- a/java/sca/samples/store-distributed/src/main/java/services/Cart.java
+++ b/java/sca/contrib/samples/store-distributed/src/main/java/services/Cart.java
diff --git a/java/sca/samples/store-distributed/src/main/java/services/Catalog.java b/java/sca/contrib/samples/store-distributed/src/main/java/services/Catalog.java
index b5e504fe11..b5e504fe11 100644
--- a/java/sca/samples/store-distributed/src/main/java/services/Catalog.java
+++ b/java/sca/contrib/samples/store-distributed/src/main/java/services/Catalog.java
diff --git a/java/sca/samples/store-distributed/src/main/java/services/CurrencyConverter.java b/java/sca/contrib/samples/store-distributed/src/main/java/services/CurrencyConverter.java
index a064f3dd69..a064f3dd69 100644
--- a/java/sca/samples/store-distributed/src/main/java/services/CurrencyConverter.java
+++ b/java/sca/contrib/samples/store-distributed/src/main/java/services/CurrencyConverter.java
diff --git a/java/sca/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java b/java/sca/contrib/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java
index c354aed447..c354aed447 100644
--- a/java/sca/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java
+++ b/java/sca/contrib/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java
diff --git a/java/sca/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java b/java/sca/contrib/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java
index d132a24b00..d132a24b00 100644
--- a/java/sca/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java
+++ b/java/sca/contrib/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java
diff --git a/java/sca/samples/store-distributed/src/main/java/services/Item.java b/java/sca/contrib/samples/store-distributed/src/main/java/services/Item.java
index 27abd4f016..27abd4f016 100644
--- a/java/sca/samples/store-distributed/src/main/java/services/Item.java
+++ b/java/sca/contrib/samples/store-distributed/src/main/java/services/Item.java
diff --git a/java/sca/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java b/java/sca/contrib/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java
index 698614212d..698614212d 100644
--- a/java/sca/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java
+++ b/java/sca/contrib/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java
diff --git a/java/sca/samples/store-distributed/src/main/java/services/Total.java b/java/sca/contrib/samples/store-distributed/src/main/java/services/Total.java
index b77cc1c7ac..b77cc1c7ac 100644
--- a/java/sca/samples/store-distributed/src/main/java/services/Total.java
+++ b/java/sca/contrib/samples/store-distributed/src/main/java/services/Total.java
diff --git a/java/sca/samples/store-distributed/src/main/resources/cloud/NodeA.composite b/java/sca/contrib/samples/store-distributed/src/main/resources/cloud/NodeA.composite
index f7bfd0fcb6..f7bfd0fcb6 100644
--- a/java/sca/samples/store-distributed/src/main/resources/cloud/NodeA.composite
+++ b/java/sca/contrib/samples/store-distributed/src/main/resources/cloud/NodeA.composite
diff --git a/java/sca/samples/store-distributed/src/main/resources/cloud/NodeB.composite b/java/sca/contrib/samples/store-distributed/src/main/resources/cloud/NodeB.composite
index 187c5caf1c..187c5caf1c 100644
--- a/java/sca/samples/store-distributed/src/main/resources/cloud/NodeB.composite
+++ b/java/sca/contrib/samples/store-distributed/src/main/resources/cloud/NodeB.composite
diff --git a/java/sca/samples/store-distributed/src/main/resources/cloud/NodeC.composite b/java/sca/contrib/samples/store-distributed/src/main/resources/cloud/NodeC.composite
index 98113a3576..98113a3576 100644
--- a/java/sca/samples/store-distributed/src/main/resources/cloud/NodeC.composite
+++ b/java/sca/contrib/samples/store-distributed/src/main/resources/cloud/NodeC.composite
diff --git a/java/sca/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/java/sca/contrib/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
index f165ee0e29..f165ee0e29 100644
--- a/java/sca/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/store-distributed/src/main/resources/nodeA/store.composite b/java/sca/contrib/samples/store-distributed/src/main/resources/nodeA/store.composite
index 2ac608d43f..2ac608d43f 100644
--- a/java/sca/samples/store-distributed/src/main/resources/nodeA/store.composite
+++ b/java/sca/contrib/samples/store-distributed/src/main/resources/nodeA/store.composite
diff --git a/java/sca/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/java/sca/contrib/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 0f8e76ccd7..0f8e76ccd7 100644
--- a/java/sca/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/store-distributed/src/main/resources/nodeB/store.composite b/java/sca/contrib/samples/store-distributed/src/main/resources/nodeB/store.composite
index 062a7aa2cd..062a7aa2cd 100644
--- a/java/sca/samples/store-distributed/src/main/resources/nodeB/store.composite
+++ b/java/sca/contrib/samples/store-distributed/src/main/resources/nodeB/store.composite
diff --git a/java/sca/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/java/sca/contrib/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
index 15bab17c1a..15bab17c1a 100644
--- a/java/sca/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/java/sca/contrib/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/java/sca/samples/store-distributed/src/main/resources/nodeC/store.composite b/java/sca/contrib/samples/store-distributed/src/main/resources/nodeC/store.composite
index 5de310128d..5de310128d 100644
--- a/java/sca/samples/store-distributed/src/main/resources/nodeC/store.composite
+++ b/java/sca/contrib/samples/store-distributed/src/main/resources/nodeC/store.composite
diff --git a/java/sca/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html b/java/sca/contrib/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html
index 45604463d1..45604463d1 100644
--- a/java/sca/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html
+++ b/java/sca/contrib/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html
diff --git a/java/sca/samples/store-distributed/src/main/resources/uiservices/store.html b/java/sca/contrib/samples/store-distributed/src/main/resources/uiservices/store.html
index 45604463d1..45604463d1 100644
--- a/java/sca/samples/store-distributed/src/main/resources/uiservices/store.html
+++ b/java/sca/contrib/samples/store-distributed/src/main/resources/uiservices/store.html
diff --git a/java/sca/samples/store-distributed/store.png b/java/sca/contrib/samples/store-distributed/store.png
index da413edeee..da413edeee 100644
--- a/java/sca/samples/store-distributed/store.png
+++ b/java/sca/contrib/samples/store-distributed/store.png
diff --git a/java/sca/samples/store-distributed/store.svg b/java/sca/contrib/samples/store-distributed/store.svg
index 74f8ecd36d..74f8ecd36d 100644
--- a/java/sca/samples/store-distributed/store.svg
+++ b/java/sca/contrib/samples/store-distributed/store.svg
diff --git a/java/sca/samples/store-distributed/workspace.xml b/java/sca/contrib/samples/store-distributed/workspace.xml
index d6cb2bfc81..d6cb2bfc81 100644
--- a/java/sca/samples/store-distributed/workspace.xml
+++ b/java/sca/contrib/samples/store-distributed/workspace.xml
diff --git a/java/sca/samples/store/README b/java/sca/contrib/samples/store/README
index 46e71bf51e..46e71bf51e 100644
--- a/java/sca/samples/store/README
+++ b/java/sca/contrib/samples/store/README
diff --git a/java/sca/samples/store/build.xml b/java/sca/contrib/samples/store/build.xml
index 652afc3570..652afc3570 100644
--- a/java/sca/samples/store/build.xml
+++ b/java/sca/contrib/samples/store/build.xml
diff --git a/java/sca/samples/store/pom.xml b/java/sca/contrib/samples/store/pom.xml
index d68563807a..d68563807a 100644
--- a/java/sca/samples/store/pom.xml
+++ b/java/sca/contrib/samples/store/pom.xml
diff --git a/java/sca/samples/store/src/main/java/launch/Launch.java b/java/sca/contrib/samples/store/src/main/java/launch/Launch.java
index 801697abea..801697abea 100644
--- a/java/sca/samples/store/src/main/java/launch/Launch.java
+++ b/java/sca/contrib/samples/store/src/main/java/launch/Launch.java
diff --git a/java/sca/samples/store/src/main/java/services/Cart.java b/java/sca/contrib/samples/store/src/main/java/services/Cart.java
index 3fb5439bc3..3fb5439bc3 100644
--- a/java/sca/samples/store/src/main/java/services/Cart.java
+++ b/java/sca/contrib/samples/store/src/main/java/services/Cart.java
diff --git a/java/sca/samples/store/src/main/java/services/Catalog.java b/java/sca/contrib/samples/store/src/main/java/services/Catalog.java
index b5e504fe11..b5e504fe11 100644
--- a/java/sca/samples/store/src/main/java/services/Catalog.java
+++ b/java/sca/contrib/samples/store/src/main/java/services/Catalog.java
diff --git a/java/sca/samples/store/src/main/java/services/CurrencyConverter.java b/java/sca/contrib/samples/store/src/main/java/services/CurrencyConverter.java
index a064f3dd69..a064f3dd69 100644
--- a/java/sca/samples/store/src/main/java/services/CurrencyConverter.java
+++ b/java/sca/contrib/samples/store/src/main/java/services/CurrencyConverter.java
diff --git a/java/sca/samples/store/src/main/java/services/CurrencyConverterImpl.java b/java/sca/contrib/samples/store/src/main/java/services/CurrencyConverterImpl.java
index c354aed447..c354aed447 100644
--- a/java/sca/samples/store/src/main/java/services/CurrencyConverterImpl.java
+++ b/java/sca/contrib/samples/store/src/main/java/services/CurrencyConverterImpl.java
diff --git a/java/sca/samples/store/src/main/java/services/FruitsCatalogImpl.java b/java/sca/contrib/samples/store/src/main/java/services/FruitsCatalogImpl.java
index d132a24b00..d132a24b00 100644
--- a/java/sca/samples/store/src/main/java/services/FruitsCatalogImpl.java
+++ b/java/sca/contrib/samples/store/src/main/java/services/FruitsCatalogImpl.java
diff --git a/java/sca/samples/store/src/main/java/services/Item.java b/java/sca/contrib/samples/store/src/main/java/services/Item.java
index 27abd4f016..27abd4f016 100644
--- a/java/sca/samples/store/src/main/java/services/Item.java
+++ b/java/sca/contrib/samples/store/src/main/java/services/Item.java
diff --git a/java/sca/samples/store/src/main/java/services/ShoppingCartImpl.java b/java/sca/contrib/samples/store/src/main/java/services/ShoppingCartImpl.java
index 698614212d..698614212d 100644
--- a/java/sca/samples/store/src/main/java/services/ShoppingCartImpl.java
+++ b/java/sca/contrib/samples/store/src/main/java/services/ShoppingCartImpl.java
diff --git a/java/sca/samples/store/src/main/java/services/Total.java b/java/sca/contrib/samples/store/src/main/java/services/Total.java
index b77cc1c7ac..b77cc1c7ac 100644
--- a/java/sca/samples/store/src/main/java/services/Total.java
+++ b/java/sca/contrib/samples/store/src/main/java/services/Total.java
diff --git a/java/sca/samples/store/src/main/resources/store.composite b/java/sca/contrib/samples/store/src/main/resources/store.composite
index 571678839d..571678839d 100644
--- a/java/sca/samples/store/src/main/resources/store.composite
+++ b/java/sca/contrib/samples/store/src/main/resources/store.composite
diff --git a/java/sca/samples/store/src/main/resources/uiservices/store.html b/java/sca/contrib/samples/store/src/main/resources/uiservices/store.html
index 45604463d1..45604463d1 100644
--- a/java/sca/samples/store/src/main/resources/uiservices/store.html
+++ b/java/sca/contrib/samples/store/src/main/resources/uiservices/store.html
diff --git a/java/sca/samples/store/store.png b/java/sca/contrib/samples/store/store.png
index da413edeee..da413edeee 100644
--- a/java/sca/samples/store/store.png
+++ b/java/sca/contrib/samples/store/store.png
diff --git a/java/sca/samples/store/store.svg b/java/sca/contrib/samples/store/store.svg
index 74f8ecd36d..74f8ecd36d 100644
--- a/java/sca/samples/store/store.svg
+++ b/java/sca/contrib/samples/store/store.svg
diff --git a/java/sca/samples/supplychain/README b/java/sca/contrib/samples/supplychain/README
index ea4493fdd4..ea4493fdd4 100644
--- a/java/sca/samples/supplychain/README
+++ b/java/sca/contrib/samples/supplychain/README
diff --git a/java/sca/samples/supplychain/build.xml b/java/sca/contrib/samples/supplychain/build.xml
index 506180b8b1..506180b8b1 100644
--- a/java/sca/samples/supplychain/build.xml
+++ b/java/sca/contrib/samples/supplychain/build.xml
diff --git a/java/sca/samples/supplychain/pom.xml b/java/sca/contrib/samples/supplychain/pom.xml
index 2e85d79793..2e85d79793 100644
--- a/java/sca/samples/supplychain/pom.xml
+++ b/java/sca/contrib/samples/supplychain/pom.xml
diff --git a/java/sca/samples/supplychain/src/main/java/supplychain/Customer.java b/java/sca/contrib/samples/supplychain/src/main/java/supplychain/Customer.java
index 6c19a1108e..6c19a1108e 100644
--- a/java/sca/samples/supplychain/src/main/java/supplychain/Customer.java
+++ b/java/sca/contrib/samples/supplychain/src/main/java/supplychain/Customer.java
diff --git a/java/sca/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java b/java/sca/contrib/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
index 0323cebe11..0323cebe11 100644
--- a/java/sca/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
+++ b/java/sca/contrib/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
diff --git a/java/sca/samples/supplychain/src/main/java/supplychain/Retailer.java b/java/sca/contrib/samples/supplychain/src/main/java/supplychain/Retailer.java
index 1add63fb4e..1add63fb4e 100644
--- a/java/sca/samples/supplychain/src/main/java/supplychain/Retailer.java
+++ b/java/sca/contrib/samples/supplychain/src/main/java/supplychain/Retailer.java
diff --git a/java/sca/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java b/java/sca/contrib/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
index 809e2b7b89..809e2b7b89 100644
--- a/java/sca/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
+++ b/java/sca/contrib/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
diff --git a/java/sca/samples/supplychain/src/main/java/supplychain/Shipper.java b/java/sca/contrib/samples/supplychain/src/main/java/supplychain/Shipper.java
index d4d49a922b..d4d49a922b 100644
--- a/java/sca/samples/supplychain/src/main/java/supplychain/Shipper.java
+++ b/java/sca/contrib/samples/supplychain/src/main/java/supplychain/Shipper.java
diff --git a/java/sca/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java b/java/sca/contrib/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
index 59513eca5d..59513eca5d 100644
--- a/java/sca/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
+++ b/java/sca/contrib/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
diff --git a/java/sca/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java b/java/sca/contrib/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
index 7072f582d1..7072f582d1 100644
--- a/java/sca/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ b/java/sca/contrib/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/java/sca/samples/supplychain/src/main/java/supplychain/Warehouse.java b/java/sca/contrib/samples/supplychain/src/main/java/supplychain/Warehouse.java
index 0be499f569..0be499f569 100644
--- a/java/sca/samples/supplychain/src/main/java/supplychain/Warehouse.java
+++ b/java/sca/contrib/samples/supplychain/src/main/java/supplychain/Warehouse.java
diff --git a/java/sca/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java b/java/sca/contrib/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
index ff4f5e62eb..ff4f5e62eb 100644
--- a/java/sca/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
+++ b/java/sca/contrib/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
diff --git a/java/sca/samples/supplychain/src/main/resources/supplychain.composite b/java/sca/contrib/samples/supplychain/src/main/resources/supplychain.composite
index 301efcaf1f..301efcaf1f 100644
--- a/java/sca/samples/supplychain/src/main/resources/supplychain.composite
+++ b/java/sca/contrib/samples/supplychain/src/main/resources/supplychain.composite
diff --git a/java/sca/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/java/sca/contrib/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
index 88e0eb7ab8..88e0eb7ab8 100644
--- a/java/sca/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ b/java/sca/contrib/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/java/sca/samples/supplychain/supplychain.png b/java/sca/contrib/samples/supplychain/supplychain.png
index 51a384e827..51a384e827 100644
--- a/java/sca/samples/supplychain/supplychain.png
+++ b/java/sca/contrib/samples/supplychain/supplychain.png
diff --git a/java/sca/samples/supplychain/supplychain.svg b/java/sca/contrib/samples/supplychain/supplychain.svg
index f72e77acab..f72e77acab 100644
--- a/java/sca/samples/supplychain/supplychain.svg
+++ b/java/sca/contrib/samples/supplychain/supplychain.svg
diff --git a/java/sca/samples/web-resource/README b/java/sca/contrib/samples/web-resource/README
index 56bffba6a3..56bffba6a3 100644
--- a/java/sca/samples/web-resource/README
+++ b/java/sca/contrib/samples/web-resource/README
diff --git a/java/sca/samples/web-resource/build.xml b/java/sca/contrib/samples/web-resource/build.xml
index 5f6b6091e7..5f6b6091e7 100644
--- a/java/sca/samples/web-resource/build.xml
+++ b/java/sca/contrib/samples/web-resource/build.xml
diff --git a/java/sca/samples/web-resource/pom.xml b/java/sca/contrib/samples/web-resource/pom.xml
index eaa6269819..eaa6269819 100644
--- a/java/sca/samples/web-resource/pom.xml
+++ b/java/sca/contrib/samples/web-resource/pom.xml
diff --git a/java/sca/samples/web-resource/src/main/java/web/resource/SampleServer.java b/java/sca/contrib/samples/web-resource/src/main/java/web/resource/SampleServer.java
index 9410de08c4..9410de08c4 100644
--- a/java/sca/samples/web-resource/src/main/java/web/resource/SampleServer.java
+++ b/java/sca/contrib/samples/web-resource/src/main/java/web/resource/SampleServer.java
diff --git a/java/sca/samples/web-resource/src/main/resources/WebResource.composite b/java/sca/contrib/samples/web-resource/src/main/resources/WebResource.composite
index 4536136a8b..4536136a8b 100644
--- a/java/sca/samples/web-resource/src/main/resources/WebResource.composite
+++ b/java/sca/contrib/samples/web-resource/src/main/resources/WebResource.composite
diff --git a/java/sca/samples/web-resource/src/main/resources/myContent/index.html b/java/sca/contrib/samples/web-resource/src/main/resources/myContent/index.html
index 55de048373..55de048373 100644
--- a/java/sca/samples/web-resource/src/main/resources/myContent/index.html
+++ b/java/sca/contrib/samples/web-resource/src/main/resources/myContent/index.html
diff --git a/java/sca/samples/web-resource/web-resource.png b/java/sca/contrib/samples/web-resource/web-resource.png
index 7259447b65..7259447b65 100644
--- a/java/sca/samples/web-resource/web-resource.png
+++ b/java/sca/contrib/samples/web-resource/web-resource.png
diff --git a/java/sca/samples/web-resource/web-resource.svg b/java/sca/contrib/samples/web-resource/web-resource.svg
index 0d1257316c..0d1257316c 100644
--- a/java/sca/samples/web-resource/web-resource.svg
+++ b/java/sca/contrib/samples/web-resource/web-resource.svg
diff --git a/java/sca/samples/zipcode-jaxws/LICENSE b/java/sca/contrib/samples/zipcode-jaxws/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca/samples/zipcode-jaxws/LICENSE
+++ b/java/sca/contrib/samples/zipcode-jaxws/LICENSE
diff --git a/java/sca/samples/zipcode-jaxws/NOTICE b/java/sca/contrib/samples/zipcode-jaxws/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca/samples/zipcode-jaxws/NOTICE
+++ b/java/sca/contrib/samples/zipcode-jaxws/NOTICE
diff --git a/java/sca/samples/zipcode-jaxws/README b/java/sca/contrib/samples/zipcode-jaxws/README
index 12f81543f0..12f81543f0 100644
--- a/java/sca/samples/zipcode-jaxws/README
+++ b/java/sca/contrib/samples/zipcode-jaxws/README
diff --git a/java/sca/samples/zipcode-jaxws/build.xml b/java/sca/contrib/samples/zipcode-jaxws/build.xml
index 85caf5954e..85caf5954e 100644
--- a/java/sca/samples/zipcode-jaxws/build.xml
+++ b/java/sca/contrib/samples/zipcode-jaxws/build.xml
diff --git a/java/sca/samples/zipcode-jaxws/pom.xml b/java/sca/contrib/samples/zipcode-jaxws/pom.xml
index 686b948d03..686b948d03 100644
--- a/java/sca/samples/zipcode-jaxws/pom.xml
+++ b/java/sca/contrib/samples/zipcode-jaxws/pom.xml
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCode.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCode.java
index 8c9a48bf40..8c9a48bf40 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCode.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCode.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCodeResponse.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCodeResponse.java
index 93847c8809..93847c8809 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCodeResponse.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCodeResponse.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCity.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCity.java
index cf9276d417..cf9276d417 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCity.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCity.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCityResponse.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCityResponse.java
index 9dc0e41b2b..9dc0e41b2b 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCityResponse.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCityResponse.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByState.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByState.java
index 48be94b14a..48be94b14a 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByState.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByState.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByStateResponse.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByStateResponse.java
index 1645e11ca2..1645e11ca2 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByStateResponse.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByStateResponse.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIP.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIP.java
index 45c948b4b4..45c948b4b4 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIP.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIP.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIPResponse.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIPResponse.java
index 9e78dc6d0a..9e78dc6d0a 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIPResponse.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIPResponse.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/ObjectFactory.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/ObjectFactory.java
index ced83ff09a..ced83ff09a 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/ObjectFactory.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/ObjectFactory.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZip.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZip.java
index 22493ba9b8..22493ba9b8 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZip.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZip.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZipSoap.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZipSoap.java
index 5ac370005f..5ac370005f 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZipSoap.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZipSoap.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/package-info.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/package-info.java
index d120f34ee5..d120f34ee5 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/uszip/package-info.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/package-info.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/ArrayOfWeatherData.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/ArrayOfWeatherData.java
index 5385fb57be..5385fb57be 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/ArrayOfWeatherData.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/ArrayOfWeatherData.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceName.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceName.java
index 9eb205e75d..9eb205e75d 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceName.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceName.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceNameResponse.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceNameResponse.java
index e281509623..e281509623 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceNameResponse.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceNameResponse.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCode.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCode.java
index 08d4a70364..08d4a70364 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCode.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCode.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCodeResponse.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCodeResponse.java
index 9288f5332e..9288f5332e 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCodeResponse.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCodeResponse.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/ObjectFactory.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/ObjectFactory.java
index 0c4fdbcde1..0c4fdbcde1 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/ObjectFactory.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/ObjectFactory.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherData.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherData.java
index a4ca6190b5..a4ca6190b5 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherData.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherData.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecast.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecast.java
index 0902ce67fe..0902ce67fe 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecast.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecast.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecastSoap.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecastSoap.java
index aa000a44d2..aa000a44d2 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecastSoap.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecastSoap.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecasts.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecasts.java
index 8ded0946d9..8ded0946d9 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecasts.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecasts.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/package-info.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/package-info.java
index 6543ed7abf..6543ed7abf 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/com/example/weather/package-info.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/package-info.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/location/LocationClient.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/location/LocationClient.java
index 35c114093a..35c114093a 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/location/LocationClient.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/location/LocationClient.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java
index 8865d5fe82..8865d5fe82 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastClient.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastClient.java
index c03cf2955f..c03cf2955f 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastClient.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastClient.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java
index 5ad5f11344..5ad5f11344 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.java
index f181d9bd0e..f181d9bd0e 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java
index 53c112b8a3..53c112b8a3 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java
index 7c68a77cf2..7c68a77cf2 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java
diff --git a/java/sca/samples/zipcode-jaxws/src/main/resources/USLocation.composite b/java/sca/contrib/samples/zipcode-jaxws/src/main/resources/USLocation.composite
index a171fe62c9..a171fe62c9 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/resources/USLocation.composite
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/resources/USLocation.composite
diff --git a/java/sca/samples/zipcode-jaxws/src/main/resources/WeatherForecast.composite b/java/sca/contrib/samples/zipcode-jaxws/src/main/resources/WeatherForecast.composite
index 0e1b118e44..0e1b118e44 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/resources/WeatherForecast.composite
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/resources/WeatherForecast.composite
diff --git a/java/sca/samples/zipcode-jaxws/src/main/resources/ZipCode.composite b/java/sca/contrib/samples/zipcode-jaxws/src/main/resources/ZipCode.composite
index 28d674c29b..28d674c29b 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/resources/ZipCode.composite
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/main/resources/ZipCode.composite
diff --git a/java/sca/samples/zipcode-jaxws/src/test/java/zipcode/ZipCodeClientTestCase.java b/java/sca/contrib/samples/zipcode-jaxws/src/test/java/zipcode/ZipCodeClientTestCase.java
index 019fce26d6..019fce26d6 100644
--- a/java/sca/samples/zipcode-jaxws/src/test/java/zipcode/ZipCodeClientTestCase.java
+++ b/java/sca/contrib/samples/zipcode-jaxws/src/test/java/zipcode/ZipCodeClientTestCase.java
diff --git a/java/sca/samples/calculator-equinox/README b/java/sca/samples/calculator-equinox/README
deleted file mode 100644
index cde5fe981f..0000000000
--- a/java/sca/samples/calculator-equinox/README
+++ /dev/null
@@ -1,97 +0,0 @@
-Calculator Sample

-=================

-This sample implements a simple calculator using SCA components. 

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-If you just want to run it to see what happens open a command prompt, navigate

-to this sample directory and do:

-

-ant run

-

-OR if you don't have ant, on Windows do

-

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator.jar calculator.CalculatorClient

-

-and on *nix do

-

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator.jar calculator.CalculatorClient

-

-Sample Overview

----------------

-The sample provides a single calculator service with a default SCA (java) 

-binding. The CalculatorClient exercises this interface by calling add, 

-subtract, multiply and divide operations. This results in messages passing to 

-the appropriate components in the composite across the local wires.

-

-calculator/

-  src/

-    main/

-      java/

-        calculator/

-          CalculatorService.java  - the first component, calls +-/* as 

-                                    appropriate

-          CalculatorServiceImpl.java

-          AddService.java         - adds two numbers

-          AddServiceImpl.java

-          SubtractService.java    - subtracts one number from another

-          SubtractServiceImpl.java

-          MultiplyService.java    - multiplies two numbers

-          MultiplyServiceImpl.java

-          DivideService.java      - divides one number by another

-          DivideServiceImpl.java

-          CalculatorClient.java   - starts the SCA Runtime and 

-                                    deploys the Calculator.composite. 

-                                    It then calls the deployed Calculator 

-                                    Components services

-      resources/

-        Calculator.composite      - the SCA assembly for this sample

-    test/

-      java/

-        calculator/

-          CalculatorTestCase.java - JUnit test case 

-  calculator.png                  - a pictorial representation of the sample 

-                                    .composite file

-  build.xml                       - the Ant build file

-  pom.xml                         - the Maven build file        

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant as 

-follows

-

-cd calculator

-ant compile

-ant run

-

-You should see the following output from the run target.

-

-run:

-     [java] 3 + 2=5.0

-     [java] 3 - 2=1.0

-     [java] 3 * 2=6.0

-     [java] 3 / 2=1.5

-

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. 

-

-cd calculator

-mvn

-

-You should see the following output from the test phase.

-

--------------------------------------------------------

- T E S T S

--------------------------------------------------------

-Running calculator.CalculatorTestCase

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.272 sec

-

-Results :

-

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0

-

-This shows that the Junit test cases have run successfully. 

diff --git a/java/sca/samples/calculator-equinox/build.xml b/java/sca/samples/calculator-equinox/build.xml
deleted file mode 100644
index 40938ebb8e..0000000000
--- a/java/sca/samples/calculator-equinox/build.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<project name="calculator-equinox" default="run"> <!-- could dertmine the same name autmatically -->
-    <property name="sample.name" value="${ant.project.name}"/>
-    <property name="sample.jar" value="./target/sample-${sample.name}.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-                <fileset dir="../../modules">
-                    <include name="*.jar" />
-                    <include name="*/*.jar" />
-                </fileset>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="${sample.jar}" basedir="target/classes">
-        </jar>    	
-    </target>	
-	
-    <target name="run" depends="compile">
-        <java jar="../../modules/tuscany-node-launcher-2.0-SNAPSHOT.jar"
-              fork="true">
-            <jvmarg value="-Djava.util.logging.config.file=../logging.properties"/>
-            <arg value="Calculator.composite"/> 
-        	 <!-- would be good to have the node launcher run the first deplyable 
-        	      composite if this is not specified so I don't have to put it here -->
-            <arg value="${sample.jar}"/>
-        </java>    	
-    </target>
-	
-    <target name="run-equinox" depends="compile">
-        <java jar="../../modules/tuscany-node-launcher-equinox-2.0-SNAPSHOT.jar"
-              fork="true">
-            <jvmarg value="-Djava.util.logging.config.file=../logging.properties"/>
-            <arg value="Calculator.composite"/> 
-        	 <!-- would be good to have the node launcher run the first deplyable 
-        	      composite if this is not specified so I don't have to put it here -->
-            <arg value="${sample.jar}"/>
-        </java>    	
-    </target>
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca/samples/calculator-equinox/pom.xml b/java/sca/samples/calculator-equinox/pom.xml
deleted file mode 100644
index abdda77c77..0000000000
--- a/java/sca/samples/calculator-equinox/pom.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-calculator-equinox</artifactId>
-    <name>Apache Tuscany SCA Calculator Equinox Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>   
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
diff --git a/java/sca/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java b/java/sca/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 84c98d7f70..0000000000
--- a/java/sca/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package calculator;
-
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-@Scope("COMPOSITE") @EagerInit
-public class CalculatorClient {
-    
-    private CalculatorService calculatorService;
-
-    @Reference
-    public void setCalculatorService(CalculatorService calculatorService) {
-        this.calculatorService = calculatorService;
-    }
-    
-    @Init
-    public void calculate() {
-
-        // Calculate
-        System.out.println("SCA API ClassLoader: " + print(Reference.class.getClassLoader()));
-        System.out.println("3 + 2=" + calculatorService.add(3, 2));
-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-    }
-    
-    private static String print(ClassLoader cl) {
-        StringBuffer buf = new StringBuffer();
-        for (; cl != null;) {
-            buf.append(cl.toString());
-            buf.append(' ');
-            cl = cl.getParent();
-        }
-        return buf.toString();
-    }
-
-}
diff --git a/java/sca/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java b/java/sca/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
deleted file mode 100644
index b49e1da130..0000000000
--- a/java/sca/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.equinox.launcher.Contribution;
-import org.apache.tuscany.sca.node.equinox.launcher.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * This shows how to test the Calculator composition.
- */
-public class CalculatorTestCase {
-
-    private static NodeLauncher launcher;
-    private static Node node;   
-    
-    public static void main(String[] args) throws Exception {
-    	setUpBeforeClass();
-    	tearDownAfterClass();
-    }
-    
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        launcher = NodeLauncher.newInstance();
-        String location = ContributionLocationHelper.getContributionLocation(CalculatorClient.class);
-        node = launcher.createNode("Calculator.composite", new Contribution("test", location));
-        System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader());
-        node.start();
-    }
-
-    @AfterClass
-    public static void tearDownAfterClass() throws Exception {
-        if (node != null) {
-            node.stop();
-            node.destroy();
-        }
-        if (launcher != null) {
-            launcher.destroy();
-        }
-    }
-
-    @Test
-    public void testDummy() throws Exception {
-    }
-}
diff --git a/java/sca/samples/calculator-implementation-policies/calculator.svg b/java/sca/samples/calculator-implementation-policies/calculator.svg
deleted file mode 100644
index af34f07e04..0000000000
--- a/java/sca/samples/calculator-implementation-policies/calculator.svg
+++ /dev/null
@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-<!-- Created with Inkscape (http://www.inkscape.org/) -->

-<svg

-   xmlns:dc="http://purl.org/dc/elements/1.1/"

-   xmlns:cc="http://web.resource.org/cc/"

-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

-   xmlns:svg="http://www.w3.org/2000/svg"

-   xmlns="http://www.w3.org/2000/svg"

-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

-   width="1052.3622"

-   height="744.09448"

-   id="svg2"

-   sodipodi:version="0.32"

-   inkscape:version="0.44"

-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator"

-   sodipodi:docname="calculator.svg"

-   version="1.0"

-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator\calculator.png"

-   inkscape:export-xdpi="52.84"

-   inkscape:export-ydpi="52.84">

-  <defs

-     id="defs4" />

-  <sodipodi:namedview

-     id="base"

-     pagecolor="#ffffff"

-     bordercolor="#666666"

-     borderopacity="1.0"

-     gridtolerance="10000"

-     guidetolerance="10"

-     objecttolerance="10"

-     inkscape:pageopacity="0.0"

-     inkscape:pageshadow="2"

-     inkscape:zoom="1.4"

-     inkscape:cx="471.80491"

-     inkscape:cy="378.84265"

-     inkscape:document-units="px"

-     inkscape:current-layer="layer1"

-     inkscape:window-width="1054"

-     inkscape:window-height="721"

-     inkscape:window-x="59"

-     inkscape:window-y="79" />

-  <metadata

-     id="metadata7">

-    <rdf:RDF>

-      <cc:Work

-         rdf:about="">

-        <dc:format>image/svg+xml</dc:format>

-        <dc:type

-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

-      </cc:Work>

-    </rdf:RDF>

-  </metadata>

-  <g

-     inkscape:label="Layer 1"

-     inkscape:groupmode="layer"

-     id="layer1">

-    <g

-       id="g2997"

-       transform="matrix(1,0,0,1.144214,0,-27.53557)">

-      <rect

-         rx="15.307091"

-         ry="12.692303"

-         y="192.00233"

-         x="258.31146"

-         height="299.99988"

-         width="495.71429"

-         id="rect2067"

-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.86971939;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />

-      <flowRoot

-         id="flowRoot2954"

-         xml:space="preserve"><flowRegion

-           id="flowRegion2956"><rect

-             y="212.66591"

-             x="281.42856"

-             height="61.42857"

-             width="170"

-             id="rect2958" /></flowRegion><flowPara

-           id="flowPara2960">Calculator</flowPara></flowRoot>    </g>

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.9999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect2988"

-       width="115.66247"

-       height="191.57716"

-       x="339.91632"

-       y="262.1673"

-       rx="6.9961648"

-       ry="15.892869" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot2966"

-       transform="translate(79.61125,62.65764)"><flowRegion

-         id="flowRegion2968"><rect

-           id="rect2970"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara2972">Calculator</flowPara><flowPara

-         id="flowPara1895">Service</flowPara><flowPara

-         id="flowPara1897">Component</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "

-       id="path3017" />

-    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 431.01809,321.46204 L 471.00147,321.46204 L 478.27117,334.59402 L 469.78986,346.71586 L 431.01809,346.71586 L 440.10523,334.59402 L 431.01809,321.46204 z "

-       id="path3019" />

-    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 223.15923,328.61046 L 282.4833,328.61046 L 293.26948,355.48529 L 280.68561,380.29286 L 223.15923,380.29286 L 236.64198,355.48529 L 223.15923,328.61046 z "

-       id="path1883" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1885"

-       transform="translate(-46.16225,128.7269)"

-       style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"><flowRegion

-         id="flowRegion1887"><rect

-           id="rect1889"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591"

-           style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%" /></flowRegion><flowPara

-         id="flowPara1891">Calculator</flowPara><flowPara

-         id="flowPara1893">Service</flowPara></flowRoot>    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect1899"

-       width="115.66247"

-       height="70.148659"

-       x="594.75488"

-       y="209.73451"

-       rx="6.9961648"

-       ry="5.8193965" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1901"

-       transform="translate(334.4498,10.22481)"><flowRegion

-         id="flowRegion1903"><rect

-           id="rect1905"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1907">Add</flowPara><flowPara

-         id="flowPara1909">Service</flowPara><flowPara

-         id="flowPara1911">Component</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 573.31867,232.29606 L 606.65371,232.29606 L 612.71462,245.42804 L 605.64356,257.54988 L 573.31867,257.54988 L 580.89482,245.42804 L 573.31867,232.29606 z "

-       id="path1913" />

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect1917"

-       width="115.66247"

-       height="70.148659"

-       x="594.06543"

-       y="292.59158"

-       rx="6.9961648"

-       ry="5.8193965" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1919"

-       transform="translate(333.7604,93.08188)"><flowRegion

-         id="flowRegion1921"><rect

-           id="rect1923"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1925">Subtract</flowPara><flowPara

-         id="flowPara1927">Service</flowPara><flowPara

-         id="flowPara1929">Component</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 572.62924,315.15313 L 605.96428,315.15313 L 612.02519,328.28511 L 604.95413,340.40695 L 572.62924,340.40695 L 580.20539,328.28511 L 572.62924,315.15313 z "

-       id="path1931" />

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect1933"

-       width="115.66247"

-       height="70.148659"

-       x="594.77979"

-       y="371.87729"

-       rx="6.9961648"

-       ry="5.8193965" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1935"

-       transform="translate(334.4747,172.3676)"><flowRegion

-         id="flowRegion1937"><rect

-           id="rect1939"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1941">Multiply</flowPara><flowPara

-         id="flowPara1943">Service</flowPara><flowPara

-         id="flowPara1945">Component</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 573.34352,394.43884 L 606.67856,394.43884 L 612.73947,407.57082 L 605.66841,419.69266 L 573.34352,419.69266 L 580.91967,407.57082 L 573.34352,394.43884 z "

-       id="path1947" />

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect1949"

-       width="115.66247"

-       height="70.148659"

-       x="596.20831"

-       y="452.59158"

-       rx="6.9961648"

-       ry="5.8193965" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1951"

-       transform="translate(335.9032,253.0819)"><flowRegion

-         id="flowRegion1953"><rect

-           id="rect1955"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1957">Divide</flowPara><flowPara

-         id="flowPara1959">Service</flowPara><flowPara

-         id="flowPara1961">Component</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 574.77209,475.15313 L 608.10713,475.15313 L 614.16804,488.28511 L 607.09698,500.40695 L 574.77209,500.40695 L 582.34824,488.28511 L 574.77209,475.15313 z "

-       id="path1963" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1965"

-       transform="translate(161.0221,114.967)"

-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion

-         id="flowRegion1967"><rect

-           id="rect1969"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591"

-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara

-         id="flowPara1973">add</flowPara><flowPara

-         id="flowPara1977">Service</flowPara></flowRoot>    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 430.65917,357.18186 L 470.64255,357.18186 L 477.91225,370.31384 L 469.43094,382.43568 L 430.65917,382.43568 L 439.74631,370.31384 L 430.65917,357.18186 z "

-       id="path1979" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1981"

-       transform="translate(160.6632,150.6868)"

-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion

-         id="flowRegion1983"><rect

-           id="rect1985"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591"

-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara

-         id="flowPara1987">subtract</flowPara><flowPara

-         id="flowPara1989">Service</flowPara></flowRoot>    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 431.37346,390.75329 L 471.35684,390.75329 L 478.62654,403.88527 L 470.14523,416.00711 L 431.37346,416.00711 L 440.4606,403.88527 L 431.37346,390.75329 z "

-       id="path1991" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1993"

-       transform="translate(161.3775,184.2583)"

-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion

-         id="flowRegion1995"><rect

-           id="rect1997"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591"

-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara

-         id="flowPara1999">multiply</flowPara><flowPara

-         id="flowPara2001">Service</flowPara></flowRoot>    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 429.94489,422.18186 L 469.92827,422.18186 L 477.19797,435.31384 L 468.71666,447.43568 L 429.94489,447.43568 L 439.03203,435.31384 L 429.94489,422.18186 z "

-       id="path2003" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot2005"

-       transform="translate(159.9489,215.6868)"

-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion

-         id="flowRegion2007"><rect

-           id="rect2009"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591"

-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara

-         id="flowPara2011">divide</flowPara><flowPara

-         id="flowPara2013">Service</flowPara></flowRoot>    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 477.85714,335.52305 L 511.42857,335.52305 L 510.71429,245.52305 L 579.28571,245.52305"

-       id="path2015" />

-    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 477.85714,369.80877 L 528.57143,369.80877 L 528.57143,329.80877 L 580,329.80877"

-       id="path2017" />

-    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 478.57143,402.66591 L 528.57143,401.95163 L 528.57143,408.3802 L 580,407.66591"

-       id="path2019" />

-    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 475.71429,435.52305 L 509.28571,435.52305 L 510,486.95163 L 582.14286,486.23734"

-       id="path2021" />

-    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 292.85714,355.52305 L 330,354.80877"

-       id="path2023" />

-  </g>

-</svg>

diff --git a/java/sca/samples/calculator-rcp/src/main/java/Calculator.composite b/java/sca/samples/calculator-rcp/src/main/java/Calculator.composite
deleted file mode 100644
index 913081b9be..0000000000
--- a/java/sca/samples/calculator-rcp/src/main/java/Calculator.composite
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl"/>
-    </component>
-
-    <component name="CalculatorClient">
-		<implementation.java class="calculator.CalculatorClient"/>
-        <reference name="calculatorService" target="CalculatorServiceComponent" />
-    </component>
-
-</composite>
diff --git a/java/sca/samples/calculator2/calculator.png b/java/sca/samples/calculator2/calculator.png
deleted file mode 100644
index 995a57b1fd..0000000000
--- a/java/sca/samples/calculator2/calculator.png
+++ /dev/null
diff --git a/java/sca/samples/calculator2/src/main/java/calculator/AddService.java b/java/sca/samples/calculator2/src/main/java/calculator/AddService.java
deleted file mode 100644
index 188451ebac..0000000000
--- a/java/sca/samples/calculator2/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-/**
- * The Add service interface
- */
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/java/sca/samples/calculator2/src/main/java/calculator/AddServiceImpl.java b/java/sca/samples/calculator2/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 7ca8fb04b5..0000000000
--- a/java/sca/samples/calculator2/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
-    public double add(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-}
diff --git a/java/sca/samples/calculator2/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/samples/calculator2/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 17fad7de6b..0000000000
--- a/java/sca/samples/calculator2/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/java/sca/samples/calculator2/src/main/java/calculator/DivideService.java b/java/sca/samples/calculator2/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/java/sca/samples/calculator2/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca/samples/calculator2/src/main/java/calculator/DivideServiceImpl.java b/java/sca/samples/calculator2/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 1323edf55a..0000000000
--- a/java/sca/samples/calculator2/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);
-        return n1 / n2;
-    }
-
-}
diff --git a/java/sca/samples/calculator2/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca/samples/calculator2/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index 91b803bc9e..0000000000
--- a/java/sca/samples/calculator2/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);
-        return n1 * n2;
-    }
-
-}
diff --git a/java/sca/samples/calculator2/src/main/java/calculator/SubtractService.java b/java/sca/samples/calculator2/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index bf0d1882b6..0000000000
--- a/java/sca/samples/calculator2/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/java/sca/samples/calculator2/src/main/java/calculator/SubtractServiceImpl.java b/java/sca/samples/calculator2/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 58cc4a3547..0000000000
--- a/java/sca/samples/calculator2/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
-        return n1 - n2;
-    }
-
-}
diff --git a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorService.java b/java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/MultiplyService.java b/java/sca/samples/host-webapp-calculator/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/java/sca/samples/pom.xml b/java/sca/samples/pom.xml
index 709df7f4d9..9ade7320c8 100644
--- a/java/sca/samples/pom.xml
+++ b/java/sca/samples/pom.xml
@@ -54,75 +54,5 @@
                 <!-- module>host-webapp-calculator</module -->
             </modules>
         </profile>
-
-        <profile>
-            <id>old</id>
-            <modules>
-                <module>binding-echo</module>
-                <module>binding-echo-extension</module>
-                <module>binding-notification-broker</module>
-                <module>binding-notification-consumer</module>
-                <module>binding-notification-producer</module>
-                <module>calculator</module>
-                <module>calculator-corba-reference</module>
-                <module>calculator-corba-service</module>
-                <module>calculator-lean</module>
-                <module>calculator-distributed</module>
-		<module>calculator-implementation-policies</module>
-                <module>calculator-rmi-reference</module>
-                <module>calculator-rmi-service</module>
-                <module>calculator-script</module>
-                <module>calculator-webapp</module>
-                <module>calculator-ws-secure-webapp</module>
-                <module>calculator-ws-webapp</module>
-                <module>callback-ws-client</module>
-                <module>callback-ws-service</module>
-                <module>chat-webapp</module>
-                <module>customer-dojo</module>
-                <module>customer-dojo-webapp</module>
-                <module>databinding-echo</module>
-                <!--module>domain-webapp</module-->
-                <module>domain-management</module>
-                <module>feed-aggregator</module>
-                <module>feed-aggregator-webapp</module>
-                <module>helloworld-bpel</module>
-                <module>helloworld-dojo-webapp</module>
-                <module>helloworld-jms-webapp</module>
-                <module>helloworld-jsonrpc-webapp</module>
-                <module>helloworld-reference-jms</module>
-                <module>helloworld-service-jms</module>
-                <module>helloworld-ws-service</module>
-                <module>helloworld-ws-service-jms</module>
-                <module>helloworld-ws-service-secure</module>
-                <module>helloworld-ws-reference</module>
-                <module>helloworld-ws-reference-lean</module>
-                <module>helloworld-ws-reference-jms</module>
-                <module>helloworld-ws-reference-secure</module>
-                <module>helloworld-ws-sdo</module>
-                <module>helloworld-ws-sdo-webapp</module>
-                <module>implementation-composite</module>
-                <module>implementation-crud</module>
-                <module>implementation-crud-extension</module>
-                <module>implementation-notification</module>
-                <module>implementation-pojo-extension</module>
-                <module>loanapplication</module>
-                <module>osgi-supplychain</module>
-                <module>photo-gallery</module>
-                <module>quote-xquery</module>
-                <module>simple-bigbank</module>
-                <module>simple-bigbank-spring</module>
-                <module>spring-bigbank-checkaccount</module>
-                <module>spring-bigbank-calculator</module>
-                <module>spring-bigbank-stockquote</module>
-                <module>simple-callback</module>
-                <module>simple-callback-ws</module>
-                <module>store</module>
-                <module>store-distributed</module>
-                <module>supplychain</module>
-                <module>web-resource</module>
-                <module>zipcode-jaxws</module>
-            </modules>
-        </profile>
-    </profiles>
-    
+    </profiles>    
 </project>