Extended Monitoring to give better diagnostic messages which include the name of the artifact being processed.

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

1 files changed, 7 insertions, 0 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 b6182e3950..d6af4e752f 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
@@ -56,6 +56,7 @@ public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements
     private List scaDefnSink;
     private Collection<PolicySet> domainPolicySets = null;
     private int scaDefnsCount = 0;
+    private Monitor monitor;
 
     /**
      * Constructs a new composite processor.
@@ -68,6 +69,7 @@ public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements
         super(modelFactories, staxProcessor, monitor);
         this.inputFactory = modelFactories.getFactory(ValidatingXMLInputFactory.class);
         this.documentBuilderFactory = modelFactories.getFactory(DocumentBuilderFactory.class);
+        this.monitor = monitor;
     }
     
     public Composite read(URL contributionURL, URI uri, URL url) throws ContributionReadException {
@@ -94,6 +96,11 @@ public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements
             
             Composite composite = null;
             
+            // Tag the monitor with the name of the composite artifact
+            if( monitor != null ) {
+            	monitor.setArtifactName(uri.toString());
+            } //end if
+            
             byte[] transformedArtifactContent;
             try {
                 if ( domainPolicySets != null ) {