Author: cziegeler Date: Thu Dec 30 05:38:51 2004 New Revision: 123715 URL: http://svn.apache.org/viewcvs?view=rev&rev=123715 Log: Set parent manager - if available Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java
Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java?view=diff&rev=123715&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java&r1=123714&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java&r2=123715 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java Thu Dec 30 05:38:51 2004 @@ -81,6 +81,9 @@ this.roleManager = new RoleManager(parentRoleManager); } + /* (non-Javadoc) + * @see org.apache.avalon.framework.logger.LogEnabled#enableLogging(org.apache.avalon.framework.logger.Logger) + */ public void enableLogging(Logger logger) { super.enableLogging(logger); this.roleManager.enableLogging(logger); @@ -288,6 +291,9 @@ } } + /* (non-Javadoc) + * @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration) + */ public void configure(Configuration configuration) throws ConfigurationException { // Setup location if (this.location == null) { Modified: cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java?view=diff&rev=123715&p1=cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java&r1=123714&p2=cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java&r2=123715 ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java Thu Dec 30 05:38:51 2004 @@ -195,12 +195,7 @@ * @exception Exception if an error occurs */ public void initialize() throws Exception { - if (parentServiceManager != null) { - // TODO: wrap parent component manager - this.serviceManager = new CocoonServiceManager(null); - } else { - this.serviceManager = new CocoonServiceManager(null); - } + this.serviceManager = new CocoonServiceManager(this.parentServiceManager); ContainerUtil.enableLogging(this.serviceManager, getLogger().getChildLogger("manager")); ContainerUtil.contextualize(this.serviceManager, this.context);
