donaldp 02/05/15 05:05:31
Modified: src/java/org/apache/avalon/phoenix/interfaces
ApplicationContext.java
src/java/org/apache/avalon/phoenix/components/kernel
DefaultKernel.java DefaultApplicationContext.java
src/java/org/apache/avalon/phoenix/components/application
LifecycleHelper.java DefaultBlockContext.java
src/java/org/apache/avalon/phoenix BlockContext.java
Log:
Remove Feature: Threads pools accessible from BlockContext
Deprecated since: 2001/09/20
ie The check if the following methods are used anywhere in your code.
BlockContext.getThreadPool(String)
BlockContext.getDefaultThreadPool()
Revision Changes Path
1.10 +0 -12
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ApplicationContext.java
Index: ApplicationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ApplicationContext.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ApplicationContext.java 10 May 2002 09:13:41 -0000 1.9
+++ ApplicationContext.java 15 May 2002 12:05:30 -0000 1.10
@@ -7,7 +7,6 @@
*/
package org.apache.avalon.phoenix.interfaces;
-import org.apache.avalon.excalibur.thread.ThreadPool;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.phoenix.metadata.SarMetaData;
@@ -72,15 +71,4 @@
* @return the Logger
*/
Logger getLogger( String name );
-
- /**
- * Retrieve thread pool by name.
- *
- * @param name the name of thread pool
- * @return the threadpool
- * @throws IllegalArgumentException if the name of thread pool is
- * invalid or named pool does not exist
- */
- ThreadPool getThreadPool( String name )
- throws IllegalArgumentException;
}
1.64 +0 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java
Index: DefaultKernel.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- DefaultKernel.java 11 May 2002 06:35:26 -0000 1.63
+++ DefaultKernel.java 15 May 2002 12:05:30 -0000 1.64
@@ -221,7 +221,6 @@
ContainerUtil.logEnable( context, createContextLogger( name ) );
ContainerUtil.service( context, createServiceManager() );
- ContainerUtil.configure( context, entry.getConfiguration() );
return context;
}
1.15 +1 -86
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java
Index: DefaultApplicationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DefaultApplicationContext.java 10 May 2002 09:13:41 -0000 1.14
+++ DefaultApplicationContext.java 15 May 2002 12:05:30 -0000 1.15
@@ -8,11 +8,6 @@
package org.apache.avalon.phoenix.components.kernel;
import java.util.HashMap;
-import org.apache.avalon.excalibur.i18n.ResourceManager;
-import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.excalibur.thread.ThreadPool;
-import org.apache.avalon.excalibur.thread.impl.DefaultThreadPool;
-import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
@@ -35,14 +30,8 @@
*/
class DefaultApplicationContext
extends AbstractLogEnabled
- implements ApplicationContext, Serviceable, Configurable
+ implements ApplicationContext, Serviceable
{
- private static final Resources REZ =
- ResourceManager.getPackageResources( DefaultApplicationContext.class
);
-
- ///Map of thread pools for application
- private final HashMap m_threadPools = new HashMap();
-
//Log HIerarchy for application
private final Hierarchy m_hierarchy;
@@ -81,32 +70,6 @@
m_systemManager = (SystemManager)serviceManager.lookup(
SystemManager.ROLE );
}
- /**
- * Configure frame.
- *
- * @param configuration the configuration data
- * @throws ConfigurationException if an error occurs
- */
- public void configure( final Configuration configuration )
- throws ConfigurationException
- {
- //Configure thread pools
- final Configuration[] groups =
- configuration.getChild( "threads" ).getChildren( "thread-group"
);
-
- if( groups.length > 0 )
- {
- final String message = REZ.getString( "frame.warn.thread-pools"
);
- getLogger().warn( message );
- System.err.println( message );
- }
-
- for( int i = 0; i < groups.length; i++ )
- {
- configureThreadPool( groups[ i ] );
- }
- }
-
public SarMetaData getMetaData()
{
return m_metaData;
@@ -189,53 +152,5 @@
throws ConfigurationException
{
return m_repository.getConfiguration( m_metaData.getName(),
component );
- }
-
- /**
- * Retrieve thread pool by name.
- *
- * @param name the name of thread pool
- * @return the threadpool
- * @throws IllegalArgumentException if the name of thread pool is
- * invalid or named pool does not exist
- */
- public ThreadPool getThreadPool( final String name )
- {
- final ThreadPool threadPool = (ThreadPool)m_threadPools.get( name );
-
- if( null == threadPool )
- {
- final String message = REZ.getString(
"frame.error.thread.missing", name );
- throw new IllegalArgumentException( message );
- }
-
- return threadPool;
- }
-
- private void configureThreadPool( final Configuration configuration )
- throws ConfigurationException
- {
- final String name = configuration.getChild( "name" ).getValue();
- final int priority = configuration.getChild( "priority"
).getValueAsInteger( 5 );
- final boolean isDaemon = configuration.getChild( "is-daemon"
).getValueAsBoolean( false );
-
- final int minThreads = configuration.getChild( "min-threads"
).getValueAsInteger( 5 );
- final int maxThreads = configuration.getChild( "max-threads"
).getValueAsInteger( 10 );
- final int minSpareThreads = configuration.getChild(
"min-spare-threads" ).
- getValueAsInteger( maxThreads - minThreads );
-
- try
- {
- final DefaultThreadPool threadPool =
- new DefaultThreadPool( name, maxThreads, m_threadContext );
- threadPool.setDaemon( isDaemon );
- threadPool.enableLogging( getLogger() );
- m_threadPools.put( name, threadPool );
- }
- catch( final Exception e )
- {
- final String message = REZ.getString(
"frame.error.thread.create", name );
- throw new ConfigurationException( message, e );
- }
}
}
1.41 +1 -3
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/LifecycleHelper.java
Index: LifecycleHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/LifecycleHelper.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- LifecycleHelper.java 15 May 2002 11:24:43 -0000 1.40
+++ LifecycleHelper.java 15 May 2002 12:05:30 -0000 1.41
@@ -461,9 +461,7 @@
*/
private BlockContext createBlockContext( final String name )
{
- final DefaultBlockContext context = new DefaultBlockContext( name,
m_context );
- setupLogger( context );
- return context;
+ return new DefaultBlockContext( name, m_context );
}
/**
1.14 +1 -46
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultBlockContext.java
Index: DefaultBlockContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultBlockContext.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefaultBlockContext.java 15 May 2002 11:44:33 -0000 1.13
+++ DefaultBlockContext.java 15 May 2002 12:05:30 -0000 1.14
@@ -8,11 +8,7 @@
package org.apache.avalon.phoenix.components.application;
import java.io.File;
-import org.apache.avalon.excalibur.i18n.ResourceManager;
-import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.excalibur.thread.ThreadPool;
import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.phoenix.BlockContext;
@@ -25,15 +21,10 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
final class DefaultBlockContext
- implements BlockContext, LogEnabled
+ implements BlockContext
{
- private static final Resources REZ =
- ResourceManager.getPackageResources( DefaultBlockContext.class );
-
private String m_name;
private ApplicationContext m_frame;
- private Logger m_logger;
- private boolean m_warningEmitted;
protected DefaultBlockContext( final String name, final
ApplicationContext frame )
{
@@ -41,11 +32,6 @@
m_frame = frame;
}
- public void enableLogging( final Logger logger )
- {
- m_logger = logger;
- }
-
public Object get( Object key )
throws ContextException
{
@@ -86,37 +72,6 @@
public String getName()
{
return m_name;
- }
-
- /**
- * Retrieve thread pool by category.
- * ThreadPools are given names so that you can manage different thread
- * count to different components.
- *
- * @param category the category
- * @return the ThreadPool
- */
- public ThreadPool getThreadPool( final String category )
- {
- if( !m_warningEmitted )
- {
- final String message = REZ.getString( "context.warn.threadpool",
getName() );
- m_logger.warn( message );
- System.err.println( message );
- m_warningEmitted = true;
- }
-
- return m_frame.getThreadPool( category );
- }
-
- /**
- * Retrieve the default thread pool.
- * Equivelent to getThreadPool( "default" );
- * @return the ThreadPool
- */
- public ThreadPool getDefaultThreadPool()
- {
- return getThreadPool( "default" );
}
/**
1.10 +0 -23
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/BlockContext.java
Index: BlockContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/BlockContext.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BlockContext.java 15 May 2002 11:44:33 -0000 1.9
+++ BlockContext.java 15 May 2002 12:05:31 -0000 1.10
@@ -8,7 +8,6 @@
package org.apache.avalon.phoenix;
import java.io.File;
-import org.apache.avalon.excalibur.thread.ThreadPool;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.logger.Logger;
@@ -41,28 +40,6 @@
* @return the name of block
*/
String getName();
-
- /**
- * Retrieve thread pool by category.
- * ThreadPools are given names so that you can manage different thread
- * count to different components.
- *
- * @param category the category
- * @return the ThreadManager
- * @deprecated Use ThreadManager service rather than
- * accessing ThreadPool via this method.
- */
- ThreadPool getThreadPool( String category );
-
- /**
- * Retrieve default thread pool.
- * Equivelent to getThreadPool( "default" );
- *
- * @return the default ThreadPool
- * @deprecated Use ThreadManager service rather than
- * accessing ThreadPool via this method.
- */
- ThreadPool getDefaultThreadPool();
/**
* Retrieve logger coresponding to named category.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
