Improve error reporting when exceptions occur during composite document processing - tag all exceptions with the name of the composite.

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

1 files changed, 8 insertions, 2 deletions

diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
index 10e36bea48..db5a52a505 100644
--- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
+++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
@@ -147,8 +147,14 @@ public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements
     }
     
     public void resolve(Composite composite, ModelResolver resolver) throws ContributionResolveException {
-        if (composite != null)
-    	    extensionProcessor.resolve(composite, resolver);
+    	try {
+	        if (composite != null)
+	    	    extensionProcessor.resolve(composite, resolver);
+    	} catch (Throwable e ) {
+    		// Add information about which composite was being processed when the exception occurred
+    		String newMessage = "Processing composite " + composite.getName() + ": " + e.getMessage();
+    		throw new ContributionResolveException( newMessage, e );
+    	} // end try
     }
 
     public String getArtifactType() {