Move the current trunk unreleased folder to contrib as i don't think anything in there is being actively worked on. If this not the case and something is then no problem to move it back

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

151 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/LICENSE b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/LICENSE
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/LICENSE
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/META-INF/MANIFEST.MF
index c78875e887..c78875e887 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/NOTICE b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/NOTICE
index d69e595698..d69e595698 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/NOTICE
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/NOTICE
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/pom.xml b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/pom.xml
index a6bb39de01..a6bb39de01 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/pom.xml
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/pom.xml
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
index 581ae59ae6..581ae59ae6 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
index a2b83465da..a2b83465da 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
index 0912878938..0912878938 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
index e3a177198c..e3a177198c 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
index 44c84ce5bb..44c84ce5bb 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
index e1bafdd3cd..e1bafdd3cd 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
index d234a0c92c..d234a0c92c 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
index 25ab939341..25ab939341 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index e60dc2855a..e60dc2855a 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
index 1ae4515e70..1ae4515e70 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
index af87155f45..af87155f45 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
index a80f721136..a80f721136 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
index 4b5bf373e7..4b5bf373e7 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
index 6dc23ac503..6dc23ac503 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/RSSGetTestCase.java b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/RSSGetTestCase.java
index 5a786f3bd0..5a786f3bd0 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/RSSGetTestCase.java
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/RSSGetTestCase.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/test/resources/org/apache/tuscany/sca/binding/rss/Consumer.composite b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/test/resources/org/apache/tuscany/sca/binding/rss/Consumer.composite
index 22141805cd..22141805cd 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/test/resources/org/apache/tuscany/sca/binding/rss/Consumer.composite
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/test/resources/org/apache/tuscany/sca/binding/rss/Consumer.composite
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/test/resources/org/apache/tuscany/sca/binding/rss/Provider.composite b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/test/resources/org/apache/tuscany/sca/binding/rss/Provider.composite
index 181267fa1d..181267fa1d 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss-runtime/src/test/resources/org/apache/tuscany/sca/binding/rss/Provider.composite
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss-runtime/src/test/resources/org/apache/tuscany/sca/binding/rss/Provider.composite
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss/LICENSE b/sca-java-2.x/contrib/unreleased/modules/binding-rss/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss/LICENSE
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss/LICENSE
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/unreleased/modules/binding-rss/META-INF/MANIFEST.MF
index a0886018d3..a0886018d3 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss/NOTICE b/sca-java-2.x/contrib/unreleased/modules/binding-rss/NOTICE
index d69e595698..d69e595698 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss/NOTICE
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss/NOTICE
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss/pom.xml b/sca-java-2.x/contrib/unreleased/modules/binding-rss/pom.xml
index a52b183471..a52b183471 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss/pom.xml
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss/pom.xml
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java b/sca-java-2.x/contrib/unreleased/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
index bda3210e73..bda3210e73 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java b/sca-java-2.x/contrib/unreleased/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
index 3e691e636e..3e691e636e 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java b/sca-java-2.x/contrib/unreleased/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
index a4e6a8283d..a4e6a8283d 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java b/sca-java-2.x/contrib/unreleased/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
index 00abffafb5..00abffafb5 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory b/sca-java-2.x/contrib/unreleased/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
index 73c47a3f41..73c47a3f41 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/unreleased/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index d298c16673..d298c16673 100644
--- a/sca-java-2.x/trunk/unreleased/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/unreleased/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/META-INF/MANIFEST.MF
index d6aa1a741f..d6aa1a741f 100644
--- a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/pom.xml b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/pom.xml
index 90b5ba1c68..90b5ba1c68 100644
--- a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/pom.xml
+++ b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/pom.xml
diff --git a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/src/main/java/org/apache/tuscany/sca/databinding/protobuf/InputStream2Protobuf.java b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/src/main/java/org/apache/tuscany/sca/databinding/protobuf/InputStream2Protobuf.java
index 7953e4e5b3..7953e4e5b3 100644
--- a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/src/main/java/org/apache/tuscany/sca/databinding/protobuf/InputStream2Protobuf.java
+++ b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/src/main/java/org/apache/tuscany/sca/databinding/protobuf/InputStream2Protobuf.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/src/main/java/org/apache/tuscany/sca/databinding/protobuf/Protobuf2OutputStream.java b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/src/main/java/org/apache/tuscany/sca/databinding/protobuf/Protobuf2OutputStream.java
index 6892287f67..6892287f67 100644
--- a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/src/main/java/org/apache/tuscany/sca/databinding/protobuf/Protobuf2OutputStream.java
+++ b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/src/main/java/org/apache/tuscany/sca/databinding/protobuf/Protobuf2OutputStream.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/src/main/java/org/apache/tuscany/sca/databinding/protobuf/ProtobufDatabinding.java b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/src/main/java/org/apache/tuscany/sca/databinding/protobuf/ProtobufDatabinding.java
index ad148c7499..ad148c7499 100644
--- a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/src/main/java/org/apache/tuscany/sca/databinding/protobuf/ProtobufDatabinding.java
+++ b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/src/main/java/org/apache/tuscany/sca/databinding/protobuf/ProtobufDatabinding.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 35f7932ff9..35f7932ff9 100644
--- a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 0f60373c30..0f60373c30 100644
--- a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
index cc1989eb7b..cc1989eb7b 100644
--- a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/src/test/java/com/example/tutorial/AddressBookProtos.java b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/src/test/java/com/example/tutorial/AddressBookProtos.java
index 8219fe1099..8219fe1099 100644
--- a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/src/test/java/com/example/tutorial/AddressBookProtos.java
+++ b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/src/test/java/com/example/tutorial/AddressBookProtos.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/src/test/java/org/apache/tuscany/sca/databinding/protobuf/ProtobufTransformationTestCase.java b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/src/test/java/org/apache/tuscany/sca/databinding/protobuf/ProtobufTransformationTestCase.java
index 9fc6f30794..9fc6f30794 100644
--- a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/src/test/java/org/apache/tuscany/sca/databinding/protobuf/ProtobufTransformationTestCase.java
+++ b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/src/test/java/org/apache/tuscany/sca/databinding/protobuf/ProtobufTransformationTestCase.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/src/test/resources/addressbook.proto b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/src/test/resources/addressbook.proto
index 395320fb22..395320fb22 100644
--- a/sca-java-2.x/trunk/unreleased/modules/databinding-protobuf/src/test/resources/addressbook.proto
+++ b/sca-java-2.x/contrib/unreleased/modules/databinding-protobuf/src/test/resources/addressbook.proto
diff --git a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/LICENSE b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/LICENSE
+++ b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/LICENSE
diff --git a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/META-INF/MANIFEST.MF
index cab6b5057e..cab6b5057e 100644
--- a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/NOTICE b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/NOTICE
+++ b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/NOTICE
diff --git a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/pom.xml b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/pom.xml
index 6f49551591..6f49551591 100644
--- a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/pom.xml
+++ b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/pom.xml
diff --git a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
index a0b384d554..a0b384d554 100644
--- a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
+++ b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
index 5d9b65503a..5d9b65503a 100644
--- a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
+++ b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
index d1a2e5d283..d1a2e5d283 100644
--- a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
+++ b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
index 00350bbf6b..00350bbf6b 100644
--- a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
+++ b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
diff --git a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
index 7e2f4e1614..7e2f4e1614 100644
--- a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
+++ b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/src/test/resources/content/test.html b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/src/test/resources/content/test.html
+++ b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/src/test/resources/content/test.html
diff --git a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/src/test/resources/tuscany.keyStore b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/src/test/resources/tuscany.keyStore
index 7ea23f7ff4..7ea23f7ff4 100644
--- a/sca-java-2.x/trunk/unreleased/modules/host-tomcat/src/test/resources/tuscany.keyStore
+++ b/sca-java-2.x/contrib/unreleased/modules/host-tomcat/src/test/resources/tuscany.keyStore
diff --git a/sca-java-2.x/trunk/unreleased/modules/pom.xml b/sca-java-2.x/contrib/unreleased/modules/pom.xml
index af4cedc8dc..af4cedc8dc 100644
--- a/sca-java-2.x/trunk/unreleased/modules/pom.xml
+++ b/sca-java-2.x/contrib/unreleased/modules/pom.xml
diff --git a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-add/pom.xml b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-add/pom.xml
index a81b2497e4..a81b2497e4 100644
--- a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-add/pom.xml
+++ b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-add/pom.xml
diff --git a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-add/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-add/src/main/java/calculator/AddService.java
index c7e6383559..c7e6383559 100644
--- a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-add/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-add/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-add/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-add/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-add/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-add/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-add/src/main/resources/Add.composite b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-add/src/main/resources/Add.composite
index a452c24141..a452c24141 100644
--- a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-add/src/main/resources/Add.composite
+++ b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-add/src/main/resources/Add.composite
diff --git a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-add/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-add/src/main/resources/META-INF/sca-contribution.xml
index 37e304ac4d..37e304ac4d 100644
--- a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-add/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-add/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-add/src/test/java/calculator/AddTestCase.java b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-add/src/test/java/calculator/AddTestCase.java
index b7baf9b64b..b7baf9b64b 100644
--- a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-add/src/test/java/calculator/AddTestCase.java
+++ b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-add/src/test/java/calculator/AddTestCase.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/pom.xml b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-calculator/pom.xml
index daa747bcf2..daa747bcf2 100644
--- a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/pom.xml
+++ b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-calculator/pom.xml
diff --git a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/AddService.java
index c7e6383559..c7e6383559 100644
--- a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/CalculatorService.java
index 0bac3da45c..0bac3da45c 100644
--- a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 389ecb5f82..389ecb5f82 100644
--- a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/resources/Calculator.composite
index 32b748d5ab..32b748d5ab 100644
--- a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/test/java/calculator/AddServiceImpl.java b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/test/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/test/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
index 6cccf83fbb..6cccf83fbb 100644
--- a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/pom.xml b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/pom.xml
index 3cb2db8c64..3cb2db8c64 100644
--- a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/pom.xml
+++ b/sca-java-2.x/contrib/unreleased/samples/domain/distributed-calculator/pom.xml
diff --git a/sca-java-2.x/trunk/unreleased/samples/domain/pom.xml b/sca-java-2.x/contrib/unreleased/samples/domain/pom.xml
index 1e50881ff2..1e50881ff2 100644
--- a/sca-java-2.x/trunk/unreleased/samples/domain/pom.xml
+++ b/sca-java-2.x/contrib/unreleased/samples/domain/pom.xml
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/pom.xml b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/pom.xml
index cf996d32a8..cf996d32a8 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/pom.xml
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/pom.xml
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/api/Java.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/api/Java.java
index 6c9240005f..6c9240005f 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/api/Java.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/api/Java.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/api/WSDL.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/api/WSDL.java
index 655770ec32..655770ec32 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/api/WSDL.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/api/WSDL.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/api/WSDLReference.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/api/WSDLReference.java
index 185383d3b3..185383d3b3 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/api/WSDLReference.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/api/WSDLReference.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/EmbedUtil.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/EmbedUtil.java
index 0ccbcc9e36..0ccbcc9e36 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/EmbedUtil.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/EmbedUtil.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/ImplUtil.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/ImplUtil.java
index abd4cd7ab0..abd4cd7ab0 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/ImplUtil.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/ImplUtil.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleImplementation.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleImplementation.java
index 41ce71a732..41ce71a732 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleImplementation.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleImplementation.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleImplementationProcessor.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleImplementationProcessor.java
index 6017030d35..6017030d35 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleImplementationProcessor.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleImplementationProcessor.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleJavaInvoker.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleJavaInvoker.java
index 244251c4c9..244251c4c9 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleJavaInvoker.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleJavaInvoker.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleProvider.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleProvider.java
index 5d946b037b..5d946b037b 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleProvider.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleProvider.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleProviderFactory.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleProviderFactory.java
index 4ad24d33ff..4ad24d33ff 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleProviderFactory.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleProviderFactory.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleWSDLInvoker.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleWSDLInvoker.java
index 6c5317274f..6c5317274f 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleWSDLInvoker.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleWSDLInvoker.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleWSDLProxy.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleWSDLProxy.java
index 0d000ae071..0d000ae071 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleWSDLProxy.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sample/impl/SampleWSDLProxy.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/ImplUtil.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/ImplUtil.java
index c30c784d64..c30c784d64 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/ImplUtil.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/ImplUtil.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleAsyncImplementation.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleAsyncImplementation.java
index e0abd72b84..e0abd72b84 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleAsyncImplementation.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleAsyncImplementation.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleAsyncImplementationProcessor.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleAsyncImplementationProcessor.java
index 03fe3da178..03fe3da178 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleAsyncImplementationProcessor.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleAsyncImplementationProcessor.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleAsyncProvider.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleAsyncProvider.java
index 10eb78f6c8..10eb78f6c8 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleAsyncProvider.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleAsyncProvider.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleAsyncProviderFactory.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleAsyncProviderFactory.java
index 2170313eec..2170313eec 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleAsyncProviderFactory.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleAsyncProviderFactory.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleAsyncResponseInvoker.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleAsyncResponseInvoker.java
index 2a7ad3f5bc..2a7ad3f5bc 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleAsyncResponseInvoker.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleAsyncResponseInvoker.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleJavaInvoker.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleJavaInvoker.java
index 063fe166eb..063fe166eb 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleJavaInvoker.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleJavaInvoker.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleWSDLInvoker.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleWSDLInvoker.java
index 26412ab281..26412ab281 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleWSDLInvoker.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleWSDLInvoker.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleWSDLProxy.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleWSDLProxy.java
index a02132ac9e..a02132ac9e 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleWSDLProxy.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/java/sampleasync/impl/SampleWSDLProxy.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 00d0306d92..00d0306d92 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 42e61c9d89..42e61c9d89 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 4eeecb7ba2..4eeecb7ba2 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/resources/sample/impl/sample.xsd b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/resources/sample/impl/sample.xsd
index c057aef1c1..c057aef1c1 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/resources/sample/impl/sample.xsd
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/resources/sample/impl/sample.xsd
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/resources/sampleasync/impl/definitions.xml b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/resources/sampleasync/impl/definitions.xml
index 96a1a6f574..96a1a6f574 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/resources/sampleasync/impl/definitions.xml
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/resources/sampleasync/impl/definitions.xml
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/resources/sampleasync/impl/sampleasync.xsd b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/resources/sampleasync/impl/sampleasync.xsd
index ff70fd6020..ff70fd6020 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/main/resources/sampleasync/impl/sampleasync.xsd
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/main/resources/sampleasync/impl/sampleasync.xsd
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/Client.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/Client.java
index 1b7e11c786..1b7e11c786 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/Client.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/Client.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/ClientTest.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/ClientTest.java
index 92291c98a1..92291c98a1 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/ClientTest.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/ClientTest.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/Hello.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/Hello.java
index 247fc8aa78..247fc8aa78 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/Hello.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/Hello.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/JelloTest.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/JelloTest.java
index 5c999a6c80..5c999a6c80 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/JelloTest.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/JelloTest.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/Upper.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/Upper.java
index 9c772b3487..9c772b3487 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/Upper.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/Upper.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/UpperTest.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/UpperTest.java
index 5399e4410d..5399e4410d 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/UpperTest.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/UpperTest.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/WelloTest.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/WelloTest.java
index 1bb9fc11ce..1bb9fc11ce 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/WelloTest.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/WelloTest.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/Xutil.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/Xutil.java
index 264ce7fc85..264ce7fc85 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/Xutil.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/Xutil.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/impl/EmbedTestCase.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/impl/EmbedTestCase.java
index 292aa9c8f7..292aa9c8f7 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/impl/EmbedTestCase.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/impl/EmbedTestCase.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/impl/ReadWriteTestCase.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/impl/ReadWriteTestCase.java
index 115ceff069..115ceff069 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/impl/ReadWriteTestCase.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/impl/ReadWriteTestCase.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/impl/RunTestCase.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/impl/RunTestCase.java
index 38cc558c14..38cc558c14 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/impl/RunTestCase.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/impl/RunTestCase.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/impl/RunWSTestCase.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/impl/RunWSTestCase.java
index 9eef998655..9eef998655 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/impl/RunWSTestCase.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/impl/RunWSTestCase.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/impl/TestUtil.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/impl/TestUtil.java
index 6dcfb33912..6dcfb33912 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sample/impl/TestUtil.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sample/impl/TestUtil.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/Upper.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/Upper.java
index 0c29cea1dc..0c29cea1dc 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/Upper.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/Upper.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/UpperAsyncReference.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/UpperAsyncReference.java
index ad2e62f85d..ad2e62f85d 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/UpperAsyncReference.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/UpperAsyncReference.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/UpperAsyncService.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/UpperAsyncService.java
index cb4a1c0b42..cb4a1c0b42 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/UpperAsyncService.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/UpperAsyncService.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/SampleGenericAsyncTestCase.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/SampleGenericAsyncTestCase.java
index 36fdb76424..36fdb76424 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/SampleGenericAsyncTestCase.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/SampleGenericAsyncTestCase.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/SampleNativeAsyncTestCase.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/SampleNativeAsyncTestCase.java
index bc35a637d1..bc35a637d1 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/SampleNativeAsyncTestCase.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/SampleNativeAsyncTestCase.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/UpperJavaAsyncReferenceImpl.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/UpperJavaAsyncReferenceImpl.java
index 9cf7ff9883..9cf7ff9883 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/UpperJavaAsyncReferenceImpl.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/UpperJavaAsyncReferenceImpl.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/UpperJavaAsyncServiceImpl.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/UpperJavaAsyncServiceImpl.java
index fb9ad065ad..fb9ad065ad 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/UpperJavaAsyncServiceImpl.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/UpperJavaAsyncServiceImpl.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/UpperSampleAsyncReferenceImpl.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/UpperSampleAsyncReferenceImpl.java
index 101c6a4399..101c6a4399 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/UpperSampleAsyncReferenceImpl.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/UpperSampleAsyncReferenceImpl.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/UpperSampleAsyncServiceImpl.java b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/UpperSampleAsyncServiceImpl.java
index 41a85e44a0..41a85e44a0 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/UpperSampleAsyncServiceImpl.java
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/java/sampleasync/impl/UpperSampleAsyncServiceImpl.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/resources/Hello.wsdl b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/resources/Hello.wsdl
index 360cea5ff3..360cea5ff3 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/resources/Hello.wsdl
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/resources/Hello.wsdl
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/resources/Upper.wsdl b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/resources/Upper.wsdl
index dc236073ca..dc236073ca 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/resources/Upper.wsdl
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/resources/Upper.wsdl
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/resources/test.composite.off b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/resources/test.composite.off
index 1f5b98c00b..1f5b98c00b 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/resources/test.composite.off
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/resources/test.composite.off
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/resources/testgenericasync.composite b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/resources/testgenericasync.composite
index c289a1ab32..c289a1ab32 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/resources/testgenericasync.composite
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/resources/testgenericasync.composite
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/resources/testnativeasync.composite b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/resources/testnativeasync.composite
index f9c077e272..f9c077e272 100644
--- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/src/test/resources/testnativeasync.composite
+++ b/sca-java-2.x/contrib/unreleased/samples/implementation-sample-async/src/test/resources/testnativeasync.composite
diff --git a/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/pom.xml b/sca-java-2.x/contrib/unreleased/samples/jsonp-webapp/pom.xml
index fb4bd349fb..fb4bd349fb 100644
--- a/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/pom.xml
+++ b/sca-java-2.x/contrib/unreleased/samples/jsonp-webapp/pom.xml
diff --git a/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/src/main/java/sample/Location.java b/sca-java-2.x/contrib/unreleased/samples/jsonp-webapp/src/main/java/sample/Location.java
index 1a47edf73c..1a47edf73c 100644
--- a/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/src/main/java/sample/Location.java
+++ b/sca-java-2.x/contrib/unreleased/samples/jsonp-webapp/src/main/java/sample/Location.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/src/main/java/sample/ShareService.java b/sca-java-2.x/contrib/unreleased/samples/jsonp-webapp/src/main/java/sample/ShareService.java
index 3c79c6c2e9..3c79c6c2e9 100644
--- a/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/src/main/java/sample/ShareService.java
+++ b/sca-java-2.x/contrib/unreleased/samples/jsonp-webapp/src/main/java/sample/ShareService.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/src/main/java/sample/ShareServiceImpl.java b/sca-java-2.x/contrib/unreleased/samples/jsonp-webapp/src/main/java/sample/ShareServiceImpl.java
index 13bae36eb9..13bae36eb9 100644
--- a/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/src/main/java/sample/ShareServiceImpl.java
+++ b/sca-java-2.x/contrib/unreleased/samples/jsonp-webapp/src/main/java/sample/ShareServiceImpl.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/src/main/webapp/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/unreleased/samples/jsonp-webapp/src/main/webapp/META-INF/MANIFEST.MF
index 58630c02ef..58630c02ef 100644
--- a/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/src/main/webapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/unreleased/samples/jsonp-webapp/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/contrib/unreleased/samples/jsonp-webapp/src/main/webapp/WEB-INF/web.composite
index 515c2dba09..515c2dba09 100644
--- a/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/contrib/unreleased/samples/jsonp-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/unreleased/samples/jsonp-webapp/src/main/webapp/WEB-INF/web.xml
index 0deec29fcc..0deec29fcc 100644
--- a/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/unreleased/samples/jsonp-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/src/main/webapp/index.html b/sca-java-2.x/contrib/unreleased/samples/jsonp-webapp/src/main/webapp/index.html
index 2a754e494e..2a754e494e 100644
--- a/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/src/main/webapp/index.html
+++ b/sca-java-2.x/contrib/unreleased/samples/jsonp-webapp/src/main/webapp/index.html
diff --git a/sca-java-2.x/trunk/unreleased/samples/launcher-embedded-jse-spec/README b/sca-java-2.x/contrib/unreleased/samples/launcher-embedded-jse-spec/README
index 7108333efa..7108333efa 100644
--- a/sca-java-2.x/trunk/unreleased/samples/launcher-embedded-jse-spec/README
+++ b/sca-java-2.x/contrib/unreleased/samples/launcher-embedded-jse-spec/README
diff --git a/sca-java-2.x/trunk/unreleased/samples/launcher-embedded-jse-spec/build.xml b/sca-java-2.x/contrib/unreleased/samples/launcher-embedded-jse-spec/build.xml
index 64bad00b76..64bad00b76 100644
--- a/sca-java-2.x/trunk/unreleased/samples/launcher-embedded-jse-spec/build.xml
+++ b/sca-java-2.x/contrib/unreleased/samples/launcher-embedded-jse-spec/build.xml
diff --git a/sca-java-2.x/trunk/unreleased/samples/launcher-embedded-jse-spec/pom.xml b/sca-java-2.x/contrib/unreleased/samples/launcher-embedded-jse-spec/pom.xml
index fc003d991c..fc003d991c 100644
--- a/sca-java-2.x/trunk/unreleased/samples/launcher-embedded-jse-spec/pom.xml
+++ b/sca-java-2.x/contrib/unreleased/samples/launcher-embedded-jse-spec/pom.xml
diff --git a/sca-java-2.x/trunk/unreleased/samples/launcher-embedded-jse-spec/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/unreleased/samples/launcher-embedded-jse-spec/src/main/java/calculator/CalculatorService.java
index 12d80ffd1c..12d80ffd1c 100644
--- a/sca-java-2.x/trunk/unreleased/samples/launcher-embedded-jse-spec/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/unreleased/samples/launcher-embedded-jse-spec/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/launcher-embedded-jse-spec/src/main/java/launcher/JSELauncherBindingWSCalculator.java b/sca-java-2.x/contrib/unreleased/samples/launcher-embedded-jse-spec/src/main/java/launcher/JSELauncherBindingWSCalculator.java
index 2f48e273bd..2f48e273bd 100644
--- a/sca-java-2.x/trunk/unreleased/samples/launcher-embedded-jse-spec/src/main/java/launcher/JSELauncherBindingWSCalculator.java
+++ b/sca-java-2.x/contrib/unreleased/samples/launcher-embedded-jse-spec/src/main/java/launcher/JSELauncherBindingWSCalculator.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/launcher-embedded-jse-spec/src/main/java/launcher/SampleLauncherException.java b/sca-java-2.x/contrib/unreleased/samples/launcher-embedded-jse-spec/src/main/java/launcher/SampleLauncherException.java
index f2ed3d421d..f2ed3d421d 100644
--- a/sca-java-2.x/trunk/unreleased/samples/launcher-embedded-jse-spec/src/main/java/launcher/SampleLauncherException.java
+++ b/sca-java-2.x/contrib/unreleased/samples/launcher-embedded-jse-spec/src/main/java/launcher/SampleLauncherException.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/launcher-embedded-jse-spec/src/test/java/launcher/LauncherTestCase.java b/sca-java-2.x/contrib/unreleased/samples/launcher-embedded-jse-spec/src/test/java/launcher/LauncherTestCase.java
index 04521d326b..04521d326b 100644
--- a/sca-java-2.x/trunk/unreleased/samples/launcher-embedded-jse-spec/src/test/java/launcher/LauncherTestCase.java
+++ b/sca-java-2.x/contrib/unreleased/samples/launcher-embedded-jse-spec/src/test/java/launcher/LauncherTestCase.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/pom.xml b/sca-java-2.x/contrib/unreleased/samples/pom.xml
index 1459d66152..1459d66152 100644
--- a/sca-java-2.x/trunk/unreleased/samples/pom.xml
+++ b/sca-java-2.x/contrib/unreleased/samples/pom.xml
diff --git a/sca-java-2.x/trunk/unreleased/samples/reporting/README b/sca-java-2.x/contrib/unreleased/samples/reporting/README
index b33446cde8..b33446cde8 100644
--- a/sca-java-2.x/trunk/unreleased/samples/reporting/README
+++ b/sca-java-2.x/contrib/unreleased/samples/reporting/README
diff --git a/sca-java-2.x/trunk/unreleased/samples/reporting/pom.xml b/sca-java-2.x/contrib/unreleased/samples/reporting/pom.xml
index 1c82f4be5a..1c82f4be5a 100644
--- a/sca-java-2.x/trunk/unreleased/samples/reporting/pom.xml
+++ b/sca-java-2.x/contrib/unreleased/samples/reporting/pom.xml
diff --git a/sca-java-2.x/trunk/unreleased/samples/reporting/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/unreleased/samples/reporting/src/main/java/calculator/CalculatorService.java
index 12d80ffd1c..12d80ffd1c 100644
--- a/sca-java-2.x/trunk/unreleased/samples/reporting/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/unreleased/samples/reporting/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/reporting/src/main/java/reporting/JSELauncheCalculator.java b/sca-java-2.x/contrib/unreleased/samples/reporting/src/main/java/reporting/JSELauncheCalculator.java
index 25729ea1ea..25729ea1ea 100644
--- a/sca-java-2.x/trunk/unreleased/samples/reporting/src/main/java/reporting/JSELauncheCalculator.java
+++ b/sca-java-2.x/contrib/unreleased/samples/reporting/src/main/java/reporting/JSELauncheCalculator.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/reporting/src/main/java/reporting/JSELauncherAdd.java b/sca-java-2.x/contrib/unreleased/samples/reporting/src/main/java/reporting/JSELauncherAdd.java
index 5351ed263b..5351ed263b 100644
--- a/sca-java-2.x/trunk/unreleased/samples/reporting/src/main/java/reporting/JSELauncherAdd.java
+++ b/sca-java-2.x/contrib/unreleased/samples/reporting/src/main/java/reporting/JSELauncherAdd.java
diff --git a/sca-java-2.x/trunk/unreleased/samples/reporting/src/main/resources/node-add.xml b/sca-java-2.x/contrib/unreleased/samples/reporting/src/main/resources/node-add.xml
index 7a4a6d5695..7a4a6d5695 100644
--- a/sca-java-2.x/trunk/unreleased/samples/reporting/src/main/resources/node-add.xml
+++ b/sca-java-2.x/contrib/unreleased/samples/reporting/src/main/resources/node-add.xml
diff --git a/sca-java-2.x/trunk/unreleased/samples/reporting/src/main/resources/node-calculator.xml b/sca-java-2.x/contrib/unreleased/samples/reporting/src/main/resources/node-calculator.xml
index 31098b129d..31098b129d 100644
--- a/sca-java-2.x/trunk/unreleased/samples/reporting/src/main/resources/node-calculator.xml
+++ b/sca-java-2.x/contrib/unreleased/samples/reporting/src/main/resources/node-calculator.xml
diff --git a/sca-java-2.x/trunk/unreleased/samples/reporting/src/test/java/reporting/JSELauncherReportingTestCase.java b/sca-java-2.x/contrib/unreleased/samples/reporting/src/test/java/reporting/JSELauncherReportingTestCase.java
index b4cc8fa3ee..b4cc8fa3ee 100644
--- a/sca-java-2.x/trunk/unreleased/samples/reporting/src/test/java/reporting/JSELauncherReportingTestCase.java
+++ b/sca-java-2.x/contrib/unreleased/samples/reporting/src/test/java/reporting/JSELauncherReportingTestCase.java