Add Contribution context information to Monitor during Resolve phase

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

1 files changed, 30 insertions, 24 deletions

diff --git a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionContentProcessor.java b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionContentProcessor.java
index 4e075fea24..d651393e78 100644
--- a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionContentProcessor.java
+++ b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionContentProcessor.java
@@ -215,30 +215,36 @@ public class ContributionContentProcessor implements ExtendedURLArtifactProcesso
 
     public void resolve(Contribution contribution, ModelResolver resolver) throws ContributionResolveException {
 
-    	if( !preResolved ) preResolve( contribution, resolver);
-    	ModelResolver contributionResolver = contribution.getModelResolver();
-
-        // Resolve all artifact models
-        for (Artifact artifact : contribution.getArtifacts()) {
-            Object model = artifact.getModel();
-            if (model != null) {
-                try {
-                   artifactProcessor.resolve(model, contributionResolver);
-                } catch (Throwable e) {
-                    throw new ContributionResolveException(e);
-                }
-            }
-        }
-
-        // Resolve deployable composites
-        List<Composite> deployables = contribution.getDeployables();
-        for (int i = 0, n = deployables.size(); i < n; i++) {
-            Composite deployable = deployables.get(i);
-            Composite resolved = (Composite)contributionResolver.resolveModel(Composite.class, deployable);
-            if (resolved != deployable) {
-                deployables.set(i, resolved);
-            }
-        } // end for
+    	try {
+    		monitor.pushContext("Contribution: " + contribution.getURI());
+    		
+	    	if( !preResolved ) preResolve( contribution, resolver);
+	    	ModelResolver contributionResolver = contribution.getModelResolver();
+	
+	        // Resolve all artifact models
+	        for (Artifact artifact : contribution.getArtifacts()) {
+	            Object model = artifact.getModel();
+	            if (model != null) {
+	                try {
+	                   artifactProcessor.resolve(model, contributionResolver);
+	                } catch (Throwable e) {
+	                    throw new ContributionResolveException(e);
+	                }
+	            }
+	        }
+	
+	        // Resolve deployable composites
+	        List<Composite> deployables = contribution.getDeployables();
+	        for (int i = 0, n = deployables.size(); i < n; i++) {
+	            Composite deployable = deployables.get(i);
+	            Composite resolved = (Composite)contributionResolver.resolveModel(Composite.class, deployable);
+	            if (resolved != deployable) {
+	                deployables.set(i, resolved);
+	            }
+	        } // end for
+    	} finally {
+    		monitor.popContext();
+    	} // end try
     } // end method resolve
 
     /**