You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2009/08/18 14:53:42 UTC
svn commit: r805399 -
/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
Author: slaws
Date: Tue Aug 18 12:53:42 2009
New Revision: 805399
URL: http://svn.apache.org/viewvc?rev=805399&view=rev
Log:
Change promoted reference not found warning to an error (ASM_6006). Also push some monitor context.
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java?rev=805399&r1=805398&r2=805399&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java Tue Aug 18 12:53:42 2009
@@ -69,24 +69,31 @@
* @param problems
*/
protected void connectCompositeReferencesAndServices(Composite composite, Monitor monitor) {
- // Wire nested composites recursively
- for (Component component : composite.getComponents()) {
- Implementation implementation = component.getImplementation();
- if (implementation instanceof Composite) {
- connectCompositeReferencesAndServices((Composite)implementation, monitor);
+
+ monitor.pushContext("Composite: " + composite.getName().toString());
+
+ try {
+ // Wire nested composites recursively
+ for (Component component : composite.getComponents()) {
+ Implementation implementation = component.getImplementation();
+ if (implementation instanceof Composite) {
+ connectCompositeReferencesAndServices((Composite)implementation, monitor);
+ }
}
- }
-
- // Index components, services and references
- Map<String, Component> components = new HashMap<String, Component>();
- Map<String, ComponentService> componentServices = new HashMap<String, ComponentService>();
- Map<String, ComponentReference> componentReferences = new HashMap<String, ComponentReference>();
- indexComponentsServicesAndReferences(composite, components, componentServices, componentReferences);
-
- // Connect composite services and references to the component
- // services and references that they promote
- connectCompositeServices(composite, components, componentServices, monitor);
- connectCompositeReferences(composite, components, componentReferences, monitor);
+
+ // Index components, services and references
+ Map<String, Component> components = new HashMap<String, Component>();
+ Map<String, ComponentService> componentServices = new HashMap<String, ComponentService>();
+ Map<String, ComponentReference> componentReferences = new HashMap<String, ComponentReference>();
+ indexComponentsServicesAndReferences(composite, components, componentServices, componentReferences);
+
+ // Connect composite services and references to the component
+ // services and references that they promote
+ connectCompositeServices(composite, components, componentServices, monitor);
+ connectCompositeReferences(composite, components, componentReferences, monitor);
+ } finally {
+ monitor.popContext();
+ } // end try
}
/**
@@ -241,11 +248,12 @@
}
}
} else {
- warning(monitor,
- "PromotedReferenceNotFound",
- composite,
- composite.getName().toString(),
- componentReferenceName);
+ Monitor.error(monitor,
+ this,
+ "assembly-validation-messages",
+ "PromotedReferenceNotFound",
+ composite.getName().toString(),
+ componentReferenceName);
}
}
}