TUSCANY-3150 make the context a little more interesting in the example.

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

1 files changed, 33 insertions, 27 deletions

diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
index dd62cbb11a..fe5487921f 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
@@ -87,39 +87,45 @@ public class ComponentReferenceWireBuilderImpl extends BaseBuilderImpl implement
 
         // Validate that references are wired or promoted, according
         // to their multiplicity
-        for (ComponentReference componentReference : componentReferences.values()) {
-            if (!ReferenceConfigurationUtil.validateMultiplicityAndTargets(componentReference.getMultiplicity(),
-                                                                           componentReference.getTargets(),
-                                                                           componentReference.getBindings())) {
-                if (componentReference.getTargets().isEmpty()) {
-
-                    // No warning if the reference is promoted out of the current composite
-                    boolean promoted = false;
-                    for (Reference reference : composite.getReferences()) {
-                        CompositeReference compositeReference = (CompositeReference)reference;
-                        if (compositeReference.getPromotedReferences().contains(componentReference)) {
-                            promoted = true;
-                            break;
+        for (Component component: components.values()){
+            monitor.pushContext(component.getName());
+            for (ComponentReference componentReference : component.getReferences()) {
+                monitor.pushContext(componentReference.getName());
+                if (!ReferenceConfigurationUtil.validateMultiplicityAndTargets(componentReference.getMultiplicity(),
+                                                                               componentReference.getTargets(),
+                                                                               componentReference.getBindings())) {
+                    if (componentReference.getTargets().isEmpty()) {
+    
+                        // No warning if the reference is promoted out of the current composite
+                        boolean promoted = false;
+                        for (Reference reference : composite.getReferences()) {
+                            CompositeReference compositeReference = (CompositeReference)reference;
+                            if (compositeReference.getPromotedReferences().contains(componentReference)) {
+                                promoted = true;
+                                break;
+                            }
                         }
-                    }
-                    if (!promoted && !componentReference.isForCallback()) {
-                        warning(monitor,
-                                "ReferenceWithoutTargets",
-                                composite,
-                                composite.getName().toString(),
-                                componentReference.getName());
-                    }
-                } else {
+                        if (!promoted && !componentReference.isForCallback()) {
+                            warning(monitor,
+                                    "ReferenceWithoutTargets",
+                                    composite,
+                                    composite.getName().toString(),
+                                    componentReference.getName());
+                        }
+                    } else {
 // ---------------------------                    
 // TUSCANY-3132  first example of updated error handling                  
-                    Monitor.error(monitor,
-                                  this,
-                                  "assembly-validation-messages",
-                                  "TooManyReferenceTargets", 
-                                  componentReference.getName());
+                        Monitor.error(monitor,
+                                      this,
+                                      "assembly-validation-messages",
+                                      "TooManyReferenceTargets", 
+                                      componentReference.getName());
 // ---------------------------                    
+                    }
                 }
+                monitor.popContext();
             }
+            monitor.popContext();
         }
 
         // Finally clear the original reference target lists as we now have