donaldp 2002/11/10 03:56:44
Modified: fortress/src/ng/org/apache/excalibur/fortress/container
MetaDataContainer.java
Log:
Resync with latest changes.
Revision Changes Path
1.4 +7 -7
jakarta-avalon-excalibur/fortress/src/ng/org/apache/excalibur/fortress/container/MetaDataContainer.java
Index: MetaDataContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/ng/org/apache/excalibur/fortress/container/MetaDataContainer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MetaDataContainer.java 9 Nov 2002 23:25:44 -0000 1.3
+++ MetaDataContainer.java 10 Nov 2002 11:56:44 -0000 1.4
@@ -149,13 +149,13 @@
m_jarEntries.merge( ( (ComponentClassLoader)m_loader ).getEntries() );
}
- m_logManager = (LoggerManager)m_context.get(
ContainerConstants.LOGGER_MANAGER );
- m_poolManager = (PoolManager)m_context.get( ContainerConstants.POOL_MANAGER
);
+ m_logManager = (LoggerManager)m_context.get( LoggerManager.ROLE );
+ m_poolManager = (PoolManager)m_context.get( PoolManager.ROLE );
try
{
m_extManager =
- (LifecycleExtensionManager)m_context.get(
ContainerConstants.EXTENSION_MANAGER );
+ (LifecycleExtensionManager)m_context.get(
LifecycleExtensionManager.ROLE );
}
catch( ContextException ce )
{
@@ -163,7 +163,7 @@
if( getLogger().isDebugEnabled() )
{
- getLogger().debug( "No Container.EXTENSION_MANAGER is given,
installing default "
+ getLogger().debug( "No Container.LIFECYCLE_EXTENSION_MANAGER is
given, installing default "
+ "lifecycle extension manager with 0
extensions" );
}
}
@@ -172,7 +172,7 @@
try
{
- m_commandQueue = (Queue)m_context.get( ContainerConstants.COMMAND_QUEUE
);
+ m_commandQueue = (Queue)m_context.get( Queue.ROLE );
m_commandQueue.enqueue( new CheckTypeInfoCommand( m_jarEntries,
m_services, m_types,
m_loader, this,
@@ -188,7 +188,7 @@
getLogger().error( "The CommandQueue is unable to enqueue the command",
se );
}
- m_instrumentManager = (InstrumentManager)m_context.get(
ContainerConstants.INSTRUMENT_MANAGER );
+ m_instrumentManager = (InstrumentManager)m_context.get(
InstrumentManager.ROLE );
}
public void service( ServiceManager manager ) throws ServiceException
--
To unsubscribe, e-mail: <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>
