Return-Path: Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org Received: (qmail 84479 invoked from network); 10 Nov 2002 11:56:48 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 10 Nov 2002 11:56:48 -0000 Received: (qmail 10518 invoked by uid 97); 10 Nov 2002 11:57:43 -0000 Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org Received: (qmail 10502 invoked by uid 97); 10 Nov 2002 11:57:43 -0000 Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Avalon CVS List" Reply-To: "Avalon Developers List" Delivered-To: mailing list avalon-cvs@jakarta.apache.org Received: (qmail 10491 invoked by uid 97); 10 Nov 2002 11:57:42 -0000 X-Antivirus: nagoya (v4218 created Aug 14 2002) Date: 10 Nov 2002 11:56:44 -0000 Message-ID: <20021110115644.56761.qmail@icarus.apache.org> From: donaldp@apache.org To: jakarta-avalon-excalibur-cvs@apache.org Subject: cvs commit: jakarta-avalon-excalibur/fortress/src/ng/org/apache/excalibur/fortress/container MetaDataContainer.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N 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: For additional commands, e-mail: