4 files changed, 23 insertions, 9 deletions
diff --git a/java/sca/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite b/java/sca/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
index 1297fb109b..c029cef2fb 100644
--- a/java/sca/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
+++ b/java/sca/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
@@ -22,12 +22,15 @@
 	   targetNamespace = "http://customer"
 	   name="Provider">
 
-	<service name="customer" promote="CustomerCollection">
+	<!-- service name="customer" promote="CustomerCollection">
 		<tuscany:binding.atom uri = "http://localhost:8084/customer"/>
-	</service>
+	</service-->
 	
     <component name="CustomerCollection">
         <implementation.java class="org.apache.tuscany.sca.binding.atom.CustomerCollectionImpl"/>
+        <service name="Collection">
+            <tuscany:binding.atom uri = "http://localhost:8084/customer"/>
+        </service>
     </component>
 
 </composite>
diff --git a/java/sca/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ProviderNonCollection.composite b/java/sca/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ProviderNonCollection.composite
index f8594ad6b1..9b65cd9d5b 100644
--- a/java/sca/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ProviderNonCollection.composite
+++ b/java/sca/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ProviderNonCollection.composite
@@ -22,13 +22,18 @@
 	   targetNamespace = "http://customer"
 	   name="ProviderNonCollection">
 
-    <service name="customer" promote="CustomerCollection">
+    <!-- service name="customer" promote="CustomerCollection">
         <tuscany:binding.atom uri = "http://localhost:8084/customer"
             title="Atom binding Non Collection" description="Feed used for unit testing"/>
-    </service>
+    </service-->
 	
     <component name="CustomerCollection">
         <implementation.java class="org.apache.tuscany.sca.binding.atom.CustomerNonCollectionImpl"/>
+        <service name="CustomerNonCollectionImpl">
+            <tuscany:binding.atom uri = "http://localhost:8084/customer" 
+                title="Atom binding Non Collection" description="Feed used for unit testing"/>
+        </service>
+        
     </component>
 
 </composite>
diff --git a/java/sca/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite b/java/sca/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
index 59466a419e..090336bc5d 100644
--- a/java/sca/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
+++ b/java/sca/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
@@ -22,12 +22,15 @@
 	   targetNamespace = "http://receipt"
 	   name="ReceiptProvider">
 
-	<service name="receipt" promote="MediaCollection">
+	<!-- service name="receipt" promote="MediaCollection">
 		<tuscany:binding.atom uri = "http://localhost:8084/receipt"/>
-	</service>
+	</service-->
 	
     <component name="MediaCollection">
         <implementation.java class="org.apache.tuscany.sca.binding.atom.MediaCollectionImpl"/>
+        <service name="MediaCollection">
+            <tuscany:binding.atom uri = "http://localhost:8084/receipt"/>
+        </service>
     </component>
 
 </composite>
diff --git a/java/sca/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite b/java/sca/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite
index fcaafd9c34..d6722a80dd 100644
--- a/java/sca/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite
+++ b/java/sca/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite
@@ -22,12 +22,15 @@
 	targetNamespace="http://aggregator"
     name="FeedAggregator">
 
-	<service name="atomSample" promote="AtomAggregator">
+	<!-- service name="atomSample" promote="AtomAggregator">
 		<tuscany:binding.atom  uri="http://localhost:8085/atomAggregator"/>
-	</service>	
+	</service-->	
     
     <component name="AtomAggregator">
-        <implementation.java class="org.apache.tuscany.sca.binding.atom.aggregator.AggregatorImpl"/>        
+        <implementation.java class="org.apache.tuscany.sca.binding.atom.aggregator.AggregatorImpl"/>
+        <service name="Aggregator">
+            <tuscany:binding.atom  uri="http://localhost:8085/atomAggregator"/>
+        </service>      
         <reference name="sort" target="Sort"/>          
 		<reference name="atomFeed1">
    	 		<tuscany:binding.atom uri="http://www.ibm.com/developerworks/blogs/rss/lresende?flavor=atomdw"/>