svn commit: rev 55165 - cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container

[cziegeler]

Author: cziegeler
Date: Wed Oct 20 09:51:50 2004
New Revision: 55165

Modified:
   
cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/CocoonServiceManager.java
   
cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/ComponentFactory.java
Log:
Add parent/child handling for role and logger manager
Add hack to get tree processor running

Modified: 
cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/CocoonServiceManager.java
==============================================================================
--- 
cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/CocoonServiceManager.java
 (original)
+++ 
cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/CocoonServiceManager.java
 Wed Oct 20 09:51:50 2004
@@ -61,6 +61,11 @@
                                  final ClassLoader loader ) {
         super(loader);
         this.parentManager = parent;
+        // get role manager and logger manager
+        if ( parent instanceof CocoonServiceManager ) {
+            this.roleManager = ((CocoonServiceManager)parent).roleManager;
+            this.loggerManager = ((CocoonServiceManager)parent).loggerManager;
+        }
     }
 
     /* (non-Javadoc)

Modified: 
cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/ComponentFactory.java
==============================================================================
--- 
cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/ComponentFactory.java
     (original)
+++ 
cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/ComponentFactory.java
     Wed Oct 20 09:51:50 2004
@@ -27,6 +27,7 @@
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
+import org.apache.cocoon.components.treeprocessor.TreeProcessor;
 
 /**
  * Factory for Avalon based components.
@@ -130,6 +131,8 @@
         if ( component instanceof CocoonServiceSelector ) {
             
((CocoonServiceSelector)component).setLoggerManager(this.loggerManager);
             
((CocoonServiceSelector)component).setRoleManager(this.roleManager);
+        } else if ( component instanceof TreeProcessor ) {
+            ((TreeProcessor)component).setRoleManager(this.roleManager);       
     
         }
         
         ContainerUtil.configure( component, this.configuration );