Changes to enable consumers and producers to be connected via binding.sca

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

1 files changed, 9 insertions, 1 deletions

diff --git a/sandbox/event/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sandbox/event/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index be57b6cb9d..7a278ae806 100644
--- a/sandbox/event/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ b/sandbox/event/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
@@ -321,6 +321,8 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt
                                 } // end for
                             } // end if
                             
+                            readConsumerSources( componentConsumer, reader );
+                            
                             //handle extension attributes
                             this.readExtendedAttributes(reader, name, componentConsumer, extensionAttributeProcessor);
 
@@ -341,6 +343,8 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt
                                     compositeConsumer.getEventTypes().addEventType(tokens.nextToken());
                                 } // end for
                             } // end if
+                            
+                            //TODO deal with @source attribute
 
                             String promoted = getString(reader, PROMOTE);
                             if (promoted != null) {
@@ -388,6 +392,8 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt
                                 } // end for
                             } // end if
                             
+                            readProducerTargets( componentProducer, reader );
+                                                        
                             //handle extension attributes
                             this.readExtendedAttributes(reader, name, componentProducer, extensionAttributeProcessor);
 
@@ -395,7 +401,7 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt
                             policyProcessor.readPolicies(componentProducer, reader);
                             
                         } else {
-                            // Read a <composite><reference>
+                            // Read a <composite><producer>
                             compositeProducer = assemblyFactory.createCompositeProducer();
                             contract = componentProducer;
                             compositeProducer.setName(getString(reader, NAME));
@@ -408,6 +414,8 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt
                                 } // end for
                             } // end if
                             
+                            //TODO deal with @target attribute
+                            
                             String promoted = getString(reader, PROMOTE);
                             if (promoted != null) {
                                 String promotedComponentName;