Author: cziegeler Date: Thu Dec 30 01:22:00 2004 New Revision: 123708 URL: http://svn.apache.org/viewcvs?view=rev&rev=123708 Log: Remove unused classloader Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/DefaultServiceSelector.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/RoleManager.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java cocoon/trunk/src/core/test/org/apache/cocoon/core/container/ContainerTestCase.java cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java cocoon/trunk/src/java/org/apache/cocoon/components/container/CocoonServiceManager.java cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/ParentServiceManager.java
Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java?view=diff&rev=123708&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java&r1=123707&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java&r2=123708 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java Thu Dec 30 01:22:00 2004 @@ -41,9 +41,6 @@ extends AbstractLogEnabled implements Contextualizable, ThreadSafe, Disposable, Initializable { - /** The classloader used for this system. */ - protected final ClassLoader loader; - /** The application context for components */ protected Context context; @@ -66,17 +63,6 @@ protected LoggerManager loggerManager; - /** - * Create the ServiceManager with a Classloader - */ - public AbstractServiceManager( final ClassLoader loader ) { - if( null == loader ) { - this.loader = Thread.currentThread().getContextClassLoader(); - } else { - this.loader = loader; - } - } - /* (non-Javadoc) * @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context) */ @@ -136,7 +122,7 @@ this.getLogger().debug( "Adding component (" + role + " = " + className + ")" ); } - final Class clazz = this.loader.loadClass( className ); + final Class clazz = this.getClass().getClassLoader().loadClass( className ); this.addComponent( role, clazz, configuration ); } catch( final ClassNotFoundException cnfe ) { final String message = "Could not get class (" + className + ") for role " 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=123708&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java&r1=123707&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java&r2=123708 ============================================================================== --- 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 01:22:00 2004 @@ -17,7 +17,6 @@ package org.apache.cocoon.core.container; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -66,10 +65,8 @@ /** The resolver used to resolve includes. It is lazily loaded in [EMAIL PROTECTED] #getSourceResolver()}. */ private SourceResolver cachedSourceResolver; - /** Create the ServiceManager with a Classloader and parent ServiceManager */ - public CocoonServiceManager( final ServiceManager parent, - final ClassLoader loader ) { - super(loader); + /** Create the ServiceManager with a parent ServiceManager */ + public CocoonServiceManager( final ServiceManager parent ) { this.parentManager = parent; RoleManager parentRoleManager = null; @@ -144,7 +141,7 @@ } try { - final Class componentClass = this.loader.loadClass( info.getServiceClassName() ); + final Class componentClass = this.getClass().getClassLoader().loadClass( info.getServiceClassName() ); final Configuration configuration = new DefaultConfiguration( "", "-" ); Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java?view=diff&rev=123708&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java&r1=123707&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java&r2=123708 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java Thu Dec 30 01:22:00 2004 @@ -22,5 +22,7 @@ * @version CVS $Id: CocoonServiceSelector.java 55144 2004-10-20 12:26:09Z ugo $ */ public class CocoonServiceSelector extends StandaloneServiceSelector { + + // TODO: Can we remove this? } Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/DefaultServiceSelector.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/DefaultServiceSelector.java?view=diff&rev=123708&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/DefaultServiceSelector.java&r1=123707&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/DefaultServiceSelector.java&r2=123708 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/DefaultServiceSelector.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/DefaultServiceSelector.java Thu Dec 30 01:22:00 2004 @@ -52,7 +52,8 @@ try { this.manager = (CocoonServiceManager)manager; } catch (ClassCastException cce) { - throw new ServiceException ("A FlatServiceSelector can only be hosted by a CocoonServiceManager"); + throw new ServiceException ("DefaultServiceSelector", + "A FlatServiceSelector can only be hosted by a CocoonServiceManager"); } } Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/RoleManager.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/RoleManager.java?view=diff&rev=123708&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/RoleManager.java&r1=123707&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/RoleManager.java&r2=123708 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/RoleManager.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/RoleManager.java Thu Dec 30 01:22:00 2004 @@ -173,10 +173,9 @@ if (!"role".equals(role.getName())) { if (strictMode) { throw new ConfigurationException("Unexpected '" + role.getName() + "' element at " + role.getLocation()); - } else { - // Skip to next one - continue; } + // Skip to next one + continue; } final String roleName = role.getAttribute("name"); Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java?view=diff&rev=123708&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java&r1=123707&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java&r2=123708 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java Thu Dec 30 01:22:00 2004 @@ -58,11 +58,6 @@ /** The default key */ protected String defaultKey; - /** Create the selector */ - public StandaloneServiceSelector() { - super(null); - } - /* (non-Javadoc) * @see org.apache.avalon.framework.service.ServiceSelector#select(java.lang.Object) */ Modified: cocoon/trunk/src/core/test/org/apache/cocoon/core/container/ContainerTestCase.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/test/org/apache/cocoon/core/container/ContainerTestCase.java?view=diff&rev=123708&p1=cocoon/trunk/src/core/test/org/apache/cocoon/core/container/ContainerTestCase.java&r1=123707&p2=cocoon/trunk/src/core/test/org/apache/cocoon/core/container/ContainerTestCase.java&r2=123708 ============================================================================== --- cocoon/trunk/src/core/test/org/apache/cocoon/core/container/ContainerTestCase.java (original) +++ cocoon/trunk/src/core/test/org/apache/cocoon/core/container/ContainerTestCase.java Thu Dec 30 01:22:00 2004 @@ -272,7 +272,7 @@ roleManager.configure( confRM ); // Set up the ComponentLocator - CocoonServiceManager ecManager = new CocoonServiceManager(null, null); + CocoonServiceManager ecManager = new CocoonServiceManager(null); ecManager.enableLogging( this.getLogger() ); ecManager.contextualize( this.context ); ecManager.setRoleManager( roleManager ); 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=123708&p1=cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java&r1=123707&p2=cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java&r2=123708 ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java Thu Dec 30 01:22:00 2004 @@ -197,11 +197,9 @@ public void initialize() throws Exception { if (parentServiceManager != null) { // TODO: wrap parent component manager - this.serviceManager = new CocoonServiceManager(null, - (ClassLoader) this.context.get(Constants.CONTEXT_CLASS_LOADER)); + this.serviceManager = new CocoonServiceManager(null); } else { - this.serviceManager = new CocoonServiceManager(null, - (ClassLoader) this.context.get(Constants.CONTEXT_CLASS_LOADER)); + this.serviceManager = new CocoonServiceManager(null); } ContainerUtil.enableLogging(this.serviceManager, getLogger().getChildLogger("manager")); ContainerUtil.contextualize(this.serviceManager, this.context); @@ -222,7 +220,7 @@ getLogger().debug("Work directory = " + workDir.getCanonicalPath()); } - CocoonServiceManager startupManager = new CocoonServiceManager(null,(ClassLoader) this.context.get(Constants.CONTEXT_CLASS_LOADER)); + CocoonServiceManager startupManager = new CocoonServiceManager(null); ContainerUtil.enableLogging(startupManager, getLogger().getChildLogger("startup")); ContainerUtil.contextualize(startupManager, this.context); startupManager.setLoggerManager(this.loggerManager); @@ -639,13 +637,12 @@ if (this.threadSafeProcessor != null) { return this.threadSafeProcessor.buildPipeline(environment); - } else { - Processor processor = (Processor)this.serviceManager.lookup(Processor.ROLE); - try { - return processor.buildPipeline(environment); - } finally { - this.serviceManager.release(processor); - } + } + Processor processor = (Processor)this.serviceManager.lookup(Processor.ROLE); + try { + return processor.buildPipeline(environment); + } finally { + this.serviceManager.release(processor); } } finally { Modified: cocoon/trunk/src/java/org/apache/cocoon/components/container/CocoonServiceManager.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/container/CocoonServiceManager.java?view=diff&rev=123708&p1=cocoon/trunk/src/java/org/apache/cocoon/components/container/CocoonServiceManager.java&r1=123707&p2=cocoon/trunk/src/java/org/apache/cocoon/components/container/CocoonServiceManager.java&r2=123708 ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/components/container/CocoonServiceManager.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/components/container/CocoonServiceManager.java Thu Dec 30 01:22:00 2004 @@ -36,10 +36,9 @@ /** The [EMAIL PROTECTED] SitemapConfigurationHolder}s */ private Map sitemapConfigurationHolders = new HashMap(15); - /** Create the ServiceManager with a Classloader and parent ServiceManager */ - public CocoonServiceManager( final ServiceManager parent, - final ClassLoader loader ) { - super( parent, loader); + /** Create the ServiceManager with a parent ServiceManager */ + public CocoonServiceManager( final ServiceManager parent) { + super( parent ); } /* (non-Javadoc) Modified: cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java?view=diff&rev=123708&p1=cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java&r1=123707&p2=cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java&r2=123708 ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java Thu Dec 30 01:22:00 2004 @@ -82,7 +82,7 @@ config = new DefaultConfiguration("", ""); } - CocoonServiceManager newManager = new CocoonServiceManager(this.parentProcessorManager, null); + CocoonServiceManager newManager = new CocoonServiceManager(this.parentProcessorManager); // Go through the component lifecycle newManager.enableLogging(getLogger()); @@ -505,8 +505,7 @@ private static final Collection splitLabels(String labels) { if (labels == null) { return Collections.EMPTY_SET; - } else { - return Arrays.asList(StringUtils.split(labels, ", \t\n\r")); } + return Arrays.asList(StringUtils.split(labels, ", \t\n\r")); } } Modified: cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/ParentServiceManager.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/ParentServiceManager.java?view=diff&rev=123708&p1=cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/ParentServiceManager.java&r1=123707&p2=cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/ParentServiceManager.java&r2=123708 ============================================================================== --- cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/ParentServiceManager.java (original) +++ cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/ParentServiceManager.java Thu Dec 30 01:22:00 2004 @@ -58,7 +58,7 @@ this.jndiName = jndiName; // Initialize it here so we can let it be final. - this.delegate = new CocoonServiceManager(null, null); + this.delegate = new CocoonServiceManager(null); } /* (non-Javadoc)
