Moving 2.x branches

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

1072 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-equinox/samples/README b/sca-java-2.x/branches/sca-equinox/samples/README
index 2646fbb73a..2646fbb73a 100644
--- a/branches/sca-equinox/samples/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/README
diff --git a/branches/sca-equinox/samples/binding-echo-extension/README b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/README
index 94716b151f..94716b151f 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/README
diff --git a/branches/sca-equinox/samples/binding-echo-extension/build.xml b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/build.xml
index 5df5981bea..5df5981bea 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/build.xml
diff --git a/branches/sca-equinox/samples/binding-echo-extension/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/pom.xml
index 642971e98f..642971e98f 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/pom.xml
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
index 3fe1598e0d..3fe1598e0d 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
index 0f6fee82be..0f6fee82be 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
index af759dbf93..af759dbf93 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
index 19c9271bb8..19c9271bb8 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
index 39b7065bf0..39b7065bf0 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
index 91697fcd9a..91697fcd9a 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
index 4877bade7f..4877bade7f 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
index 04e6b42dc1..04e6b42dc1 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
index 0efc319af9..0efc319af9 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
index 1cd1e5af4e..1cd1e5af4e 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
index 33dc761aa4..33dc761aa4 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
index 2c2f93514d..2c2f93514d 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
index 7d38e3b7a8..7d38e3b7a8 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
index ee3263bf42..ee3263bf42 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
index deda8d9744..deda8d9744 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
index ffadfc7fff..ffadfc7fff 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
index 6fa5f26977..6fa5f26977 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
index cf55b36fc2..cf55b36fc2 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
index ac610cfb51..ac610cfb51 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
index a8aa609812..a8aa609812 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
index 8ea2395d04..8ea2395d04 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
index 32336dd94f..32336dd94f 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
index 55be293862..55be293862 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 06d53250c1..06d53250c1 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 4ad61f573d..4ad61f573d 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index efa475ef92..efa475ef92 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
index 9b64df4871..9b64df4871 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/Echo.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/Echo.java
index 1d5e973f33..1d5e973f33 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/Echo.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/Echo.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
index ba68dfe908..ba68dfe908 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
index 7383077f18..7383077f18 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
index ab05516622..ab05516622 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/test/resources/EchoBinding.composite b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
index 176d67cc4b..176d67cc4b 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/test/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/resources/definitions.xml
index 1cb1d1c9ba..1cb1d1c9ba 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/test/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/resources/definitions.xml
diff --git a/branches/sca-equinox/samples/binding-echo/README b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/README
index 2772460cc6..2772460cc6 100644
--- a/branches/sca-equinox/samples/binding-echo/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/README
diff --git a/branches/sca-equinox/samples/binding-echo/binding-echo.png b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/binding-echo.png
index a38d985363..a38d985363 100644
--- a/branches/sca-equinox/samples/binding-echo/binding-echo.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/binding-echo.png
diff --git a/branches/sca-equinox/samples/binding-echo/binding-echo.svg b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/binding-echo.svg
index 5b5051bef5..5b5051bef5 100644
--- a/branches/sca-equinox/samples/binding-echo/binding-echo.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/binding-echo.svg
diff --git a/branches/sca-equinox/samples/binding-echo/build.xml b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/build.xml
index 7689ef3a54..7689ef3a54 100644
--- a/branches/sca-equinox/samples/binding-echo/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/build.xml
diff --git a/branches/sca-equinox/samples/binding-echo/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/pom.xml
index 35ac6ad368..35ac6ad368 100644
--- a/branches/sca-equinox/samples/binding-echo/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/pom.xml
diff --git a/branches/sca-equinox/samples/binding-echo/src/main/java/echo/Echo.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/src/main/java/echo/Echo.java
index 1d5e973f33..1d5e973f33 100644
--- a/branches/sca-equinox/samples/binding-echo/src/main/java/echo/Echo.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/src/main/java/echo/Echo.java
diff --git a/branches/sca-equinox/samples/binding-echo/src/main/java/echo/EchoBindingClient.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
index 21bdff4011..21bdff4011 100644
--- a/branches/sca-equinox/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
diff --git a/branches/sca-equinox/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
index ba68dfe908..ba68dfe908 100644
--- a/branches/sca-equinox/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-equinox/samples/binding-echo/src/main/resources/EchoBinding.composite b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/src/main/resources/EchoBinding.composite
index 94612fb325..94612fb325 100644
--- a/branches/sca-equinox/samples/binding-echo/src/main/resources/EchoBinding.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/src/main/resources/EchoBinding.composite
diff --git a/branches/sca-equinox/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
index 1a597fc80f..1a597fc80f 100644
--- a/branches/sca-equinox/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/README b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/README
index 51f4b07e81..51f4b07e81 100644
--- a/branches/sca-equinox/samples/calculator-distributed/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/README
diff --git a/branches/sca-equinox/samples/calculator-distributed/build.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/build.xml
index 069a473e90..069a473e90 100644
--- a/branches/sca-equinox/samples/calculator-distributed/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/build.xml
diff --git a/branches/sca-equinox/samples/calculator-distributed/calculator-distributed.png b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/calculator-distributed.png
index 7c0e175664..7c0e175664 100644
--- a/branches/sca-equinox/samples/calculator-distributed/calculator-distributed.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/calculator-distributed.png
diff --git a/branches/sca-equinox/samples/calculator-distributed/calculator-distributed.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/calculator-distributed.svg
index be5a4b8185..be5a4b8185 100644
--- a/branches/sca-equinox/samples/calculator-distributed/calculator-distributed.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/calculator-distributed.svg
diff --git a/branches/sca-equinox/samples/calculator-distributed/cloud.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/cloud.composite
index 85e2f9c7f3..85e2f9c7f3 100644
--- a/branches/sca-equinox/samples/calculator-distributed/cloud.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/cloud.composite
diff --git a/branches/sca-equinox/samples/calculator-distributed/domain.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/domain.composite
index 643e22d0cf..643e22d0cf 100644
--- a/branches/sca-equinox/samples/calculator-distributed/domain.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/domain.composite
diff --git a/branches/sca-equinox/samples/calculator-distributed/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/pom.xml
index 056fd9c978..056fd9c978 100644
--- a/branches/sca-equinox/samples/calculator-distributed/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/AddService.java
index d7dc4473ad..d7dc4473ad 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
index e9b7e254e5..e9b7e254e5 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
index da869e00fd..da869e00fd 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
index 78ab9c6ee0..78ab9c6ee0 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
index 1010207154..1010207154 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
index 306ce68327..306ce68327 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
index 50600eaedc..50600eaedc 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
index 95d8934665..95d8934665 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchDomain.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
index 8b4fe566a1..8b4fe566a1 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
index ed7fe55abc..ed7fe55abc 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
index 8f29cc17aa..8f29cc17aa 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
index 9ad132b0d4..9ad132b0d4 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
index 172676a3c7..172676a3c7 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
index 1b1c0291e2..1b1c0291e2 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
index b770dbe8d4..b770dbe8d4 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 6c0ffe4ac0..6c0ffe4ac0 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
index 66caf0d17b..66caf0d17b 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
index 8c311553c3..8c311553c3 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
index cd6e934854..cd6e934854 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/workspace.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/workspace.xml
index 7d6d3dbdbd..7d6d3dbdbd 100644
--- a/branches/sca-equinox/samples/calculator-distributed/workspace.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/workspace.xml
diff --git a/branches/sca-equinox/samples/calculator-equinox/README b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/README
index cde5fe981f..cde5fe981f 100644
--- a/branches/sca-equinox/samples/calculator-equinox/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/README
diff --git a/branches/sca-equinox/samples/calculator-equinox/calculator.png b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-equinox/samples/calculator-equinox/calculator.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/calculator.png
diff --git a/branches/sca-equinox/samples/calculator-equinox/calculator.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/branches/sca-equinox/samples/calculator-equinox/calculator.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/calculator.svg
diff --git a/branches/sca-equinox/samples/calculator-equinox/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/pom.xml
index 1dbee240c7..1dbee240c7 100644
--- a/branches/sca-equinox/samples/calculator-equinox/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
index c193b2ce66..c193b2ce66 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/resources/Calculator.composite
index 913081b9be..913081b9be 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
index 00e5422930..00e5422930 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/README b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/README
index bd66eee1c9..bd66eee1c9 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/README
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/build.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/build.xml
index 7afa23a07f..7afa23a07f 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/build.xml
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/calculator.png b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/calculator.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/calculator.png
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/calculator.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/calculator.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/calculator.svg
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/pom.xml
index aebd80828a..aebd80828a 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
index 5a1e7a638a..5a1e7a638a 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
index caf4d358df..caf4d358df 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
index 2bce187049..2bce187049 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
index ae4ed12b7b..ae4ed12b7b 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
index b48fb90148..b48fb90148 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
index fe4097640b..fe4097640b 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
index 595626e672..595626e672 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
index d91bf88d96..d91bf88d96 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
index 0e7cb86633..0e7cb86633 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
index f62125eaa9..f62125eaa9 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/definitions.xml
index 6cccde0d13..6cccde0d13 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
index 157570c3df..157570c3df 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-equinox/samples/calculator-lean/README b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/README
index a8aff232c6..a8aff232c6 100644
--- a/branches/sca-equinox/samples/calculator-lean/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/README
diff --git a/branches/sca-equinox/samples/calculator-lean/calculator.png b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-equinox/samples/calculator-lean/calculator.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/calculator.png
diff --git a/branches/sca-equinox/samples/calculator-lean/calculator.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/calculator.svg
index 0615925c50..0615925c50 100644
--- a/branches/sca-equinox/samples/calculator-lean/calculator.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/calculator.svg
diff --git a/branches/sca-equinox/samples/calculator-lean/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/pom.xml
index 3b565dd5a8..3b565dd5a8 100644
--- a/branches/sca-equinox/samples/calculator-lean/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
index 2bb8f96dcf..2bb8f96dcf 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/resources/Calculator.composite
index 913081b9be..913081b9be 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/resources/CalculatorTest.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/resources/CalculatorTest.composite
index 906e2a3918..906e2a3918 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/resources/CalculatorTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/resources/CalculatorTest.composite
diff --git a/branches/sca-equinox/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
index f965e710d5..f965e710d5 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/META-INF/MANIFEST.MF
index bb6c2d4d35..bb6c2d4d35 100644
--- a/branches/sca-equinox/samples/calculator-osgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/samples/calculator-osgi/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/pom.xml
index cda7d6edbb..cda7d6edbb 100644
--- a/branches/sca-equinox/samples/calculator-osgi/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
index 4408568629..4408568629 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
index adbd18a9e4..adbd18a9e4 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/resources/Calculator.composite
index 913081b9be..913081b9be 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-rcp/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/META-INF/MANIFEST.MF
index 3e2adcb942..3e2adcb942 100644
--- a/branches/sca-equinox/samples/calculator-rcp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/samples/calculator-rcp/build.properties b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/build.properties
index 0530eb648b..0530eb648b 100644
--- a/branches/sca-equinox/samples/calculator-rcp/build.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/build.properties
diff --git a/branches/sca-equinox/samples/calculator-rcp/icons/alt_window_16.gif b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/icons/alt_window_16.gif
index 05626b17d8..05626b17d8 100644
--- a/branches/sca-equinox/samples/calculator-rcp/icons/alt_window_16.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/icons/alt_window_16.gif
diff --git a/branches/sca-equinox/samples/calculator-rcp/icons/alt_window_32.gif b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/icons/alt_window_32.gif
index b432f88339..b432f88339 100644
--- a/branches/sca-equinox/samples/calculator-rcp/icons/alt_window_32.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/icons/alt_window_32.gif
diff --git a/branches/sca-equinox/samples/calculator-rcp/plugin.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/plugin.xml
index 1fb5acd9b5..1fb5acd9b5 100644
--- a/branches/sca-equinox/samples/calculator-rcp/plugin.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/plugin.xml
diff --git a/branches/sca-equinox/samples/calculator-rcp/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/pom.xml
index 5c02c8cfde..5c02c8cfde 100644
--- a/branches/sca-equinox/samples/calculator-rcp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/Calculator.composite
index 913081b9be..913081b9be 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java
index adbd18a9e4..adbd18a9e4 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
index 4fd7b8520d..4fd7b8520d 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Application.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Application.java
index 137c7307ac..137c7307ac 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Application.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Application.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationActionBarAdvisor.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationActionBarAdvisor.java
index 2fccfb2d77..2fccfb2d77 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationActionBarAdvisor.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationActionBarAdvisor.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchAdvisor.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchAdvisor.java
index ac1893509c..ac1893509c 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchAdvisor.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchAdvisor.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchWindowAdvisor.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchWindowAdvisor.java
index 6378decf20..6378decf20 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchWindowAdvisor.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchWindowAdvisor.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Perspective.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Perspective.java
index 445b4b65b2..445b4b65b2 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Perspective.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Perspective.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/View.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/View.java
index f95c1e029c..f95c1e029c 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/View.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/View.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/README b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/README
index 837b5ce75f..837b5ce75f 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/README
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/build.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/build.xml
index ca75625b42..ca75625b42 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/build.xml
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/calculator-rmi-reference.png b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/calculator-rmi-reference.png
index 8c76b77a9f..8c76b77a9f 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/calculator-rmi-reference.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/calculator-rmi-reference.png
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/calculator-rmi-reference.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/calculator-rmi-reference.svg
index ba802e6717..ba802e6717 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/calculator-rmi-reference.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/calculator-rmi-reference.svg
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/pom.xml
index 95033d191c..95033d191c 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
index cd1076c3f1..cd1076c3f1 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
index d310dad4b1..d310dad4b1 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
index f28f0ca179..f28f0ca179 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
index f310e5269c..f310e5269c 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 15e00f5946..15e00f5946 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/README b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/README
index 454cdc0d37..454cdc0d37 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/README
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/build.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/build.xml
index f98f35e4b0..f98f35e4b0 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/build.xml
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/calculator-rmi-service.png b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/calculator-rmi-service.png
index 574f5eb14b..574f5eb14b 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/calculator-rmi-service.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/calculator-rmi-service.png
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/calculator-rmi-service.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/calculator-rmi-service.svg
index 9253110f98..9253110f98 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/calculator-rmi-service.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/calculator-rmi-service.svg
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/pom.xml
index d13f0a74d9..d13f0a74d9 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
index b698163c1b..b698163c1b 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
index 3ddcef61df..3ddcef61df 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
index f28f0ca179..f28f0ca179 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
index c1a15e9107..c1a15e9107 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 8943dd24f6..8943dd24f6 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/branches/sca-equinox/samples/calculator-script/README b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/README
index ab1dda13df..ab1dda13df 100644
--- a/branches/sca-equinox/samples/calculator-script/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/README
diff --git a/branches/sca-equinox/samples/calculator-script/build.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/build.xml
index 429d638ca5..429d638ca5 100644
--- a/branches/sca-equinox/samples/calculator-script/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/build.xml
diff --git a/branches/sca-equinox/samples/calculator-script/calculator-script.png b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/calculator-script.png
index d3f8c491c3..d3f8c491c3 100644
--- a/branches/sca-equinox/samples/calculator-script/calculator-script.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/calculator-script.png
diff --git a/branches/sca-equinox/samples/calculator-script/calculator-script.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/calculator-script.svg
index 16939f9310..16939f9310 100644
--- a/branches/sca-equinox/samples/calculator-script/calculator-script.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/calculator-script.svg
diff --git a/branches/sca-equinox/samples/calculator-script/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/pom.xml
index 38100c0eff..38100c0eff 100644
--- a/branches/sca-equinox/samples/calculator-script/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
index 243d1562dc..243d1562dc 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/resources/Calculator.composite
index 8a765e6153..8a765e6153 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
index 1d4d221364..1d4d221364 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
index d6f27ca7f5..d6f27ca7f5 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
index 132a1d13b0..132a1d13b0 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/branches/sca-equinox/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
index fea8f62110..fea8f62110 100644
--- a/branches/sca-equinox/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/README b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/README
index c88b92b206..c88b92b206 100644
--- a/branches/sca-equinox/samples/calculator-webapp/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/README
diff --git a/branches/sca-equinox/samples/calculator-webapp/calculator-web.png b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/calculator-web.png
index 896ddc4093..896ddc4093 100644
--- a/branches/sca-equinox/samples/calculator-webapp/calculator-web.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/calculator-web.png
diff --git a/branches/sca-equinox/samples/calculator-webapp/calculator-web.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/calculator-web.svg
index 00ed27556f..00ed27556f 100644
--- a/branches/sca-equinox/samples/calculator-webapp/calculator-web.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/calculator-web.svg
diff --git a/branches/sca-equinox/samples/calculator-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/pom.xml
index 8645b70e03..8645b70e03 100644
--- a/branches/sca-equinox/samples/calculator-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
index 4787b728f4..4787b728f4 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index bf3b0303ec..bf3b0303ec 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/resources/Calculator.composite
index 50c23af0b2..50c23af0b2 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
index fe09ab2e1b..fe09ab2e1b 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
index b5a828d55b..b5a828d55b 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/calc.jsp b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/calc.jsp
index 4bc5c984dd..4bc5c984dd 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/README b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/README
index a6e6c897e4..a6e6c897e4 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/README
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/calculator-web.png b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/calculator-web.png
index f482b8d1c8..f482b8d1c8 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/calculator-web.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/calculator-web.png
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/calculator-web.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/calculator-web.svg
index 1b7015b156..1b7015b156 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/calculator-web.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/calculator-web.svg
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml
index 7e823c0f9e..7e823c0f9e 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
index c3c789e745..c3c789e745 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
index 46ec182124..46ec182124 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
index 4787b728f4..4787b728f4 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index bf3b0303ec..bf3b0303ec 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
index c8653806aa..c8653806aa 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
index 9625c0d692..9625c0d692 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
index 23a62680c5..23a62680c5 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
index 4d511f887e..4d511f887e 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index 858e87a34f..858e87a34f 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
index b6b244244b..b6b244244b 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
index 4611669bbd..4611669bbd 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/security.properties b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
index a7a6f3aa9c..a7a6f3aa9c 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
index fe09ab2e1b..fe09ab2e1b 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 355ace0100..355ace0100 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
index d3a62d39f4..d3a62d39f4 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
index 4c4366747d..4c4366747d 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/README b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/README
index a6e6c897e4..a6e6c897e4 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/README
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/calculator-web.png b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/calculator-web.png
index f482b8d1c8..f482b8d1c8 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/calculator-web.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/calculator-web.png
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/calculator-web.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/calculator-web.svg
index 1b7015b156..1b7015b156 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/calculator-web.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/calculator-web.svg
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml
index 64eec7306a..64eec7306a 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
index c3c789e745..c3c789e745 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
index a7049729f7..a7049729f7 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
index 4787b728f4..4787b728f4 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index bf3b0303ec..bf3b0303ec 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
index 6415d5a896..6415d5a896 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
index fe09ab2e1b..fe09ab2e1b 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 3b6a4795dd..3b6a4795dd 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
index d3a62d39f4..d3a62d39f4 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/calc.jsp b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
index 4c4366747d..4c4366747d 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-equinox/samples/calculator/README b/sca-java-2.x/branches/sca-equinox/samples/calculator/README
index ceb532faed..ceb532faed 100644
--- a/branches/sca-equinox/samples/calculator/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/README
diff --git a/branches/sca-equinox/samples/calculator/build.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator/build.xml
index c4b755ef94..c4b755ef94 100644
--- a/branches/sca-equinox/samples/calculator/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/build.xml
diff --git a/branches/sca-equinox/samples/calculator/calculator.png b/sca-java-2.x/branches/sca-equinox/samples/calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-equinox/samples/calculator/calculator.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/calculator.png
diff --git a/branches/sca-equinox/samples/calculator/calculator.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator/calculator.svg
index 0615925c50..0615925c50 100644
--- a/branches/sca-equinox/samples/calculator/calculator.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/calculator.svg
diff --git a/branches/sca-equinox/samples/calculator/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator/pom.xml
index f2196d175b..f2196d175b 100644
--- a/branches/sca-equinox/samples/calculator/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/pom.xml
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorClient.java
index 3f0bcd15c9..3f0bcd15c9 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/resources/Calculator.composite
index 90872041b0..90872041b0 100644
--- a/branches/sca-equinox/samples/calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
index 1a880d2656..1a880d2656 100644
--- a/branches/sca-equinox/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-equinox/samples/callback-ws-client/README b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/README
index 66121362c9..66121362c9 100644
--- a/branches/sca-equinox/samples/callback-ws-client/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/README
diff --git a/branches/sca-equinox/samples/callback-ws-client/build.xml b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/build.xml
index 8698c6018d..8698c6018d 100644
--- a/branches/sca-equinox/samples/callback-ws-client/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/build.xml
diff --git a/branches/sca-equinox/samples/callback-ws-client/callback-ws-client.png b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/callback-ws-client.png
index 802ef604a7..802ef604a7 100644
--- a/branches/sca-equinox/samples/callback-ws-client/callback-ws-client.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/callback-ws-client.png
diff --git a/branches/sca-equinox/samples/callback-ws-client/callback-ws-client.svg b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/callback-ws-client.svg
index f49aeadbbf..f49aeadbbf 100644
--- a/branches/sca-equinox/samples/callback-ws-client/callback-ws-client.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/callback-ws-client.svg
diff --git a/branches/sca-equinox/samples/callback-ws-client/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/pom.xml
index 6e462d95dd..6e462d95dd 100644
--- a/branches/sca-equinox/samples/callback-ws-client/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/pom.xml
diff --git a/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClient.java b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClient.java
index e515b55788..e515b55788 100644
--- a/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClient.java
diff --git a/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
index 1ac33872b7..1ac33872b7 100644
--- a/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
diff --git a/branches/sca-equinox/samples/callback-ws-client/src/main/java/myserver/MyService.java b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/java/myserver/MyService.java
index 1850eae1bc..1850eae1bc 100644
--- a/branches/sca-equinox/samples/callback-ws-client/src/main/java/myserver/MyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/java/myserver/MyService.java
diff --git a/branches/sca-equinox/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
index bf5f87a4f9..bf5f87a4f9 100644
--- a/branches/sca-equinox/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
diff --git a/branches/sca-equinox/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
index 314747d548..314747d548 100644
--- a/branches/sca-equinox/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/callback-ws-client/src/main/resources/myapp.composite b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/resources/myapp.composite
index 5b776d6df8..5b776d6df8 100644
--- a/branches/sca-equinox/samples/callback-ws-client/src/main/resources/myapp.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/resources/myapp.composite
diff --git a/branches/sca-equinox/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
index af343c637c..af343c637c 100644
--- a/branches/sca-equinox/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
diff --git a/branches/sca-equinox/samples/callback-ws-service/README b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/README
index 2c65f745a6..2c65f745a6 100644
--- a/branches/sca-equinox/samples/callback-ws-service/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/README
diff --git a/branches/sca-equinox/samples/callback-ws-service/build.xml b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/build.xml
index c91dd88a8c..c91dd88a8c 100644
--- a/branches/sca-equinox/samples/callback-ws-service/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/build.xml
diff --git a/branches/sca-equinox/samples/callback-ws-service/callback-ws-service.png b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/callback-ws-service.png
index 772ac38431..772ac38431 100644
--- a/branches/sca-equinox/samples/callback-ws-service/callback-ws-service.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/callback-ws-service.png
diff --git a/branches/sca-equinox/samples/callback-ws-service/callback-ws-service.svg b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/callback-ws-service.svg
index ff0a1d307b..ff0a1d307b 100644
--- a/branches/sca-equinox/samples/callback-ws-service/callback-ws-service.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/callback-ws-service.svg
diff --git a/branches/sca-equinox/samples/callback-ws-service/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/pom.xml
index 4906c5359d..4906c5359d 100644
--- a/branches/sca-equinox/samples/callback-ws-service/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/pom.xml
diff --git a/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
index da3844dbf3..da3844dbf3 100644
--- a/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
diff --git a/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyService.java b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyService.java
index 1850eae1bc..1850eae1bc 100644
--- a/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyService.java
diff --git a/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
index bf5f87a4f9..bf5f87a4f9 100644
--- a/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
diff --git a/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
index 25469def5c..25469def5c 100644
--- a/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
diff --git a/branches/sca-equinox/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
index 35f7f60c2e..35f7f60c2e 100644
--- a/branches/sca-equinox/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/callback-ws-service/src/main/resources/callbackws.composite b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/resources/callbackws.composite
index a09e638896..a09e638896 100644
--- a/branches/sca-equinox/samples/callback-ws-service/src/main/resources/callbackws.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/resources/callbackws.composite
diff --git a/branches/sca-equinox/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
index 1b17e10556..1b17e10556 100644
--- a/branches/sca-equinox/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
diff --git a/branches/sca-equinox/samples/callbacks-jms/README b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/README
index b5e130e2fc..b5e130e2fc 100644
--- a/branches/sca-equinox/samples/callbacks-jms/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/README
diff --git a/branches/sca-equinox/samples/callbacks-jms/build.xml b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/build.xml
index 665feeca71..665feeca71 100644
--- a/branches/sca-equinox/samples/callbacks-jms/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/build.xml
diff --git a/branches/sca-equinox/samples/callbacks-jms/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/pom.xml
index 2e7270587f..2e7270587f 100644
--- a/branches/sca-equinox/samples/callbacks-jms/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/pom.xml
diff --git a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java
index 775663cdff..775663cdff 100644
--- a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java
diff --git a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java
index 69f5751379..69f5751379 100644
--- a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java
diff --git a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java
index 882bcf8479..882bcf8479 100644
--- a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java
diff --git a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderService.java b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderService.java
index 9f6d90577c..9f6d90577c 100644
--- a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderService.java
diff --git a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java
index 3393ae5dca..3393ae5dca 100644
--- a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java
diff --git a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java
index dd963bc1b0..dd963bc1b0 100644
--- a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java
diff --git a/branches/sca-equinox/samples/callbacks-jms/src/main/resources/callbacks.composite b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/resources/callbacks.composite
index 94dd29c45d..94dd29c45d 100644
--- a/branches/sca-equinox/samples/callbacks-jms/src/main/resources/callbacks.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/resources/callbacks.composite
diff --git a/branches/sca-equinox/samples/callbacks-jms/src/main/resources/jndi.properties b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/resources/jndi.properties
index 698aeb1711..698aeb1711 100644
--- a/branches/sca-equinox/samples/callbacks-jms/src/main/resources/jndi.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/resources/jndi.properties
diff --git a/branches/sca-equinox/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java
index 967fc42c64..967fc42c64 100644
--- a/branches/sca-equinox/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java
diff --git a/branches/sca-equinox/samples/customer-dojo/README b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/README
index 9c1729123f..9c1729123f 100644
--- a/branches/sca-equinox/samples/customer-dojo/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/README
diff --git a/branches/sca-equinox/samples/customer-dojo/build-dojo.xml b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/build-dojo.xml
index 8c6bd99484..8c6bd99484 100644
--- a/branches/sca-equinox/samples/customer-dojo/build-dojo.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/build-dojo.xml
diff --git a/branches/sca-equinox/samples/customer-dojo/build.xml b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/build.xml
index 95813af65a..95813af65a 100644
--- a/branches/sca-equinox/samples/customer-dojo/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/build.xml
diff --git a/branches/sca-equinox/samples/customer-dojo/customer-dojo-jsonrpc.png b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/customer-dojo-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/branches/sca-equinox/samples/customer-dojo/customer-dojo-jsonrpc.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/customer-dojo-jsonrpc.png
diff --git a/branches/sca-equinox/samples/customer-dojo/customer-dojo-jsonrpc.svg b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/customer-dojo-jsonrpc.svg
index d5c3bc5d3e..d5c3bc5d3e 100644
--- a/branches/sca-equinox/samples/customer-dojo/customer-dojo-jsonrpc.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/customer-dojo-jsonrpc.svg
diff --git a/branches/sca-equinox/samples/customer-dojo/customer.sql b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/customer.sql
index a3caf8e050..a3caf8e050 100644
--- a/branches/sca-equinox/samples/customer-dojo/customer.sql
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/customer.sql
diff --git a/branches/sca-equinox/samples/customer-dojo/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/pom.xml
index ea23f4f53b..ea23f4f53b 100644
--- a/branches/sca-equinox/samples/customer-dojo/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/pom.xml
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/Customer.java b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/Customer.java
index 6d207ea2ef..6d207ea2ef 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/Customer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/Customer.java
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerCollection.java b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerCollection.java
index 5ad39aad5c..5ad39aad5c 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerCollection.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerCollection.java
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java
index c0a2f25f15..c0a2f25f15 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerService.java b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerService.java
index 7915cc6e77..7915cc6e77 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerService.java
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java
index 0cba7d8bc1..0cba7d8bc1 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/java/launch/Launch.java b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/launch/Launch.java
index a51ab605bc..a51ab605bc 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/java/launch/Launch.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/launch/Launch.java
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/orm.xml b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/orm.xml
index 64be295302..64be295302 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/orm.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/orm.xml
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/persistence.xml b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/persistence.xml
index 5add897279..5add897279 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/persistence.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/persistence.xml
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml
index 136326d1d3..136326d1d3 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/resources/content/customer.html b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/resources/content/customer.html
index dbc8aad9d0..dbc8aad9d0 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/resources/content/customer.html
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/resources/content/customer.html
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/resources/customer.composite b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/resources/customer.composite
index 4c370f2a9f..4c370f2a9f 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/resources/customer.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/resources/customer.composite
diff --git a/branches/sca-equinox/samples/databinding-echo/README b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/README
index 67c1aa32d5..67c1aa32d5 100644
--- a/branches/sca-equinox/samples/databinding-echo/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/README
diff --git a/branches/sca-equinox/samples/databinding-echo/build.xml b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/build.xml
index 7f2483f6fb..7f2483f6fb 100644
--- a/branches/sca-equinox/samples/databinding-echo/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/build.xml
diff --git a/branches/sca-equinox/samples/databinding-echo/databinding-echo.png b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/databinding-echo.png
index afbbfff285..afbbfff285 100644
--- a/branches/sca-equinox/samples/databinding-echo/databinding-echo.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/databinding-echo.png
diff --git a/branches/sca-equinox/samples/databinding-echo/databinding-echo.svg b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/databinding-echo.svg
index 87964abf86..87964abf86 100644
--- a/branches/sca-equinox/samples/databinding-echo/databinding-echo.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/databinding-echo.svg
diff --git a/branches/sca-equinox/samples/databinding-echo/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/pom.xml
index 89fa6872c0..89fa6872c0 100644
--- a/branches/sca-equinox/samples/databinding-echo/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/pom.xml
diff --git a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
index 5679614164..5679614164 100644
--- a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
diff --git a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
index ff8968837d..ff8968837d 100644
--- a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
diff --git a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Echo.java b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Echo.java
index 73da41b55e..73da41b55e 100644
--- a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Echo.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Echo.java
diff --git a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
index 9ec3819899..9ec3819899 100644
--- a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
diff --git a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface1.java b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface1.java
index 81d3581f85..81d3581f85 100644
--- a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface1.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface1.java
diff --git a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface2.java b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface2.java
index 543d51cb95..543d51cb95 100644
--- a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface2.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface2.java
diff --git a/branches/sca-equinox/samples/databinding-echo/src/main/resources/EchoDataBinding.composite b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
index 30b77a6152..30b77a6152 100644
--- a/branches/sca-equinox/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
diff --git a/branches/sca-equinox/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
index ef2308aa73..ef2308aa73 100644
--- a/branches/sca-equinox/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
diff --git a/branches/sca-equinox/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
index 43434d8cee..43434d8cee 100644
--- a/branches/sca-equinox/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
diff --git a/branches/sca-equinox/samples/domain-management/README b/sca-java-2.x/branches/sca-equinox/samples/domain-management/README
index 6280a28028..6280a28028 100644
--- a/branches/sca-equinox/samples/domain-management/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/README
diff --git a/branches/sca-equinox/samples/domain-management/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/domain-management/pom.xml
index 9b3961146a..9b3961146a 100644
--- a/branches/sca-equinox/samples/domain-management/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/pom.xml
diff --git a/branches/sca-equinox/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
index a8f9b3da43..a8f9b3da43 100644
--- a/branches/sca-equinox/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
diff --git a/branches/sca-equinox/samples/domain-management/src/main/java/manager/DistributeComponents.java b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/DistributeComponents.java
index f3faea4f15..f3faea4f15 100644
--- a/branches/sca-equinox/samples/domain-management/src/main/java/manager/DistributeComponents.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/DistributeComponents.java
diff --git a/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListComponents.java b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListComponents.java
index b8dee12962..b8dee12962 100644
--- a/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListComponents.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListComponents.java
diff --git a/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListDependencies.java b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListDependencies.java
index 9e57afbee3..9e57afbee3 100644
--- a/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListDependencies.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListDependencies.java
diff --git a/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListDeployables.java b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListDeployables.java
index f5f0b9c655..f5f0b9c655 100644
--- a/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListDeployables.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListDeployables.java
diff --git a/branches/sca-equinox/samples/domain-management/src/main/java/manager/WireComponents.java b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/WireComponents.java
index acc18a6293..acc18a6293 100644
--- a/branches/sca-equinox/samples/domain-management/src/main/java/manager/WireComponents.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/WireComponents.java
diff --git a/branches/sca-equinox/samples/domain-management/src/test/java/services/Cart.java b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/java/services/Cart.java
index 9e6226d963..9e6226d963 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/java/services/Cart.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/java/services/Cart.java
diff --git a/branches/sca-equinox/samples/domain-management/src/test/java/services/Item.java b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/java/services/Item.java
index 81cefcdbef..81cefcdbef 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/java/services/Item.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/java/services/Item.java
diff --git a/branches/sca-equinox/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java
index c32853b3a9..c32853b3a9 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java
diff --git a/branches/sca-equinox/samples/domain-management/src/test/java/services/ShoppingCartImpl.java b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/java/services/ShoppingCartImpl.java
index 30abfe77a0..30abfe77a0 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/java/services/ShoppingCartImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/java/services/ShoppingCartImpl.java
diff --git a/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/assets.xml b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/assets.xml
index 10693a89e6..10693a89e6 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/assets.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/assets.xml
diff --git a/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/client.xml b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/client.xml
index 5b34693bee..5b34693bee 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/client.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/client.xml
diff --git a/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/store.xml b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/store.xml
index d19b7eb161..d19b7eb161 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/store.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/store.xml
diff --git a/branches/sca-equinox/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
index 33fe814c3a..33fe814c3a 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml
index 14e1cdb672..14e1cdb672 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/domain-management/src/test/resources/client/client.composite b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/client/client.composite
index 1279b319c4..1279b319c4 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/resources/client/client.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/client/client.composite
diff --git a/branches/sca-equinox/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml
index 52348106f2..52348106f2 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/domain-management/src/test/resources/store/store.composite b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/store/store.composite
index d4f18771d8..d4f18771d8 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/resources/store/store.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/store/store.composite
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/README b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/README
index 3668a7705e..3668a7705e 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/README
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/feed-aggregator-webapp.png b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
index 1af95a5eff..1af95a5eff 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
index a861a5c50f..a861a5c50f 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml
index 7709d9448c..7709d9448c 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
index d4adf03851..d4adf03851 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
index dec073c36b..dec073c36b 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
index f7ead126a7..f7ead126a7 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
index 736563098f..736563098f 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
index b67fe843ca..b67fe843ca 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
index dea3980e4d..dea3980e4d 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/index.html b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/index.html
index 7b33391a87..7b33391a87 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/index.html
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/index.html
diff --git a/branches/sca-equinox/samples/feed-aggregator/README b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/README
index f73baec2fd..f73baec2fd 100644
--- a/branches/sca-equinox/samples/feed-aggregator/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/README
diff --git a/branches/sca-equinox/samples/feed-aggregator/build.xml b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/build.xml
index 0ab6fed7fc..0ab6fed7fc 100644
--- a/branches/sca-equinox/samples/feed-aggregator/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/build.xml
diff --git a/branches/sca-equinox/samples/feed-aggregator/feed-aggregator.png b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/feed-aggregator.png
index c8fea8a7b8..c8fea8a7b8 100644
--- a/branches/sca-equinox/samples/feed-aggregator/feed-aggregator.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/feed-aggregator.png
diff --git a/branches/sca-equinox/samples/feed-aggregator/feed-aggregator.svg b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/feed-aggregator.svg
index 72fe6a00ac..72fe6a00ac 100644
--- a/branches/sca-equinox/samples/feed-aggregator/feed-aggregator.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/feed-aggregator.svg
diff --git a/branches/sca-equinox/samples/feed-aggregator/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/pom.xml
index 14190e0d17..14190e0d17 100644
--- a/branches/sca-equinox/samples/feed-aggregator/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/pom.xml
diff --git a/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
index 70e05b3bb3..70e05b3bb3 100644
--- a/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
diff --git a/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/Sort.java b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/Sort.java
index dec073c36b..dec073c36b 100644
--- a/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/Sort.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/Sort.java
diff --git a/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/SortImpl.java b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/SortImpl.java
index f7ead126a7..f7ead126a7 100644
--- a/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/SortImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/SortImpl.java
diff --git a/branches/sca-equinox/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java
index 1c549f7cd2..1c549f7cd2 100644
--- a/branches/sca-equinox/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java
diff --git a/branches/sca-equinox/samples/feed-aggregator/src/main/resources/FeedAggregator.composite b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
index 8a3a53b4d5..8a3a53b4d5 100644
--- a/branches/sca-equinox/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
diff --git a/branches/sca-equinox/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTest.java b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTest.java
index 9fdfe711be..9fdfe711be 100644
--- a/branches/sca-equinox/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTest.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTest.java
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/README
index 5c669f5da5..5c669f5da5 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/README
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/build.xml
index c8917007f1..c8917007f1 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/helloworld-bpel.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/helloworld-bpel.png
index 5f53a3c5d1..5f53a3c5d1 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/helloworld-bpel.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/helloworld-bpel.png
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/helloworld-bpel.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/helloworld-bpel.svg
index 5a98f1a07c..5a98f1a07c 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/helloworld-bpel.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/helloworld-bpel.svg
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/pom.xml
index b379f18e0c..b379f18e0c 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/java/helloworld/BPELClient.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/java/helloworld/BPELClient.java
index 971a5373e9..971a5373e9 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/java/helloworld/BPELClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/java/helloworld/BPELClient.java
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/deploy.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/deploy.xml
index d9d4363832..d9d4363832 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/deploy.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/deploy.xml
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.bpel b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.bpel
index a88aa7960c..a88aa7960c 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.bpel
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.componentType b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.componentType
index 70273245d7..70273245d7 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.componentType
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.composite
index 97262109e6..97262109e6 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.composite
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.wsdl
index 1cb338b283..1cb338b283 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/log4j.properties b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/log4j.properties
index c1bc0a0b81..c1bc0a0b81 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/log4j.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/log4j.properties
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/src/test/java/helloworld/BPELHelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/test/java/helloworld/BPELHelloWorldTestCase.java
index 6ad63f87d9..6ad63f87d9 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/src/test/java/helloworld/BPELHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/test/java/helloworld/BPELHelloWorldTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-bpel/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/README
index bf5f500ef3..bf5f500ef3 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/README
diff --git a/branches/sca-equinox/samples/helloworld-bpel/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/build.xml
index 890a6427b8..890a6427b8 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-bpel/helloworld-bpel.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/helloworld-bpel.png
index 5f53a3c5d1..5f53a3c5d1 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/helloworld-bpel.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/helloworld-bpel.png
diff --git a/branches/sca-equinox/samples/helloworld-bpel/helloworld-bpel.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/helloworld-bpel.svg
index 5a98f1a07c..5a98f1a07c 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/helloworld-bpel.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/helloworld-bpel.svg
diff --git a/branches/sca-equinox/samples/helloworld-bpel/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/pom.xml
index 8c5faa42fd..8c5faa42fd 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
index 1826c885c4..1826c885c4 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
diff --git a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/deploy.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/deploy.xml
index 9bd95b2c58..9bd95b2c58 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/deploy.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/deploy.xml
diff --git a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.bpel
index a88aa7960c..a88aa7960c 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.bpel
diff --git a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.componentType b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.componentType
diff --git a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.composite
diff --git a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/log4j.properties b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/log4j.properties
index 8649a71550..8649a71550 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/log4j.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/log4j.properties
diff --git a/branches/sca-equinox/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
index 1caaa78878..1caaa78878 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/README
index 38392a13b6..38392a13b6 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/README
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/build-dojo.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/build-dojo.xml
index 534a1dacd9..534a1dacd9 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/build-dojo.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/build-dojo.xml
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/build.xml
index 95813af65a..95813af65a 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
index d5c3bc5d3e..d5c3bc5d3e 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml
index b31df2701d..b31df2701d 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
index 3d8ea24f04..3d8ea24f04 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
index e205f4da9b..e205f4da9b 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
index e895ab455d..e895ab455d 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
index 4195f3288c..4195f3288c 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 2c178c1ddc..2c178c1ddc 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
index 70cd67890a..70cd67890a 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/style.css b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/style.css
index 1071583264..1071583264 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/style.css
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/style.css
diff --git a/branches/sca-equinox/samples/helloworld-jms-webapp/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/README
index 9be2e0b0f6..9be2e0b0f6 100644
--- a/branches/sca-equinox/samples/helloworld-jms-webapp/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/README
diff --git a/branches/sca-equinox/samples/helloworld-jms-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/pom.xml
index a94903da21..a94903da21 100644
--- a/branches/sca-equinox/samples/helloworld-jms-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
index c24a741ee2..c24a741ee2 100644
--- a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
index 2af978b9ce..2af978b9ce 100644
--- a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
index 280388f443..280388f443 100644
--- a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
index 2419887413..2419887413 100644
--- a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
diff --git a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
index f6328d156c..f6328d156c 100644
--- a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
diff --git a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
index 86710435ae..86710435ae 100644
--- a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
index bc6ef59a9b..bc6ef59a9b 100644
--- a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/README
index 07253d039b..07253d039b 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/README
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
index 6ef1f438fb..6ef1f438fb 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml
index 49fbca6e06..49fbca6e06 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
index 3d8ea24f04..3d8ea24f04 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
index 35fd00fabd..35fd00fabd 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
index e895ab455d..e895ab455d 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
index 75dd9050fa..75dd9050fa 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
index c8246e15a7..c8246e15a7 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
index 267bed176c..267bed176c 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
index 1071583264..1071583264 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/README
index 184e67a239..184e67a239 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/README
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/build.xml
index 4702beed0d..4702beed0d 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/helloworld-reference.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/helloworld-reference.png
index ab80b1f91c..ab80b1f91c 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/helloworld-reference.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/helloworld-reference.png
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/helloworld-reference.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/helloworld-reference.svg
index 40f4e8f271..40f4e8f271 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/helloworld-reference.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/helloworld-reference.svg
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/pom.xml
index 10d353d718..10d353d718 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
index 5bec27a137..5bec27a137 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
index c0259c6e07..c0259c6e07 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
index 27cef47677..27cef47677 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
index 3cf1104562..3cf1104562 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
index e692ef8e4c..e692ef8e4c 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/logging.properties b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/logging.properties
index a2a4067921..a2a4067921 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/logging.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/logging.properties
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
index e0ea596dd3..e0ea596dd3 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
index f5380d9ccd..f5380d9ccd 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/README
index 49feabaa07..49feabaa07 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/README
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/build.xml
index 330de7f7e5..330de7f7e5 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/helloworld-service.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/helloworld-service.png
index ef27c71f54..ef27c71f54 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/helloworld-service.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/helloworld-service.png
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/helloworld-service.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/helloworld-service.svg
index dd7a9dd87d..dd7a9dd87d 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/helloworld-service.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/helloworld-service.svg
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/pom.xml
index b9cabf8f4a..b9cabf8f4a 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
index d4ea391a00..d4ea391a00 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
index 4b019b21bf..4b019b21bf 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/definitions.xml
index 8c881ab0bb..8c881ab0bb 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
index 3135cdc320..3135cdc320 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
index 3f9e00689e..3f9e00689e 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
index 7930f98716..7930f98716 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/README
index abf10ef1f2..abf10ef1f2 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/README
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/build.xml
index 4f83c8ae9d..4f83c8ae9d 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
index 333ad53e0a..333ad53e0a 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/pom.xml
index 567d0f2fa3..567d0f2fa3 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
index b3db243a1f..b3db243a1f 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
index db0c947cf7..db0c947cf7 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
index 0dee19550b..0dee19550b 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
index d029ba3e1c..d029ba3e1c 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
index a4eb217310..a4eb217310 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
index 12b0716b5d..12b0716b5d 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/README
index 13c89ab2f6..13c89ab2f6 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/README
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg
index 354ffbae8f..354ffbae8f 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/pom.xml
index fe9fcaeda8..fe9fcaeda8 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java
index f8d66876fa..f8d66876fa 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java
index 13a31b6391..13a31b6391 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java
index 6d1722095b..6d1722095b 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java
index 3def5194a5..3def5194a5 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java
index 7c1853566f..7c1853566f 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java
index db0c947cf7..db0c947cf7 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite
index 991e4b4881..991e4b4881 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite
index 6ea14602b3..6ea14602b3 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite
index 3d6364f55f..3d6364f55f 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite
index 106e9db988..106e9db988 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite
index bbac4c3703..bbac4c3703 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl
index 662c9affac..662c9affac 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java
index 51b70f47c2..51b70f47c2 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java
index 8226ec884e..8226ec884e 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/README
index 167991c8f7..167991c8f7 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/README
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/build.xml
index 38f1b7549d..38f1b7549d 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
index 333ad53e0a..333ad53e0a 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/pom.xml
index dcb1e8b297..dcb1e8b297 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
index 0f1ebf46d6..0f1ebf46d6 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
index a21619fc8a..a21619fc8a 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
index c0259c6e07..c0259c6e07 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
index 27cef47677..27cef47677 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index 8b089c7222..8b089c7222 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
index 0ab3a5a9f1..0ab3a5a9f1 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
index 0b4f2399f0..0b4f2399f0 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
index 904befaf60..904befaf60 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
index 3a4b43222d..3a4b43222d 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
index e6fcc6f4a6..e6fcc6f4a6 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
index 848c41d1c7..848c41d1c7 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
index 21f2166560..21f2166560 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/README
index 13c89ab2f6..13c89ab2f6 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/README
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/build.xml
index 71ee66b31e..71ee66b31e 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/helloworld-ws-reference.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/helloworld-ws-reference.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/helloworld-ws-reference.png
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/helloworld-ws-reference.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/helloworld-ws-reference.svg
index 354ffbae8f..354ffbae8f 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/helloworld-ws-reference.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/helloworld-ws-reference.svg
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/pom.xml
index 94cd22e66d..94cd22e66d 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
index 4559b282fe..4559b282fe 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
index db0c947cf7..db0c947cf7 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
index 0dee19550b..0dee19550b 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
index 899ad5ce35..899ad5ce35 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/logging.properties b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/logging.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/logging.properties
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
index 662c9affac..662c9affac 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
index 7ce89179c2..7ce89179c2 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
index 8226ec884e..8226ec884e 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/README
index aa4819927a..aa4819927a 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/README
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/build.xml
index 386008e707..386008e707 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
index 2590f02a45..2590f02a45 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
index 56a29db23c..56a29db23c 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml
index 5610504002..5610504002 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
index eb82418516..eb82418516 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
index fea4e2a16c..fea4e2a16c 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
index 3d6576aca0..3d6576aca0 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
index 34396b1b02..34396b1b02 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
index fe79094b94..fe79094b94 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
index a0b7c37cd9..a0b7c37cd9 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
index 4657c6cdc1..4657c6cdc1 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 6f241cc90c..6f241cc90c 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index c2f416eac9..c2f416eac9 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
index 257e65aad4..257e65aad4 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/README
index be947b1923..be947b1923 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/README
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/build.xml
index 401315d424..401315d424 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/helloworld-ws-sdo.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
index 333ad53e0a..333ad53e0a 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/pom.xml
index e78e78b4b8..e78e78b4b8 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
index de4795ceaf..de4795ceaf 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
index c950f7df04..c950f7df04 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
index 367c5b4a12..367c5b4a12 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
index 711eef63b5..711eef63b5 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
index c255df2897..c255df2897 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
index d4fba548d5..d4fba548d5 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/logging.properties b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/logging.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/logging.properties
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
index 2ecc0bea43..2ecc0bea43 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
index 11564c370f..11564c370f 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
index 4b0c40dafd..4b0c40dafd 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/README
index 26272b1d91..26272b1d91 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/README
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/build.xml
index 330de7f7e5..330de7f7e5 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/helloworld-ws-service.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/helloworld-ws-service.png
index eab29d0bcd..eab29d0bcd 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/helloworld-ws-service.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/helloworld-ws-service.png
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/helloworld-ws-service.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
index 8d2ae98c82..8d2ae98c82 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/pom.xml
index b1d58dc677..b1d58dc677 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
index 5454487ff6..5454487ff6 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
index 4b019b21bf..4b019b21bf 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
index 8c881ab0bb..8c881ab0bb 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
index 67079f738e..67079f738e 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
index 10faf374f3..10faf374f3 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
index 3f9e00689e..3f9e00689e 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
index 34f8605d5d..34f8605d5d 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
index 03d566cc17..03d566cc17 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/README
index f32eb08b05..f32eb08b05 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/README
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/build.xml
index 29bbae0173..29bbae0173 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
index 6f7d9dd450..6f7d9dd450 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
index 53eb552923..53eb552923 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/pom.xml
index b6c814ff2c..b6c814ff2c 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
index 3d43290380..3d43290380 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
index 4b019b21bf..4b019b21bf 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
index ded02f09d6..ded02f09d6 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
index 10fa7b8652..10fa7b8652 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
index 0b4f2399f0..0b4f2399f0 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
index d1e18d7929..d1e18d7929 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
index 068229be6f..068229be6f 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
index 4a14afcd9d..4a14afcd9d 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-webapp/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/README
index 66040004f8..66040004f8 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-webapp/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/README
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-webapp/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/build.xml
index 247a398c69..247a398c69 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-webapp/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/pom.xml
index 1feda7a078..1feda7a078 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
index 0b95fbd14f..0b95fbd14f 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
index 114608e4d8..114608e4d8 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 8fa52994a6..8fa52994a6 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
index 3f3c92fa78..3f3c92fa78 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/README
index 44dc7ab4e8..44dc7ab4e8 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/README
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/build.xml
index 46678febc3..46678febc3 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/helloworld-ws-service.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/helloworld-ws-service.png
index eab29d0bcd..eab29d0bcd 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/helloworld-ws-service.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/helloworld-ws-service.png
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/helloworld-ws-service.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/helloworld-ws-service.svg
index 61cd93ead9..61cd93ead9 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/helloworld-ws-service.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/helloworld-ws-service.svg
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/pom.xml
index a172c251e6..a172c251e6 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
index c37bfcda65..c37bfcda65 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
index 7245513b2a..7245513b2a 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
index d767625ae7..d767625ae7 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
index 454763410c..454763410c 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
index 189332be91..189332be91 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
diff --git a/branches/sca-equinox/samples/implementation-composite/README b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/README
index 27de00e8ef..27de00e8ef 100644
--- a/branches/sca-equinox/samples/implementation-composite/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/README
diff --git a/branches/sca-equinox/samples/implementation-composite/build.xml b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/build.xml
index 7aa31aab8b..7aa31aab8b 100644
--- a/branches/sca-equinox/samples/implementation-composite/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/build.xml
diff --git a/branches/sca-equinox/samples/implementation-composite/implementation-composite.png b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/implementation-composite.png
index 4c6d71bc03..4c6d71bc03 100644
--- a/branches/sca-equinox/samples/implementation-composite/implementation-composite.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/implementation-composite.png
diff --git a/branches/sca-equinox/samples/implementation-composite/implementation-composite.svg b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/implementation-composite.svg
index 0e60354aab..0e60354aab 100644
--- a/branches/sca-equinox/samples/implementation-composite/implementation-composite.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/implementation-composite.svg
diff --git a/branches/sca-equinox/samples/implementation-composite/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/pom.xml
index 27b9f36f3c..27b9f36f3c 100644
--- a/branches/sca-equinox/samples/implementation-composite/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/pom.xml
diff --git a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/CompositeClient.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/CompositeClient.java
index bf743e1797..bf743e1797 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/CompositeClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/CompositeClient.java
diff --git a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/Source.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/Source.java
index d0efcc1df1..d0efcc1df1 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/Source.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/Source.java
diff --git a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/SourceCallback.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/SourceCallback.java
index baa95a8e39..baa95a8e39 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/SourceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/SourceCallback.java
diff --git a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/SourceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/SourceImpl.java
index b9a0c7ff74..b9a0c7ff74 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/SourceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/SourceImpl.java
diff --git a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/Target.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/Target.java
index 9a8f68a7fa..9a8f68a7fa 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/Target.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/Target.java
diff --git a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/TargetImpl.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/TargetImpl.java
index 86686e9233..86686e9233 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/TargetImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/TargetImpl.java
diff --git a/branches/sca-equinox/samples/implementation-composite/src/main/resources/InnerComposite.composite b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/resources/InnerComposite.composite
index 3376ac8ff5..3376ac8ff5 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/main/resources/InnerComposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/resources/InnerComposite.composite
diff --git a/branches/sca-equinox/samples/implementation-composite/src/main/resources/InnerComposite2.composite b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/resources/InnerComposite2.composite
index c9eff4fa9d..c9eff4fa9d 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/main/resources/InnerComposite2.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/resources/InnerComposite2.composite
diff --git a/branches/sca-equinox/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
index e675fd3624..e675fd3624 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/implementation-composite/src/main/resources/OuterComposite.composite b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/resources/OuterComposite.composite
index cb1c1e13d4..cb1c1e13d4 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/main/resources/OuterComposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/resources/OuterComposite.composite
diff --git a/branches/sca-equinox/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
index 9e9a4b44a4..9e9a4b44a4 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/README b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/README
index 5e8190648f..5e8190648f 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/README
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/build.xml b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/build.xml
index 88d308e6fc..88d308e6fc 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/build.xml
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/pom.xml
index 1ed85d5c95..1ed85d5c95 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/pom.xml
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUD.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
index b23d85887b..b23d85887b 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
index 49be844f93..49be844f93 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
index fa83c63c1b..fa83c63c1b 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
index cc0795a735..cc0795a735 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
index a7908501a1..a7908501a1 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
index 383a035e69..383a035e69 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
index b212ee3c9b..b212ee3c9b 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
index 8f11f9d910..8f11f9d910 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
index 4566cb7155..4566cb7155 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
index 3cf5de5fa1..3cf5de5fa1 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 17c98cf706..17c98cf706 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 527c626418..527c626418 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 6ce605197a..6ce605197a 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
index 447e31bf93..447e31bf93 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
index 0bb5cfc361..0bb5cfc361 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/test/resources/crud.composite b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/test/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/test/resources/crud.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/test/resources/crud.composite
diff --git a/branches/sca-equinox/samples/implementation-crud/README b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/README
index 50da631c04..50da631c04 100644
--- a/branches/sca-equinox/samples/implementation-crud/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/README
diff --git a/branches/sca-equinox/samples/implementation-crud/build.xml b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/build.xml
index 10b26b5a94..10b26b5a94 100644
--- a/branches/sca-equinox/samples/implementation-crud/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/build.xml
diff --git a/branches/sca-equinox/samples/implementation-crud/implementation-crud.png b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/implementation-crud.png
index a292037e7a..a292037e7a 100644
--- a/branches/sca-equinox/samples/implementation-crud/implementation-crud.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/implementation-crud.png
diff --git a/branches/sca-equinox/samples/implementation-crud/implementation-crud.svg b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/implementation-crud.svg
index dbb37be208..dbb37be208 100644
--- a/branches/sca-equinox/samples/implementation-crud/implementation-crud.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/implementation-crud.svg
diff --git a/branches/sca-equinox/samples/implementation-crud/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/pom.xml
index ce3f1c5232..ce3f1c5232 100644
--- a/branches/sca-equinox/samples/implementation-crud/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/pom.xml
diff --git a/branches/sca-equinox/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
index ea87cb3001..ea87cb3001 100644
--- a/branches/sca-equinox/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
diff --git a/branches/sca-equinox/samples/implementation-crud/src/main/resources/crud.composite b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/src/main/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/branches/sca-equinox/samples/implementation-crud/src/main/resources/crud.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/src/main/resources/crud.composite
diff --git a/branches/sca-equinox/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
index 7e0476a8b1..7e0476a8b1 100644
--- a/branches/sca-equinox/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/README b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/README
index 3b201779e1..3b201779e1 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/README
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/build.xml b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/build.xml
index 78bae79859..78bae79859 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/build.xml
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/pom.xml
index 3134c26a34..3134c26a34 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/pom.xml
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
index 7c2f5d236f..7c2f5d236f 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
index bbcfb3d0dc..bbcfb3d0dc 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
index 0dad270a6c..0dad270a6c 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
index f2d6871039..f2d6871039 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
index 1c5868b674..1c5868b674 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
index 87333c61f6..87333c61f6 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
index 73a0d22493..73a0d22493 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
index 22f2be09e9..22f2be09e9 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 8337e81c5f..8337e81c5f 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 64dd230a15..64dd230a15 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index b30ea3b9cf..b30ea3b9cf 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
index 075af98240..075af98240 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
index c9d170770b..c9d170770b 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
index cc32929f09..cc32929f09 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
index 0580e30aba..0580e30aba 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
index 69ab1f567e..69ab1f567e 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
index d8b5f41adc..d8b5f41adc 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
index a92c5ab8db..a92c5ab8db 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
index c38094dfc9..c38094dfc9 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-equinox/samples/loanapplication/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/pom.xml
index c8614b44a4..c8614b44a4 100644
--- a/branches/sca-equinox/samples/loanapplication/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/pom.xml
diff --git a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
index 4fedb70782..4fedb70782 100644
--- a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
diff --git a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
index 5183ece867..5183ece867 100644
--- a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
diff --git a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanClient.java b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
index 7e4438bbff..7e4438bbff 100644
--- a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
diff --git a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
index b06d9465a2..b06d9465a2 100644
--- a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
diff --git a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanService.java b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanService.java
index 9dfd8b42fe..9dfd8b42fe 100644
--- a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanService.java
diff --git a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
index 76a53323bd..76a53323bd 100644
--- a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
diff --git a/branches/sca-equinox/samples/loanapplication/src/main/resources/loanapplication.composite b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/resources/loanapplication.composite
index 3aa8d030b7..3aa8d030b7 100644
--- a/branches/sca-equinox/samples/loanapplication/src/main/resources/loanapplication.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/resources/loanapplication.composite
diff --git a/branches/sca-equinox/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
index e88e48a53a..e88e48a53a 100644
--- a/branches/sca-equinox/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/README b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/README
index 11fecf2ae8..11fecf2ae8 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/README
diff --git a/branches/sca-equinox/samples/osgi-supplychain/build-bundles.xml b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/build-bundles.xml
index 7a31e6016b..7a31e6016b 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/build-bundles.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/build-bundles.xml
diff --git a/branches/sca-equinox/samples/osgi-supplychain/build.xml b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/build.xml
index 2e103e5a15..2e103e5a15 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/build.xml
diff --git a/branches/sca-equinox/samples/osgi-supplychain/osgi-supplychain.png b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/osgi-supplychain.png
index 2bec57ac8a..2bec57ac8a 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/osgi-supplychain.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/osgi-supplychain.png
diff --git a/branches/sca-equinox/samples/osgi-supplychain/osgi-supplychain.svg b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/osgi-supplychain.svg
index 43cb427944..43cb427944 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/osgi-supplychain.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/osgi-supplychain.svg
diff --git a/branches/sca-equinox/samples/osgi-supplychain/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/pom.xml
index 27dd87a1fb..27dd87a1fb 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/pom.xml
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
index 5f40054ada..5f40054ada 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
index 64814487cb..64814487cb 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
index 225dce0236..225dce0236 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 023d716651..023d716651 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a1c7fce60a..a1c7fce60a 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 4647a716c7..4647a716c7 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index d0d29f94f8..d0d29f94f8 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index 1b7fb15bf1..1b7fb15bf1 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e97331c06c..e97331c06c 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 4206ce7dc8..4206ce7dc8 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index 0f88cca213..0f88cca213 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index f55a068ede..f55a068ede 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index 72eec76cc2..72eec76cc2 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 600f3f0c74..600f3f0c74 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index b8bca97bd0..b8bca97bd0 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Customer.componentType b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Customer.componentType
index 5c61a0961c..5c61a0961c 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Customer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Customer.componentType
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
index 87a184d968..87a184d968 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
index 872ab6601a..872ab6601a 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSShipper.componentType b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
index 57fcbbc5d1..57fcbbc5d1 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
index 75fa8029f7..75fa8029f7 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Retailer.componentType b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Retailer.componentType
index 15185f2bf9..15185f2bf9 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Retailer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Retailer.componentType
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Shipper.componentType b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Shipper.componentType
index 675597d80b..675597d80b 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Shipper.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Shipper.componentType
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Warehouse.componentType b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
index 6e1ac3e5a9..6e1ac3e5a9 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
index 88d79e5219..88d79e5219 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
index d95ef5d582..d95ef5d582 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
index de7ac7ec7a..de7ac7ec7a 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
index 21241a6899..21241a6899 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
index b5c5a862be..b5c5a862be 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
index 5b368afd5b..5b368afd5b 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
index 47897d16ca..47897d16ca 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
index cae7fdfde2..cae7fdfde2 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
index f5333c7caa..f5333c7caa 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
index d894309b71..d894309b71 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
index 6166549e5a..6166549e5a 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
index fc86a76784..fc86a76784 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/supplychain.composite b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/supplychain.composite
index 0bbfed9176..0bbfed9176 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/supplychain.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/supplychain.composite
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
index d1e11168e2..d1e11168e2 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
index ff15c0d9a2..ff15c0d9a2 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/branches/sca-equinox/samples/photo-gallery/README b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/README
index c66edea985..c66edea985 100644
--- a/branches/sca-equinox/samples/photo-gallery/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/README
diff --git a/branches/sca-equinox/samples/photo-gallery/build.xml b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/build.xml
index 652afc3570..652afc3570 100644
--- a/branches/sca-equinox/samples/photo-gallery/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/build.xml
diff --git a/branches/sca-equinox/samples/photo-gallery/photo-gallery.png b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/photo-gallery.png
index da413edeee..da413edeee 100644
--- a/branches/sca-equinox/samples/photo-gallery/photo-gallery.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/photo-gallery.png
diff --git a/branches/sca-equinox/samples/photo-gallery/photo-gallery.svg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/photo-gallery.svg
index 74f8ecd36d..74f8ecd36d 100644
--- a/branches/sca-equinox/samples/photo-gallery/photo-gallery.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/photo-gallery.svg
diff --git a/branches/sca-equinox/samples/photo-gallery/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/pom.xml
index 1f8ebbcc09..1f8ebbcc09 100644
--- a/branches/sca-equinox/samples/photo-gallery/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/pom.xml
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/java/launch/LaunchGallery.java b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
index 1007cd49b0..1007cd49b0 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
index d07dc63592..d07dc63592 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/java/services/Album.java b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/java/services/Album.java
index 5257d0e703..5257d0e703 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/java/services/Album.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/java/services/Album.java
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/java/services/AlbumImpl.java b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/java/services/AlbumImpl.java
index dd2b086e29..dd2b086e29 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/java/services/AlbumImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/java/services/AlbumImpl.java
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
index ac4e6f52f4..ac4e6f52f4 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery.html b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery.html
index f6566e88ec..f6566e88ec 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery.html
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery.html
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg
index 9437b321e2..9437b321e2 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg
index 07f37ec505..07f37ec505 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg
index 2193784271..2193784271 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg
index 1532ee2c1b..1532ee2c1b 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg
index 17ffd73aec..17ffd73aec 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg
index 19e9ec37df..19e9ec37df 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg
index 022416dbce..022416dbce 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg
index c78a974714..c78a974714 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg
index a98070925a..a98070925a 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg
index dc83889116..dc83889116 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg
index 0e33548135..0e33548135 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/index.gif b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/index.gif
index 7599ac7686..7599ac7686 100755
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/index.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/index.gif
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/index_on.gif b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/index_on.gif
index 153e9879d6..153e9879d6 100755
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/index_on.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/index_on.gif
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/next.gif b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/next.gif
index 002eaf6951..002eaf6951 100755
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/next.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/next.gif
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/next_disabled.gif b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/next_disabled.gif
index 38b1298453..38b1298453 100755
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/next_disabled.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/next_disabled.gif
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/next_on.gif b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/next_on.gif
index 4e5bb3e7ef..4e5bb3e7ef 100755
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/next_on.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/next_on.gif
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
index 23190de555..23190de555 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/photo-gallery.composite b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/photo-gallery.composite
index 0bb3c4b4db..0bb3c4b4db 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/photo-gallery.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/photo-gallery.composite
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev.gif b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev.gif
index 4eea10f1dc..4eea10f1dc 100755
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev.gif
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev_disabled.gif b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev_disabled.gif
index 7e35f07076..7e35f07076 100755
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev_disabled.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev_disabled.gif
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev_on.gif b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev_on.gif
index 3ef9a776bb..3ef9a776bb 100755
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev_on.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev_on.gif
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/show_slide.gif b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/show_slide.gif
index a5b6a15c2b..a5b6a15c2b 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/show_slide.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/show_slide.gif
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/space.gif b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/space.gif
index 170fe82b65..170fe82b65 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/space.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/space.gif
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/styles.css b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/styles.css
index d23d949858..d23d949858 100755
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/styles.css
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/styles.css
diff --git a/branches/sca-equinox/samples/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/pom.xml
index aec37555d3..aec37555d3 100644
--- a/branches/sca-equinox/samples/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/pom.xml
diff --git a/branches/sca-equinox/samples/quote-xquery/README b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/README
index cf8a4609a6..cf8a4609a6 100644
--- a/branches/sca-equinox/samples/quote-xquery/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/README
diff --git a/branches/sca-equinox/samples/quote-xquery/build.xml b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/build.xml
index a3a5acf102..a3a5acf102 100644
--- a/branches/sca-equinox/samples/quote-xquery/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/build.xml
diff --git a/branches/sca-equinox/samples/quote-xquery/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/pom.xml
index 4e007df2b8..4e007df2b8 100644
--- a/branches/sca-equinox/samples/quote-xquery/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/pom.xml
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
index 8a42136b5d..8a42136b5d 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
index 41d78683cc..41d78683cc 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
index f744a59744..f744a59744 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
index 374c0825e9..374c0825e9 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
index fbe38b8269..fbe38b8269 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
index d2d175430b..d2d175430b 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
index 06c3945a6e..06c3945a6e 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
index 1ecdf120c2..1ecdf120c2 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
index 85508eaa46..85508eaa46 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
index 26331381a8..26331381a8 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
index 8ed02dc1ef..8ed02dc1ef 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
index 425867055b..425867055b 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
index cfd201f883..cfd201f883 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
index 20fe73fd92..20fe73fd92 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
index adc852acd4..adc852acd4 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
index 3fa3cdb637..3fa3cdb637 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
index d504f40f04..d504f40f04 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
index cc50da164a..cc50da164a 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
index cf41ab528d..cf41ab528d 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
index e7f3e67068..e7f3e67068 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
index 4c437586ef..4c437586ef 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
index 4f64850056..4f64850056 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
index 96c2af138a..96c2af138a 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/resources/xqueryquotews.composite b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/xqueryquotews.composite
index 9e35e2ecb2..9e35e2ecb2 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/resources/xqueryquotews.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/xqueryquotews.composite
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
index 35306b9f89..35306b9f89 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
diff --git a/branches/sca-equinox/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
index 9555532b3e..9555532b3e 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
index 9a4be5bda6..9a4be5bda6 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/README b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/README
index bb44d63719..bb44d63719 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/README
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/build-dojo.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/build-dojo.xml
index 9d282c2dd2..9d282c2dd2 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/build-dojo.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/build-dojo.xml
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/build.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/build.xml
index ecc2596d71..ecc2596d71 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/build.xml
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/pom.xml
index 0f243282c2..0f243282c2 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/pom.xml
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/simple-bigbank-spring.png b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/simple-bigbank-spring.png
index 593c047f6a..593c047f6a 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/simple-bigbank-spring.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/simple-bigbank-spring.png
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/simple-bigbank-spring.svg b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/simple-bigbank-spring.svg
index c64f6de6b9..c64f6de6b9 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/simple-bigbank-spring.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/simple-bigbank-spring.svg
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
index 1625ff5b65..1625ff5b65 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
index 7c9082b944..7c9082b944 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
index ce41006fa6..ce41006fa6 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
index 3f81f48fb9..3f81f48fb9 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java
index 2b52909bc1..2b52909bc1 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java
index 386f7bb90d..386f7bb90d 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
index bcac678cd7..bcac678cd7 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java
index 8a012c12f9..8a012c12f9 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
index 980ec1c335..980ec1c335 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java
index 9f06a71bae..9f06a71bae 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java
index 1ee386ba90..1ee386ba90 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
index 61aea6869e..61aea6869e 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java
index 66a0ba0e63..66a0ba0e63 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
index fe3b198a7b..fe3b198a7b 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
index 82103612f7..82103612f7 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
index 2d97b57066..2d97b57066 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/BigBank.composite b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
index 46c0ec793d..46c0ec793d 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite
index 4bb2ce61ef..4bb2ce61ef 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite
index 97dff499ba..97dff499ba 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
index 899d8d7d62..899d8d7d62 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml
index b9e26bf81b..b9e26bf81b 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF
index 32fa070ffb..32fa070ffb 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml
index b30f821f7e..b30f821f7e 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/web/style.css b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/web/style.css
index 1071583264..1071583264 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/web/style.css
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/web/style.css
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
index d82e383e46..d82e383e46 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/README b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/README
index acbe93a4d3..acbe93a4d3 100644
--- a/branches/sca-equinox/samples/simple-bigbank/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/README
diff --git a/branches/sca-equinox/samples/simple-bigbank/build.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/build.xml
index a814014eae..a814014eae 100644
--- a/branches/sca-equinox/samples/simple-bigbank/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/build.xml
diff --git a/branches/sca-equinox/samples/simple-bigbank/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/pom.xml
index d9c20abbcf..d9c20abbcf 100644
--- a/branches/sca-equinox/samples/simple-bigbank/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/pom.xml
diff --git a/branches/sca-equinox/samples/simple-bigbank/simple-bigbank.png b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/simple-bigbank.png
index 593c047f6a..593c047f6a 100644
--- a/branches/sca-equinox/samples/simple-bigbank/simple-bigbank.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/simple-bigbank.png
diff --git a/branches/sca-equinox/samples/simple-bigbank/simple-bigbank.svg b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/simple-bigbank.svg
index c64f6de6b9..c64f6de6b9 100644
--- a/branches/sca-equinox/samples/simple-bigbank/simple-bigbank.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/simple-bigbank.svg
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
index 1625ff5b65..1625ff5b65 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
index 7c9082b944..7c9082b944 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
index fa85f309c0..fa85f309c0 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
index a5ae7b3955..a5ae7b3955 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
index c354de387b..c354de387b 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
index 000acb935c..000acb935c 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
index 11bdff757e..11bdff757e 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
index b791024076..b791024076 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
index 86246a3f84..86246a3f84 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
index edbf910d37..edbf910d37 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 0512d40b0b..0512d40b0b 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
index 7961279352..7961279352 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/resources/Account.composite b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/resources/Account.composite
index e71615e27e..e71615e27e 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/resources/Account.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/resources/Account.composite
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/resources/BigBank.composite b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/resources/BigBank.composite
index c870f39cab..c870f39cab 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/resources/BigBank.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/resources/BigBank.composite
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/resources/StockQuote.composite b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/resources/StockQuote.composite
index 4f29c14851..4f29c14851 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/resources/StockQuote.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/resources/StockQuote.composite
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
index ba6c1dd797..ba6c1dd797 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
diff --git a/branches/sca-equinox/samples/simple-callback-ws/README b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/README
index 6b27718f74..6b27718f74 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/README
diff --git a/branches/sca-equinox/samples/simple-callback-ws/build.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/build.xml
index 10b69bd395..10b69bd395 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/build.xml
diff --git a/branches/sca-equinox/samples/simple-callback-ws/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/pom.xml
index da24b7a45d..da24b7a45d 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/pom.xml
diff --git a/branches/sca-equinox/samples/simple-callback-ws/simple-callback-ws.png b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/simple-callback-ws.png
index 1b6353f5cf..1b6353f5cf 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/simple-callback-ws.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/simple-callback-ws.png
diff --git a/branches/sca-equinox/samples/simple-callback-ws/simple-callback-ws.svg b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/simple-callback-ws.svg
index 7d9e3de510..7d9e3de510 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/simple-callback-ws.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/simple-callback-ws.svg
diff --git a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
index 4cc00d6d0f..4cc00d6d0f 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
diff --git a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
index ad7c6d8fef..ad7c6d8fef 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
diff --git a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
index 48acc0e94f..48acc0e94f 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
diff --git a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
index 66cfb2bc8a..66cfb2bc8a 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
index 08057d2fcc..08057d2fcc 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
index eeb0e52163..eeb0e52163 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/branches/sca-equinox/samples/simple-callback-ws/src/main/resources/simplecallback.composite b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/resources/simplecallback.composite
index 53e7fe66af..53e7fe66af 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/src/main/resources/simplecallback.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/resources/simplecallback.composite
diff --git a/branches/sca-equinox/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
index 8a6465de3a..8a6465de3a 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
diff --git a/branches/sca-equinox/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
index 580a7f6b0c..580a7f6b0c 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/branches/sca-equinox/samples/simple-callback/README b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/README
index 719376f254..719376f254 100644
--- a/branches/sca-equinox/samples/simple-callback/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/README
diff --git a/branches/sca-equinox/samples/simple-callback/build.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/build.xml
index 47d1ea4bc1..47d1ea4bc1 100644
--- a/branches/sca-equinox/samples/simple-callback/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/build.xml
diff --git a/branches/sca-equinox/samples/simple-callback/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/pom.xml
index 98b9c7adbd..98b9c7adbd 100644
--- a/branches/sca-equinox/samples/simple-callback/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/pom.xml
diff --git a/branches/sca-equinox/samples/simple-callback/simple-callback.png b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/simple-callback.png
index 1b6353f5cf..1b6353f5cf 100644
--- a/branches/sca-equinox/samples/simple-callback/simple-callback.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/simple-callback.png
diff --git a/branches/sca-equinox/samples/simple-callback/simple-callback.svg b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/simple-callback.svg
index 484b65df9d..484b65df9d 100644
--- a/branches/sca-equinox/samples/simple-callback/simple-callback.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/simple-callback.svg
diff --git a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyClient.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyClient.java
index 4cc00d6d0f..4cc00d6d0f 100644
--- a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyClient.java
diff --git a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
index 3e2a1df5a5..3e2a1df5a5 100644
--- a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
diff --git a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyService.java
index e78ad6f68f..e78ad6f68f 100644
--- a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyService.java
diff --git a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
index b27eea44f5..b27eea44f5 100644
--- a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
index fc5e31d14e..fc5e31d14e 100644
--- a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
index b8987fcd07..b8987fcd07 100644
--- a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/branches/sca-equinox/samples/simple-callback/src/main/resources/simplecallback.composite b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/resources/simplecallback.composite
index 33e6f60601..33e6f60601 100644
--- a/branches/sca-equinox/samples/simple-callback/src/main/resources/simplecallback.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/resources/simplecallback.composite
diff --git a/branches/sca-equinox/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
index cbaab8af83..cbaab8af83 100644
--- a/branches/sca-equinox/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/README b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/README
index 3869ea6a12..3869ea6a12 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/README
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/build.xml b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/build.xml
index 9d69ee9ba0..9d69ee9ba0 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/build.xml
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/pom.xml
index e65fa45427..e65fa45427 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/pom.xml
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java
index ecaa4e28de..ecaa4e28de 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java
index 66a0ba0e63..66a0ba0e63 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
index 2a529dddeb..2a529dddeb 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java
index 22e9d58a94..22e9d58a94 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java
index ba3d43448e..ba3d43448e 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java
index 17691af0e8..17691af0e8 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
index 7167edc672..7167edc672 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite
index 0eea510512..0eea510512 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml
index 42e5f824f9..42e5f824f9 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
index 6f11106ddd..6f11106ddd 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
index cfd96f287a..cfd96f287a 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
index 8e7a884d41..8e7a884d41 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/README b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/README
index 17b71e7590..17b71e7590 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/README
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/build.xml b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/build.xml
index 26d71c146f..26d71c146f 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/build.xml
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/pom.xml
index 4ef6670cf9..4ef6670cf9 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/pom.xml
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
index 9737ac27eb..9737ac27eb 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java
index a8b958010a..a8b958010a 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
index a18a4920b8..a18a4920b8 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
index b6c6d3897d..b6c6d3897d 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
index ad17ab8cf5..ad17ab8cf5 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
index 7b44a28bc9..7b44a28bc9 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
index bbd5b0c325..bbd5b0c325 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
index cb26ca809d..cb26ca809d 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
index 2ebcc8470a..2ebcc8470a 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
index 24da9878a5..24da9878a5 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
index 5668fa23b9..5668fa23b9 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
index d2f9bf80a5..d2f9bf80a5 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite
index 371a1afd32..371a1afd32 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 6491a0d326..6491a0d326 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index b1bce4339d..b1bce4339d 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index d6bfe2167e..d6bfe2167e 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml
index d57d02297c..d57d02297c 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml
index 6b2338f611..6b2338f611 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml
diff --git a/branches/sca-equinox/samples/spring-bigbank-stockquote/README b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/README
index b90bafeb59..b90bafeb59 100644
--- a/branches/sca-equinox/samples/spring-bigbank-stockquote/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/README
diff --git a/branches/sca-equinox/samples/spring-bigbank-stockquote/build.xml b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/build.xml
index 1b38a40495..1b38a40495 100644
--- a/branches/sca-equinox/samples/spring-bigbank-stockquote/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/build.xml
diff --git a/branches/sca-equinox/samples/spring-bigbank-stockquote/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/pom.xml
index 72a2b8f379..72a2b8f379 100644
--- a/branches/sca-equinox/samples/spring-bigbank-stockquote/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/pom.xml
diff --git a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 81c47a78d1..81c47a78d1 100644
--- a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java
index d4b3fe9035..d4b3fe9035 100644
--- a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java
index 643f9a187c..643f9a187c 100644
--- a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java
index 1fe6b2d516..1fe6b2d516 100644
--- a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml
index 87dd006b5a..87dd006b5a 100644
--- a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml
diff --git a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite
index 06544c6883..06544c6883 100644
--- a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite
diff --git a/branches/sca-equinox/samples/store-distributed/README b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/README
index 46e71bf51e..46e71bf51e 100644
--- a/branches/sca-equinox/samples/store-distributed/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/README
diff --git a/branches/sca-equinox/samples/store-distributed/build.xml b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/build.xml
index 652afc3570..652afc3570 100644
--- a/branches/sca-equinox/samples/store-distributed/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/build.xml
diff --git a/branches/sca-equinox/samples/store-distributed/cloud.composite b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/cloud.composite
index 7bd13d5b6f..7bd13d5b6f 100644
--- a/branches/sca-equinox/samples/store-distributed/cloud.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/cloud.composite
diff --git a/branches/sca-equinox/samples/store-distributed/domain.composite b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/domain.composite
index 6898c454af..6898c454af 100644
--- a/branches/sca-equinox/samples/store-distributed/domain.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/domain.composite
diff --git a/branches/sca-equinox/samples/store-distributed/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/pom.xml
index 50ca6ba9b1..50ca6ba9b1 100644
--- a/branches/sca-equinox/samples/store-distributed/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/pom.xml
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchDomain.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchDomain.java
index dd19f6b49b..dd19f6b49b 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchDomain.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchDomain.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java
index 9016e515fb..9016e515fb 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java
index 2b387aec82..2b387aec82 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java
index fb138e484f..fb138e484f 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/services/Cart.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/Cart.java
index 9e6226d963..9e6226d963 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/services/Cart.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/Cart.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/services/Catalog.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/Catalog.java
index 2c3b19f579..2c3b19f579 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/services/Catalog.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/Catalog.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/services/CurrencyConverter.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/CurrencyConverter.java
index e104a0423a..e104a0423a 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/services/CurrencyConverter.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/CurrencyConverter.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java
index c354aed447..c354aed447 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java
index 377b3d7e59..377b3d7e59 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/services/Item.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/Item.java
index 27abd4f016..27abd4f016 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/services/Item.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/Item.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java
index 9889921a96..9889921a96 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/services/Total.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/Total.java
index 8f464e526f..8f464e526f 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/services/Total.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/Total.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeA.composite b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeA.composite
index f7bfd0fcb6..f7bfd0fcb6 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeA.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeA.composite
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeB.composite b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeB.composite
index 187c5caf1c..187c5caf1c 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeB.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeB.composite
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeC.composite b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeC.composite
index 98113a3576..98113a3576 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeC.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeC.composite
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
index f165ee0e29..f165ee0e29 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeA/store.composite b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeA/store.composite
index 2ac608d43f..2ac608d43f 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeA/store.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeA/store.composite
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 0f8e76ccd7..0f8e76ccd7 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeB/store.composite b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeB/store.composite
index 062a7aa2cd..062a7aa2cd 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeB/store.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeB/store.composite
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
index 15bab17c1a..15bab17c1a 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/store.composite b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/store.composite
index 5de310128d..5de310128d 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/store.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/store.composite
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html
index 45604463d1..45604463d1 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/uiservices/store.html b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/uiservices/store.html
index 45604463d1..45604463d1 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/uiservices/store.html
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/uiservices/store.html
diff --git a/branches/sca-equinox/samples/store-distributed/store.png b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/store.png
index da413edeee..da413edeee 100644
--- a/branches/sca-equinox/samples/store-distributed/store.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/store.png
diff --git a/branches/sca-equinox/samples/store-distributed/store.svg b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/store.svg
index 74f8ecd36d..74f8ecd36d 100644
--- a/branches/sca-equinox/samples/store-distributed/store.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/store.svg
diff --git a/branches/sca-equinox/samples/store-distributed/workspace.xml b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/workspace.xml
index d6cb2bfc81..d6cb2bfc81 100644
--- a/branches/sca-equinox/samples/store-distributed/workspace.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/workspace.xml
diff --git a/branches/sca-equinox/samples/store/README b/sca-java-2.x/branches/sca-equinox/samples/store/README
index 46e71bf51e..46e71bf51e 100644
--- a/branches/sca-equinox/samples/store/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/README
diff --git a/branches/sca-equinox/samples/store/build.xml b/sca-java-2.x/branches/sca-equinox/samples/store/build.xml
index 652afc3570..652afc3570 100644
--- a/branches/sca-equinox/samples/store/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/build.xml
diff --git a/branches/sca-equinox/samples/store/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/store/pom.xml
index f833b00147..f833b00147 100644
--- a/branches/sca-equinox/samples/store/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/pom.xml
diff --git a/branches/sca-equinox/samples/store/src/main/java/launch/Launch.java b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/launch/Launch.java
index 801697abea..801697abea 100644
--- a/branches/sca-equinox/samples/store/src/main/java/launch/Launch.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/launch/Launch.java
diff --git a/branches/sca-equinox/samples/store/src/main/java/services/Cart.java b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/Cart.java
index 9e6226d963..9e6226d963 100644
--- a/branches/sca-equinox/samples/store/src/main/java/services/Cart.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/Cart.java
diff --git a/branches/sca-equinox/samples/store/src/main/java/services/Catalog.java b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/Catalog.java
index 2c3b19f579..2c3b19f579 100644
--- a/branches/sca-equinox/samples/store/src/main/java/services/Catalog.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/Catalog.java
diff --git a/branches/sca-equinox/samples/store/src/main/java/services/CurrencyConverter.java b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/CurrencyConverter.java
index e104a0423a..e104a0423a 100644
--- a/branches/sca-equinox/samples/store/src/main/java/services/CurrencyConverter.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/CurrencyConverter.java
diff --git a/branches/sca-equinox/samples/store/src/main/java/services/CurrencyConverterImpl.java b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/CurrencyConverterImpl.java
index c354aed447..c354aed447 100644
--- a/branches/sca-equinox/samples/store/src/main/java/services/CurrencyConverterImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/CurrencyConverterImpl.java
diff --git a/branches/sca-equinox/samples/store/src/main/java/services/FruitsCatalogImpl.java b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/FruitsCatalogImpl.java
index 377b3d7e59..377b3d7e59 100644
--- a/branches/sca-equinox/samples/store/src/main/java/services/FruitsCatalogImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/FruitsCatalogImpl.java
diff --git a/branches/sca-equinox/samples/store/src/main/java/services/Item.java b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/Item.java
index 27abd4f016..27abd4f016 100644
--- a/branches/sca-equinox/samples/store/src/main/java/services/Item.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/Item.java
diff --git a/branches/sca-equinox/samples/store/src/main/java/services/ShoppingCartImpl.java b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/ShoppingCartImpl.java
index 9889921a96..9889921a96 100644
--- a/branches/sca-equinox/samples/store/src/main/java/services/ShoppingCartImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/ShoppingCartImpl.java
diff --git a/branches/sca-equinox/samples/store/src/main/java/services/Total.java b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/Total.java
index 8f464e526f..8f464e526f 100644
--- a/branches/sca-equinox/samples/store/src/main/java/services/Total.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/Total.java
diff --git a/branches/sca-equinox/samples/store/src/main/resources/store.composite b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/resources/store.composite
index 571678839d..571678839d 100644
--- a/branches/sca-equinox/samples/store/src/main/resources/store.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/resources/store.composite
diff --git a/branches/sca-equinox/samples/store/src/main/resources/uiservices/store.html b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/resources/uiservices/store.html
index 45604463d1..45604463d1 100644
--- a/branches/sca-equinox/samples/store/src/main/resources/uiservices/store.html
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/resources/uiservices/store.html
diff --git a/branches/sca-equinox/samples/store/store.png b/sca-java-2.x/branches/sca-equinox/samples/store/store.png
index da413edeee..da413edeee 100644
--- a/branches/sca-equinox/samples/store/store.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/store.png
diff --git a/branches/sca-equinox/samples/store/store.svg b/sca-java-2.x/branches/sca-equinox/samples/store/store.svg
index 74f8ecd36d..74f8ecd36d 100644
--- a/branches/sca-equinox/samples/store/store.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/store.svg
diff --git a/branches/sca-equinox/samples/supplychain/README b/sca-java-2.x/branches/sca-equinox/samples/supplychain/README
index ea4493fdd4..ea4493fdd4 100644
--- a/branches/sca-equinox/samples/supplychain/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/README
diff --git a/branches/sca-equinox/samples/supplychain/build.xml b/sca-java-2.x/branches/sca-equinox/samples/supplychain/build.xml
index 506180b8b1..506180b8b1 100644
--- a/branches/sca-equinox/samples/supplychain/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/build.xml
diff --git a/branches/sca-equinox/samples/supplychain/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/supplychain/pom.xml
index 4ce8c7ddc1..4ce8c7ddc1 100644
--- a/branches/sca-equinox/samples/supplychain/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/pom.xml
diff --git a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Customer.java b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Customer.java
index 8088001898..8088001898 100644
--- a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Customer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Customer.java
diff --git a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
index 7a1e8553ec..7a1e8553ec 100644
--- a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
diff --git a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Retailer.java b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Retailer.java
index 1add63fb4e..1add63fb4e 100644
--- a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Retailer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Retailer.java
diff --git a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
index f622052cf8..f622052cf8 100644
--- a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
diff --git a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Shipper.java b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Shipper.java
index d4d49a922b..d4d49a922b 100644
--- a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Shipper.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Shipper.java
diff --git a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
index 4ae52a12a2..4ae52a12a2 100644
--- a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
diff --git a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
index 7072f582d1..7072f582d1 100644
--- a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Warehouse.java b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Warehouse.java
index 0be499f569..0be499f569 100644
--- a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Warehouse.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Warehouse.java
diff --git a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
index b5e256a1e0..b5e256a1e0 100644
--- a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
diff --git a/branches/sca-equinox/samples/supplychain/src/main/resources/supplychain.composite b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/resources/supplychain.composite
index 301efcaf1f..301efcaf1f 100644
--- a/branches/sca-equinox/samples/supplychain/src/main/resources/supplychain.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/resources/supplychain.composite
diff --git a/branches/sca-equinox/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
index 88e0eb7ab8..88e0eb7ab8 100644
--- a/branches/sca-equinox/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/branches/sca-equinox/samples/supplychain/supplychain.png b/sca-java-2.x/branches/sca-equinox/samples/supplychain/supplychain.png
index 51a384e827..51a384e827 100644
--- a/branches/sca-equinox/samples/supplychain/supplychain.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/supplychain.png
diff --git a/branches/sca-equinox/samples/supplychain/supplychain.svg b/sca-java-2.x/branches/sca-equinox/samples/supplychain/supplychain.svg
index f72e77acab..f72e77acab 100644
--- a/branches/sca-equinox/samples/supplychain/supplychain.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/supplychain.svg
diff --git a/branches/sca-equinox/samples/web-resource/README b/sca-java-2.x/branches/sca-equinox/samples/web-resource/README
index 56bffba6a3..56bffba6a3 100644
--- a/branches/sca-equinox/samples/web-resource/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/web-resource/README
diff --git a/branches/sca-equinox/samples/web-resource/build.xml b/sca-java-2.x/branches/sca-equinox/samples/web-resource/build.xml
index 5f6b6091e7..5f6b6091e7 100644
--- a/branches/sca-equinox/samples/web-resource/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/web-resource/build.xml
diff --git a/branches/sca-equinox/samples/web-resource/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/web-resource/pom.xml
index ce78741eed..ce78741eed 100644
--- a/branches/sca-equinox/samples/web-resource/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/web-resource/pom.xml
diff --git a/branches/sca-equinox/samples/web-resource/src/main/java/web/resource/SampleServer.java b/sca-java-2.x/branches/sca-equinox/samples/web-resource/src/main/java/web/resource/SampleServer.java
index 9410de08c4..9410de08c4 100644
--- a/branches/sca-equinox/samples/web-resource/src/main/java/web/resource/SampleServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/web-resource/src/main/java/web/resource/SampleServer.java
diff --git a/branches/sca-equinox/samples/web-resource/src/main/resources/WebResource.composite b/sca-java-2.x/branches/sca-equinox/samples/web-resource/src/main/resources/WebResource.composite
index 4536136a8b..4536136a8b 100644
--- a/branches/sca-equinox/samples/web-resource/src/main/resources/WebResource.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/web-resource/src/main/resources/WebResource.composite
diff --git a/branches/sca-equinox/samples/web-resource/src/main/resources/myContent/index.html b/sca-java-2.x/branches/sca-equinox/samples/web-resource/src/main/resources/myContent/index.html
index 55de048373..55de048373 100644
--- a/branches/sca-equinox/samples/web-resource/src/main/resources/myContent/index.html
+++ b/sca-java-2.x/branches/sca-equinox/samples/web-resource/src/main/resources/myContent/index.html
diff --git a/branches/sca-equinox/samples/web-resource/web-resource.png b/sca-java-2.x/branches/sca-equinox/samples/web-resource/web-resource.png
index 7259447b65..7259447b65 100644
--- a/branches/sca-equinox/samples/web-resource/web-resource.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/web-resource/web-resource.png
diff --git a/branches/sca-equinox/samples/web-resource/web-resource.svg b/sca-java-2.x/branches/sca-equinox/samples/web-resource/web-resource.svg
index 0d1257316c..0d1257316c 100644
--- a/branches/sca-equinox/samples/web-resource/web-resource.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/web-resource/web-resource.svg
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/LICENSE b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/LICENSE
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/NOTICE b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/NOTICE
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/README b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/README
index 12f81543f0..12f81543f0 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/README
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/build.xml b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/build.xml
index 85caf5954e..85caf5954e 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/build.xml
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/pom.xml
index ff493a5da2..ff493a5da2 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/pom.xml
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCode.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCode.java
index 8c9a48bf40..8c9a48bf40 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCode.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCode.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCodeResponse.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCodeResponse.java
index 93847c8809..93847c8809 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCodeResponse.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCodeResponse.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCity.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCity.java
index cf9276d417..cf9276d417 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCity.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCity.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCityResponse.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCityResponse.java
index 9dc0e41b2b..9dc0e41b2b 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCityResponse.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCityResponse.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByState.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByState.java
index 48be94b14a..48be94b14a 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByState.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByState.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByStateResponse.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByStateResponse.java
index 1645e11ca2..1645e11ca2 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByStateResponse.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByStateResponse.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIP.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIP.java
index 45c948b4b4..45c948b4b4 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIP.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIP.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIPResponse.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIPResponse.java
index 9e78dc6d0a..9e78dc6d0a 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIPResponse.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIPResponse.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/ObjectFactory.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/ObjectFactory.java
index ced83ff09a..ced83ff09a 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/ObjectFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/ObjectFactory.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZip.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZip.java
index 22493ba9b8..22493ba9b8 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZip.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZip.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZipSoap.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZipSoap.java
index 5ac370005f..5ac370005f 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZipSoap.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZipSoap.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/package-info.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/package-info.java
index d120f34ee5..d120f34ee5 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/package-info.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/package-info.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/ArrayOfWeatherData.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/ArrayOfWeatherData.java
index 5385fb57be..5385fb57be 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/ArrayOfWeatherData.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/ArrayOfWeatherData.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceName.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceName.java
index 9eb205e75d..9eb205e75d 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceName.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceName.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceNameResponse.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceNameResponse.java
index e281509623..e281509623 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceNameResponse.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceNameResponse.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCode.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCode.java
index 08d4a70364..08d4a70364 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCode.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCode.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCodeResponse.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCodeResponse.java
index 9288f5332e..9288f5332e 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCodeResponse.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCodeResponse.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/ObjectFactory.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/ObjectFactory.java
index 0c4fdbcde1..0c4fdbcde1 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/ObjectFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/ObjectFactory.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherData.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherData.java
index a4ca6190b5..a4ca6190b5 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherData.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherData.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecast.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecast.java
index 0902ce67fe..0902ce67fe 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecast.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecast.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecastSoap.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecastSoap.java
index aa000a44d2..aa000a44d2 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecastSoap.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecastSoap.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecasts.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecasts.java
index 8ded0946d9..8ded0946d9 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecasts.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecasts.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/package-info.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/package-info.java
index 6543ed7abf..6543ed7abf 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/package-info.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/package-info.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/location/LocationClient.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/location/LocationClient.java
index 35c114093a..35c114093a 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/location/LocationClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/location/LocationClient.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java
index cf27332e60..cf27332e60 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastClient.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastClient.java
index c03cf2955f..c03cf2955f 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastClient.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java
index cf50a6cd9e..cf50a6cd9e 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.java
index c470230b7a..c470230b7a 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java
index ec0f05dd6c..ec0f05dd6c 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java
index 284e5a3aa3..284e5a3aa3 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/USLocation.composite b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/USLocation.composite
index a171fe62c9..a171fe62c9 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/USLocation.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/USLocation.composite
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/WeatherForecast.composite b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/WeatherForecast.composite
index 0e1b118e44..0e1b118e44 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/WeatherForecast.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/WeatherForecast.composite
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/ZipCode.composite b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/ZipCode.composite
index 28d674c29b..28d674c29b 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/ZipCode.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/ZipCode.composite
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/test/java/zipcode/ZipCodeClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/test/java/zipcode/ZipCodeClientTestCase.java
index 019fce26d6..019fce26d6 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/test/java/zipcode/ZipCodeClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/test/java/zipcode/ZipCodeClientTestCase.java