Author: jverhaeg(a)redhat.com Date: 2008-10-29 16:50:28 -0400 (Wed, 29 Oct 2008) New Revision: 601 Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/ExecutionContext.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/ExecutionContexts.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/connectors/BasicExecutionContext.java trunk/dna-graph/src/test/java/org/jboss/dna/graph/sequencers/MockSequencerContext.java trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencerNodeContext.java trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencingService.java trunk/dna-repository/src/main/java/org/jboss/dna/repository/util/BasicJcrExecutionContext.java trunk/extensions/dna-sequencer-images/src/test/java/org/jboss/dna/sequencer/images/ImageMetadataSequencerTest.java trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/sequencer/java/JavaMetadataSequencerTest.java Log: Changed ExcecutionContext to provide ability to create a new activity monitor and updated related classes Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/ExecutionContext.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/ExecutionContext.java 2008-10-29 20:37:59 UTC (rev 600) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/ExecutionContext.java 2008-10-29 20:50:28 UTC (rev 601) @@ -25,6 +25,7 @@ import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; import org.jboss.dna.common.component.ClassLoaderFactory; +import org.jboss.dna.common.i18n.I18n; import org.jboss.dna.common.monitor.ActivityMonitor; import org.jboss.dna.common.util.Logger; import org.jboss.dna.graph.properties.NamespaceRegistry; @@ -45,16 +46,21 @@ public interface ExecutionContext extends ClassLoaderFactory { /** - * @return the access control context; may be <code>null</code> + * Creates a thread-safe activity monitor with the specified activity name. This method should be used when the caller is + * either not participating in an activity itself, or when a new activity needs to be performed that is not considered a + * subtask of the caller's activity. + * + * @param activityName The internationalization object representing the activity's name. + * @param activityNameParameters Any parameters needed to localize the activity's name. + * @return A new activity monitor */ - AccessControlContext getAccessControlContext(); + ActivityMonitor createActivityMonitor( I18n activityName, + Object... activityNameParameters ); /** - * Returns the thread-safe activity monitor associated with this execution context. - * - * @return the activity monitor; never <code>null</code>; + * @return the access control context; may be <code>null</code> */ - ActivityMonitor getActivityMonitor(); + AccessControlContext getAccessControlContext(); /** * Return a logger associated with this context. This logger records only those activities within the context and provide a Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/ExecutionContexts.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/ExecutionContexts.java 2008-10-29 20:37:59 UTC (rev 600) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/ExecutionContexts.java 2008-10-29 20:50:28 UTC (rev 601) @@ -24,6 +24,7 @@ import java.security.AccessControlContext; import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; +import org.jboss.dna.common.i18n.I18n; import org.jboss.dna.common.monitor.ActivityMonitor; import org.jboss.dna.common.util.CheckArg; import org.jboss.dna.common.util.Logger; @@ -151,6 +152,16 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.ExecutionContext#createActivityMonitor(org.jboss.dna.common.i18n.I18n, java.lang.Object[]) + */ + public ActivityMonitor createActivityMonitor( I18n activityName, + Object... activityNameParameters ) { + return delegate.createActivityMonitor(activityName, activityNameParameters); + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.common.component.ClassLoaderFactory#getClassLoader(java.lang.String[]) */ public ClassLoader getClassLoader( String... classpath ) { @@ -188,15 +199,6 @@ /** * {@inheritDoc} * - * @see org.jboss.dna.graph.ExecutionContext#getActivityMonitor() - */ - public ActivityMonitor getActivityMonitor() { - return delegate.getActivityMonitor(); - } - - /** - * {@inheritDoc} - * * @see org.jboss.dna.graph.ExecutionContext#getPropertyFactory() */ public PropertyFactory getPropertyFactory() { Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/connectors/BasicExecutionContext.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/connectors/BasicExecutionContext.java 2008-10-29 20:37:59 UTC (rev 600) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/connectors/BasicExecutionContext.java 2008-10-29 20:50:28 UTC (rev 601) @@ -25,9 +25,9 @@ import java.security.AccessController; import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; -import org.jboss.dna.common.CommonI18n; import org.jboss.dna.common.component.ClassLoaderFactory; import org.jboss.dna.common.component.StandardClassLoaderFactory; +import org.jboss.dna.common.i18n.I18n; import org.jboss.dna.common.monitor.ActivityMonitor; import org.jboss.dna.common.monitor.SimpleActivityMonitor; import org.jboss.dna.common.util.Logger; @@ -52,41 +52,37 @@ private final PropertyFactory propertyFactory; private final ValueFactories valueFactories; private final NamespaceRegistry namespaceRegistry; - private final ActivityMonitor activityMonitor; public BasicExecutionContext() { - this(null, null, null, null, null, null); + this(null, null, null, null, null); } public BasicExecutionContext( LoginContext loginContext ) { - this(loginContext, null, null, null, null, null); + this(loginContext, null, null, null, null); } public BasicExecutionContext( AccessControlContext accessControlContext ) { - this(null, accessControlContext, null, null, null, null); + this(null, accessControlContext, null, null, null); } public BasicExecutionContext( NamespaceRegistry namespaceRegistry, ValueFactories valueFactories, - PropertyFactory propertyFactory, - ActivityMonitor activityMonitor ) { - this(null, null, namespaceRegistry, valueFactories, propertyFactory, activityMonitor); + PropertyFactory propertyFactory ) { + this(null, null, namespaceRegistry, valueFactories, propertyFactory); } public BasicExecutionContext( LoginContext loginContext, NamespaceRegistry namespaceRegistry, ValueFactories valueFactories, - PropertyFactory propertyFactory, - ActivityMonitor activityMonitor ) { - this(loginContext, null, namespaceRegistry, valueFactories, propertyFactory, activityMonitor); + PropertyFactory propertyFactory ) { + this(loginContext, null, namespaceRegistry, valueFactories, propertyFactory); } public BasicExecutionContext( AccessControlContext accessControlContext, NamespaceRegistry namespaceRegistry, ValueFactories valueFactories, - PropertyFactory propertyFactory, - ActivityMonitor activityMonitor ) { - this(null, accessControlContext, namespaceRegistry, valueFactories, propertyFactory, activityMonitor); + PropertyFactory propertyFactory ) { + this(null, accessControlContext, namespaceRegistry, valueFactories, propertyFactory); } /* @@ -96,8 +92,7 @@ AccessControlContext accessControlContext, NamespaceRegistry namespaceRegistry, ValueFactories valueFactories, - PropertyFactory propertyFactory, - ActivityMonitor activityMonitor ) { + PropertyFactory propertyFactory ) { this.loginContext = loginContext; this.accessControlContext = accessControlContext; if (loginContext == null) { @@ -108,13 +103,22 @@ this.namespaceRegistry = namespaceRegistry == null ? new BasicNamespaceRegistry() : namespaceRegistry; this.valueFactories = valueFactories == null ? new StandardValueFactories(this.namespaceRegistry) : valueFactories; this.propertyFactory = propertyFactory == null ? new BasicPropertyFactory(this.valueFactories) : propertyFactory; - this.activityMonitor = activityMonitor == null ? new SimpleActivityMonitor(CommonI18n.nullActivityMonitorTaskName) : activityMonitor; this.classLoaderFactory = new StandardClassLoaderFactory(); } /** * {@inheritDoc} * + * @see org.jboss.dna.graph.ExecutionContext#createActivityMonitor(org.jboss.dna.common.i18n.I18n, java.lang.Object[]) + */ + public ActivityMonitor createActivityMonitor( I18n activityName, + Object... activityNameParameters ) { + return new SimpleActivityMonitor(activityName, activityNameParameters); + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.common.component.ClassLoaderFactory#getClassLoader(java.lang.String[]) */ public ClassLoader getClassLoader( String... classpath ) { @@ -148,16 +152,7 @@ /** * {@inheritDoc} - * - * @see org.jboss.dna.graph.ExecutionContext#getActivityMonitor() */ - public ActivityMonitor getActivityMonitor() { - return activityMonitor; - } - - /** - * {@inheritDoc} - */ public PropertyFactory getPropertyFactory() { return propertyFactory; } Modified: trunk/dna-graph/src/test/java/org/jboss/dna/graph/sequencers/MockSequencerContext.java =================================================================== --- trunk/dna-graph/src/test/java/org/jboss/dna/graph/sequencers/MockSequencerContext.java 2008-10-29 20:37:59 UTC (rev 600) +++ trunk/dna-graph/src/test/java/org/jboss/dna/graph/sequencers/MockSequencerContext.java 2008-10-29 20:50:28 UTC (rev 601) @@ -26,7 +26,9 @@ import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; import net.jcip.annotations.Immutable; +import org.jboss.dna.common.i18n.I18n; import org.jboss.dna.common.monitor.ActivityMonitor; +import org.jboss.dna.common.monitor.SimpleActivityMonitor; import org.jboss.dna.common.util.Logger; import org.jboss.dna.graph.DnaLexicon; import org.jboss.dna.graph.properties.Name; @@ -60,6 +62,16 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.ExecutionContext#createActivityMonitor(org.jboss.dna.common.i18n.I18n, java.lang.Object[]) + */ + public ActivityMonitor createActivityMonitor( I18n activityName, + Object... activityNameParameters ) { + return new SimpleActivityMonitor(activityName, activityNameParameters); + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.common.component.ClassLoaderFactory#getClassLoader(java.lang.String[]) */ public ClassLoader getClassLoader( String... classpath ) { @@ -150,15 +162,6 @@ /** * {@inheritDoc} * - * @see org.jboss.dna.graph.ExecutionContext#getActivityMonitor() - */ - public ActivityMonitor getActivityMonitor() { - return null; - } - - /** - * {@inheritDoc} - * * @see org.jboss.dna.graph.ExecutionContext#getPropertyFactory() */ public PropertyFactory getPropertyFactory() { Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencerNodeContext.java =================================================================== --- trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencerNodeContext.java 2008-10-29 20:37:59 UTC (rev 600) +++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencerNodeContext.java 2008-10-29 20:50:28 UTC (rev 601) @@ -35,6 +35,7 @@ import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; import net.jcip.annotations.Immutable; +import org.jboss.dna.common.i18n.I18n; import org.jboss.dna.common.monitor.ActivityMonitor; import org.jboss.dna.common.util.CheckArg; import org.jboss.dna.common.util.Logger; @@ -141,6 +142,16 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.ExecutionContext#createActivityMonitor(org.jboss.dna.common.i18n.I18n, java.lang.Object[]) + */ + public ActivityMonitor createActivityMonitor( I18n activityName, + Object... activityNameParameters ) { + return context.createActivityMonitor(activityName, activityNameParameters); + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.graph.ExecutionContext#getAccessControlContext() */ public AccessControlContext getAccessControlContext() { @@ -264,15 +275,6 @@ /** * {@inheritDoc} * - * @see org.jboss.dna.graph.ExecutionContext#getActivityMonitor() - */ - public ActivityMonitor getActivityMonitor() { - return context.getActivityMonitor(); - } - - /** - * {@inheritDoc} - * * @see org.jboss.dna.graph.ExecutionContext#getPropertyFactory() */ public PropertyFactory getPropertyFactory() { Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencingService.java =================================================================== --- trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencingService.java 2008-10-29 20:37:59 UTC (rev 600) +++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencingService.java 2008-10-29 20:50:28 UTC (rev 601) @@ -46,9 +46,9 @@ import org.jboss.dna.common.component.ClassLoaderFactory; import org.jboss.dna.common.component.ComponentLibrary; import org.jboss.dna.common.component.StandardClassLoaderFactory; +import org.jboss.dna.common.i18n.I18n; import org.jboss.dna.common.monitor.ActivityMonitor; import org.jboss.dna.common.monitor.LoggingActivityMonitor; -import org.jboss.dna.common.monitor.SimpleActivityMonitor; import org.jboss.dna.common.util.CheckArg; import org.jboss.dna.common.util.HashCode; import org.jboss.dna.common.util.Logger; @@ -514,7 +514,7 @@ } } else { // Run each of those sequencers ... - ActivityMonitor activityMonitor = new SimpleActivityMonitor(RepositoryI18n.sequencerTask, changedNode); + ActivityMonitor activityMonitor = context.createActivityMonitor(RepositoryI18n.sequencerTask, changedNode); if (logger.isTraceEnabled()) { activityMonitor = new LoggingActivityMonitor(activityMonitor, logger, Logger.Level.TRACE); } @@ -608,6 +608,16 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.ExecutionContext#createActivityMonitor(org.jboss.dna.common.i18n.I18n, java.lang.Object[]) + */ + public ActivityMonitor createActivityMonitor( I18n activityName, + Object... activityNameParameters ) { + return delegate.createActivityMonitor(activityName, activityNameParameters); + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.common.component.ClassLoaderFactory#getClassLoader(java.lang.String[]) */ public ClassLoader getClassLoader( String... classpath ) { @@ -641,16 +651,7 @@ /** * {@inheritDoc} - * - * @see org.jboss.dna.graph.ExecutionContext#getActivityMonitor() */ - public ActivityMonitor getActivityMonitor() { - return delegate.getActivityMonitor(); - } - - /** - * {@inheritDoc} - */ public PropertyFactory getPropertyFactory() { return this.delegate.getPropertyFactory(); } Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/util/BasicJcrExecutionContext.java =================================================================== --- trunk/dna-repository/src/main/java/org/jboss/dna/repository/util/BasicJcrExecutionContext.java 2008-10-29 20:37:59 UTC (rev 600) +++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/util/BasicJcrExecutionContext.java 2008-10-29 20:50:28 UTC (rev 601) @@ -50,7 +50,7 @@ NamespaceRegistry namespaceRegistry, ValueFactories valueFactories, PropertyFactory propertyFactory ) { - super(namespaceRegistry, valueFactories, propertyFactory, null); + super(namespaceRegistry, valueFactories, propertyFactory); CheckArg.isNotNull(sessionFactory, "session factory"); this.sessionFactory = sessionFactory; } Modified: trunk/extensions/dna-sequencer-images/src/test/java/org/jboss/dna/sequencer/images/ImageMetadataSequencerTest.java =================================================================== --- trunk/extensions/dna-sequencer-images/src/test/java/org/jboss/dna/sequencer/images/ImageMetadataSequencerTest.java 2008-10-29 20:37:59 UTC (rev 600) +++ trunk/extensions/dna-sequencer-images/src/test/java/org/jboss/dna/sequencer/images/ImageMetadataSequencerTest.java 2008-10-29 20:50:28 UTC (rev 601) @@ -30,7 +30,6 @@ import java.net.URL; import org.jboss.dna.common.i18n.MockI18n; import org.jboss.dna.common.monitor.ActivityMonitor; -import org.jboss.dna.common.monitor.SimpleActivityMonitor; import org.jboss.dna.graph.sequencers.MockSequencerContext; import org.jboss.dna.graph.sequencers.MockSequencerOutput; import org.jboss.dna.graph.sequencers.SequencerContext; @@ -60,7 +59,7 @@ context = new MockSequencerContext(); context.getNamespaceRegistry().register("image", "http://jboss.org/dna/images/1.0"); output = new MockSequencerOutput(context); - activityMonitor = new SimpleActivityMonitor(MockI18n.passthrough, "Test Activity"); + activityMonitor = context.createActivityMonitor(MockI18n.passthrough, "Test Activity"); cautionGif = this.getClass().getClassLoader().getResource("caution.gif"); cautionJpg = this.getClass().getClassLoader().getResource("caution.jpg"); cautionPict = this.getClass().getClassLoader().getResource("caution.pict"); Modified: trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/sequencer/java/JavaMetadataSequencerTest.java =================================================================== --- trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/sequencer/java/JavaMetadataSequencerTest.java 2008-10-29 20:37:59 UTC (rev 600) +++ trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/sequencer/java/JavaMetadataSequencerTest.java 2008-10-29 20:50:28 UTC (rev 601) @@ -31,7 +31,6 @@ import java.io.InputStream; import org.jboss.dna.common.i18n.MockI18n; import org.jboss.dna.common.monitor.ActivityMonitor; -import org.jboss.dna.common.monitor.SimpleActivityMonitor; import org.jboss.dna.graph.sequencers.MockSequencerContext; import org.jboss.dna.graph.sequencers.MockSequencerOutput; import org.jboss.dna.graph.sequencers.SequencerContext; @@ -57,7 +56,7 @@ context.getNamespaceRegistry().register("java", "http://jboss.org/dna/java/1.0"); sequencer = new JavaMetadataSequencer(); output = new MockSequencerOutput(context); - this.activityMonitor = new SimpleActivityMonitor(MockI18n.passthrough, "Test java monitor activity"); + this.activityMonitor = context.createActivityMonitor(MockI18n.passthrough, "Test java monitor activity"); source = new File("src/test/workspace/projectX/src/org/acme/MySource.java"); }