Author: cziegeler Date: Fri Apr 8 01:56:58 2005 New Revision: 160539 URL: http://svn.apache.org/viewcvs?view=rev&rev=160539 Log: Remove unused code
Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/Core.java cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/Core.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/Core.java?view=diff&r1=160538&r2=160539 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/Core.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/Core.java Fri Apr 8 01:56:58 2005 @@ -48,6 +48,8 @@ public class Core implements Contextualizable { + public static String ROLE = Core.class.getName(); + /** Application <code>Context</code> Key for the settings. Please don't * use this constant to lookup the settings object. Lookup the core * component and use [EMAIL PROTECTED] #getSettings()} instead. */ @@ -64,10 +66,6 @@ private final Settings settings; - public Core() { - this.settings = null; - } - public Core(Settings s, Context c) { this.settings = s; this.context = c; @@ -110,8 +108,7 @@ * Return the settings. */ public Settings getSettings() { - return getSettings(this.context); - // return this.settings; + return this.settings; } /** Modified: cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles?view=diff&r1=160538&r2=160539 ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles (original) +++ cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles Fri Apr 8 01:56:58 2005 @@ -29,11 +29,6 @@ ]> <role-list> - <!-- This is the Cocoon core --> - <role name="org.apache.cocoon.core.Core" - default-class="org.apache.cocoon.core.Core" - model="singleton"/> - <role name="org.apache.cocoon.components.classloader.ClassLoaderFactory" default-class="org.apache.cocoon.components.classloader.DefaultClassLoaderFactory"/> Modified: cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java?view=diff&r1=160538&r2=160539 ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java Fri Apr 8 01:56:58 2005 @@ -27,9 +27,6 @@ import java.util.Properties; import java.util.StringTokenizer; -import org.apache.avalon.framework.context.Context; -import org.apache.avalon.framework.context.ContextException; -import org.apache.avalon.framework.context.Contextualizable; import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; import org.apache.cocoon.Constants; @@ -83,8 +80,7 @@ * @version $Id$ */ public class StatusGenerator - extends ServiceableGenerator - implements Contextualizable { + extends ServiceableGenerator { /** * The StoreJanitor used to get cache statistics @@ -92,16 +88,6 @@ protected StoreJanitor storejanitor; protected Store store_persistent; - /** The context */ - protected Context context; - - /* (non-Javadoc) - * @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context) - */ - public void contextualize(Context context) throws ContextException { - this.context = context; - } - /** * The XML namespace for the output document. */ @@ -333,7 +319,14 @@ } private void genSettings() throws SAXException { - final Settings s = Core.getSettings(this.context); + Core core = null; + try { + core = (Core)this.manager.lookup(Core.ROLE); + } catch (ServiceException se) { + // this can never happen + throw new RuntimeException("Unable to lookup Cocoon core."); + } + final Settings s = core.getSettings(); this.startGroup("Settings"); this.addValue(Settings.KEY_CONFIGURATION, s.getConfiguration()); Modified: cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java?view=diff&r1=160538&r2=160539 ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java Fri Apr 8 01:56:58 2005 @@ -936,7 +936,8 @@ * @return the parent service manager, or <code>null</code>. */ protected synchronized ServiceManager getParentServiceManager() { - ContainerUtil.dispose(this.parentServiceManager); + // FIXME - move this to CoreUtil! +/* ContainerUtil.dispose(this.parentServiceManager); this.parentServiceManager = null; if (parentServiceManagerClass != null) { @@ -953,7 +954,7 @@ getLogger().error("Could not initialize parent component manager.", e); } } - } + }*/ return parentServiceManager; }