summaryrefslogtreecommitdiffstats
path: root/java/sca/modules/node-impl-osgi/src
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-08-12 13:34:45 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-08-12 13:34:45 +0000
commit262ad21576300d370897c0d175e5ec2c4521c53b (patch)
tree50d32947bee641bb86f5f9e2f5d61db9b7bb1e29 /java/sca/modules/node-impl-osgi/src
parente1448e957b13debf895f3001da9f718e9fac3eab (diff)
Feed the monitor through into model resolvers should they wish to use it.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@803502 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/modules/node-impl-osgi/src')
-rw-r--r--java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/EndpointIntrospector.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/EndpointIntrospector.java b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/EndpointIntrospector.java
index 59f8d3c07b..39e7457e2e 100644
--- a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/EndpointIntrospector.java
+++ b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/EndpointIntrospector.java
@@ -102,6 +102,7 @@ public class EndpointIntrospector {
private XMLOutputFactory xmlOutputFactory;
private JavaInterfaceFactory javaInterfaceFactory;
private StAXArtifactProcessor processor;
+ private Monitor monitor;
/**
* @param intentName
@@ -144,7 +145,6 @@ public class EndpointIntrospector {
registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
UtilityExtensionPoint utilities = this.registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
- Monitor monitor = null;
if (monitorFactory != null) {
monitor = monitorFactory.createMonitor();
}
@@ -285,7 +285,7 @@ public class EndpointIntrospector {
contribution.setURI("urn:" + id);
contribution.setLocation(bundle.getEntry("/").toString());
contribution.getDeployables().add(composite);
- ModelResolver modelResolver = new ExtensibleModelResolver(contribution, modelResolvers, factories);
+ ModelResolver modelResolver = new ExtensibleModelResolver(contribution, modelResolvers, factories, monitor);
contribution.setModelResolver(modelResolver);
contribution.setUnresolved(true);
return contribution;
@@ -364,7 +364,7 @@ public class EndpointIntrospector {
contribution.setURI("urn:" + id);
contribution.setLocation(bundle.getEntry("/").toString());
contribution.getDeployables().add(composite);
- ModelResolver modelResolver = new ExtensibleModelResolver(contribution, modelResolvers, factories);
+ ModelResolver modelResolver = new ExtensibleModelResolver(contribution, modelResolvers, factories, monitor);
contribution.setModelResolver(modelResolver);
contribution.setUnresolved(true);
return contribution;
@@ -412,7 +412,7 @@ public class EndpointIntrospector {
contribution.setURI("urn:" + id);
contribution.setLocation(bundle.getEntry("/").toString());
contribution.getDeployables().add(composite);
- ModelResolver modelResolver = new ExtensibleModelResolver(contribution, modelResolvers, factories);
+ ModelResolver modelResolver = new ExtensibleModelResolver(contribution, modelResolvers, factories, monitor);
contribution.setModelResolver(modelResolver);
contribution.setUnresolved(true);
return contribution;