svn commit: r412304 - in /cocoon/branches/BRANCH_2_1_X: src/java/org/apache/cocoon/components/CocoonComponentManager.java status.xml

[cz...@apache.org]

Author: cziegeler
Date: Tue Jun  6 23:32:00 2006
New Revision: 412304

URL: http://svn.apache.org/viewvc?rev=412304&view=rev
Log:
Set instrumentation manager on child component managers to enable instrumentation of all components including sitemap components.

Modified:
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/CocoonComponentManager.java
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/CocoonComponentManager.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/CocoonComponentManager.java?rev=412304&r1=412303&r2=412304&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/CocoonComponentManager.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/CocoonComponentManager.java Tue Jun  6 23:32:00 2006
@@ -36,6 +36,7 @@
 import org.apache.cocoon.Processor;
 import org.apache.cocoon.environment.Environment;
 import org.apache.cocoon.xml.XMLConsumer;
+import org.apache.excalibur.instrument.InstrumentManager;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceException;
 import org.apache.excalibur.source.SourceResolver;
@@ -81,6 +82,8 @@
     /** has this been disposed? */
     private boolean wasDisposed;
 
+    /** The instrument manager (if any). */
+    private InstrumentManager instrumentManager;
 
     /** Create the ComponentManager */
     public CocoonComponentManager() {
@@ -95,13 +98,28 @@
     /** Create the ComponentManager with a Classloader and parent ComponentManager */
     public CocoonComponentManager(final ComponentManager manager, final ClassLoader loader) {
         super(manager, loader);
-        this.parentManager = manager;
+        this.setParentManager(manager);
     }
 
     /** Create the ComponentManager with a parent ComponentManager */
     public CocoonComponentManager(final ComponentManager manager) {
         super(manager);
+        this.setParentManager(manager);
+    }
+
+    protected void setParentManager(final ComponentManager manager) {
         this.parentManager = manager;
+        if ( manager instanceof CocoonComponentManager ) {
+            this.setInstrumentManager(((CocoonComponentManager)manager).instrumentManager);
+        }
+    }
+
+    /**
+     * @see org.apache.avalon.excalibur.component.ExcaliburComponentManager#setInstrumentManager(org.apache.excalibur.instrument.InstrumentManager)
+     */
+    public void setInstrumentManager(InstrumentManager iManager) {
+        this.instrumentManager = iManager;
+        super.setInstrumentManager(iManager);
     }
 
     /**

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?rev=412304&r1=412303&r2=412304&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Tue Jun  6 23:32:00 2006
@@ -182,6 +182,9 @@
   <release version="@version@" date="@date@">
 -->
   <release version="2.1.10" date="TBD">
+    <action dev="CZ" type="fix" fixes-bug="COCOON-1857" due-to="Brian Vargas" due-to-email="ardvaark-apachebugs@procrastinators.org">
+      Set instrumentation manager on child component managers to enable instrumentation of all components including sitemap components.
+    </action>
     <action dev="CZ" type="fix">
       Fix bug in wildcard matcher where a uri containing a pattern twice did not always match. For example,
       the uri "hallo.xml.xml" did not match "*.xml".