summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/LICENSE (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/LICENSE)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/META-INF/MANIFEST.MF (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/META-INF/MANIFEST.MF)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/NOTICE (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/NOTICE)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/pom.xml (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerNonCollectionImpl.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerNonCollectionImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/Headline.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/Headline.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsService.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceImpl.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/util/AtomTestCaseUtils.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/util/AtomTestCaseUtils.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/ReceiptToms.gif (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/ReceiptToms.gif)bin14205 -> 14205 bytes
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/ReceiptValue.jpg (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/ReceiptValue.jpg)bin21373 -> 21373 bytes
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ProviderNonCollection.composite (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ProviderNonCollection.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/news/news.composite (renamed from branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/news/news.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/LICENSE (renamed from branches/sca-java-2.0-M4/modules/binding-atom/LICENSE)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/META-INF/MANIFEST.MF (renamed from branches/sca-java-2.0-M4/modules/binding-atom/META-INF/MANIFEST.MF)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory (renamed from branches/sca-java-2.0-M4/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-2.0-M4/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/NOTICE (renamed from branches/sca-java-2.0-M4/modules/binding-atom/NOTICE)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/pom.xml (renamed from branches/sca-java-2.0-M4/modules/binding-atom/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory (renamed from branches/sca-java-2.0-M4/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-2.0-M4/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java (renamed from branches/sca-java-2.0-M4/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java)0
65 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/LICENSE
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/META-INF/MANIFEST.MF
index 9d69acd1ee..9d69acd1ee 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 1b9052299c..1b9052299c 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/NOTICE
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/pom.xml
index 66d8c17485..66d8c17485 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/pom.xml
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
index 81ec1ddad3..81ec1ddad3 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
index d318e5b7e7..d318e5b7e7 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
index b457840922..b457840922 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
index c7552f932e..c7552f932e 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
index 5ba07f5e22..5ba07f5e22 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
index 6196a727ac..6196a727ac 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
index fad06a0c99..fad06a0c99 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
index 9291b8556b..9291b8556b 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
index 697a6140da..697a6140da 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 1accd4cfb4..1accd4cfb4 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java
index 19c100483c..19c100483c 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
index da3c8b7594..da3c8b7594 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java
index da7683d84a..da7683d84a 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
index 7f74ef019d..7f74ef019d 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
index 50a684beba..50a684beba 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
index 4e09eea032..4e09eea032 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
index e93c1aeea6..e93c1aeea6 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
index 07909388e1..07909388e1 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
index b707c71d2b..b707c71d2b 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
index 85c4d4f56a..85c4d4f56a 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
index 4e3b8241f8..4e3b8241f8 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
index 9e50cbbae7..9e50cbbae7 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerNonCollectionImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerNonCollectionImpl.java
index dbf6b5aed5..dbf6b5aed5 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerNonCollectionImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerNonCollectionImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java
index 8ff89030db..8ff89030db 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
index 2870002c66..2870002c66 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
index f802d3891f..f802d3891f 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
index 534c2c901f..534c2c901f 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
index b091045b8c..b091045b8c 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java
index f94df3cff8..f94df3cff8 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java
index e10d442953..e10d442953 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java
index 781a670f57..781a670f57 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java
index 98e4e0ee48..98e4e0ee48 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java
index 28ea465968..28ea465968 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java
index 022b1269fd..022b1269fd 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/Headline.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/Headline.java
index 95152af73d..95152af73d 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/Headline.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/Headline.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsService.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsService.java
index ab97f4e340..ab97f4e340 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsService.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceImpl.java
index 7e40bb797d..7e40bb797d 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java
index 5b9e0848a0..5b9e0848a0 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/util/AtomTestCaseUtils.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/util/AtomTestCaseUtils.java
index 1afad216e3..1afad216e3 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/util/AtomTestCaseUtils.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/util/AtomTestCaseUtils.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/ReceiptToms.gif b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/ReceiptToms.gif
index bfeee9b2f4..bfeee9b2f4 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/ReceiptToms.gif
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/ReceiptToms.gif
Binary files differ
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/ReceiptValue.jpg b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/ReceiptValue.jpg
index 584f39ea8d..584f39ea8d 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/ReceiptValue.jpg
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/ReceiptValue.jpg
Binary files differ
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
index fa80fc0a39..fa80fc0a39 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
index c029cef2fb..c029cef2fb 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ProviderNonCollection.composite b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ProviderNonCollection.composite
index a50a876ac4..a50a876ac4 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ProviderNonCollection.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ProviderNonCollection.composite
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
index 090336bc5d..090336bc5d 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite
index 35e25957fb..35e25957fb 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/news/news.composite b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/news/news.composite
index 49d98f83cf..49d98f83cf 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/news/news.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/news/news.composite
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/LICENSE
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/META-INF/MANIFEST.MF
index 3a3d6bd22b..3a3d6bd22b 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
index a8117db8f3..a8117db8f3 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 00a4dfe0d2..00a4dfe0d2 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/NOTICE
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/pom.xml
index b9e4087fa8..b9e4087fa8 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/pom.xml
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
index 7ac6e05bc9..7ac6e05bc9 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
index 6e5623e1a2..6e5623e1a2 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
index ea06625d34..ea06625d34 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
index 91cd89e98d..91cd89e98d 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
index 9fc6a6bc22..9fc6a6bc22 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 47798f1607..47798f1607 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-2.0-M4/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
index 6b8ff10d1a..6b8ff10d1a 100644
--- a/branches/sca-java-2.0-M4/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java