bloritsch 2002/09/30 09:21:36
Modified: fortress/src/java/org/apache/excalibur/fortress/util
ContextManager.java
Log:
make fortress compile again
Revision Changes Path
1.41 +6 -11
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManager.java
Index: ContextManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManager.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ContextManager.java 27 Sep 2002 19:40:16 -0000 1.40
+++ ContextManager.java 30 Sep 2002 16:21:36 -0000 1.41
@@ -55,9 +55,7 @@
import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.excalibur.logger.LogKitLoggerManager;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.DefaultComponentManager;
import org.apache.avalon.framework.component.DefaultComponentSelector;
@@ -76,7 +74,7 @@
import org.apache.avalon.framework.service.DefaultServiceManager;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.excalibur.event.Queue;
+import org.apache.excalibur.event.Sink;
import org.apache.excalibur.event.command.CommandManager;
import org.apache.excalibur.event.command.ThreadManager;
import org.apache.excalibur.event.command.TPCThreadManager;
@@ -186,9 +184,6 @@
* Create a new ContextManager.
*
* @param rootContext the default values.
- * @param overrides values to be overridden in the root context. This
- * parameter is typically created with a
- * ContextBuilder.
* @param logger logger to use when creating new components.
*/
public ContextManager( Context rootContext, Logger logger )
@@ -216,7 +211,7 @@
*
* FIXME: We should throw a NullPointerException instead.
*
- * @param object The object being claimed
+ * @param o The object being claimed
*
* @throws IllegalArgumentException if the object is null.
*/
@@ -432,7 +427,7 @@
}
// No CommandQueue specified, create a default one
- childContext.put( COMMAND_QUEUE, createCommandQueue() );
+ childContext.put( COMMAND_QUEUE, createCommandSink() );
}
/**
@@ -441,7 +436,7 @@
* @return a default <code>CommandQueue</code>
* @throws Exception if an error occurs
*/
- private Queue createCommandQueue() throws Exception
+ private Sink createCommandSink() throws Exception
{
final CommandManager cm = new CommandManager();
final ThreadManager tm = new TPCThreadManager();
@@ -526,7 +521,7 @@
{
}
- PoolManager pm = new DefaultPoolManager( (Queue)childContext.get(
COMMAND_QUEUE ) );
+ PoolManager pm = new DefaultPoolManager( (Sink)childContext.get(
COMMAND_QUEUE ) );
assumeOwnership( pm );
childContext.put( POOL_MANAGER, pm );
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
