avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system AbstractContainer.java
Date Thu, 07 Feb 2002 16:50:51 GMT
bloritsch    02/02/07 08:50:50

  Modified:    src/scratchpad/org/apache/avalon/excalibur/system
                        AbstractContainer.java
  Log:
  change package access on some key pieces so that I can use them in my Containers that extend
AbstractContainer, and addes some logging queues
  
  Revision  Changes    Path
  1.12      +32 -5     jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system/AbstractContainer.java
  
  Index: AbstractContainer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system/AbstractContainer.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- AbstractContainer.java	6 Feb 2002 22:21:12 -0000	1.11
  +++ AbstractContainer.java	7 Feb 2002 16:50:50 -0000	1.12
  @@ -36,7 +36,7 @@
    * Manager can expose that to the instantiating class.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.11 $ $Date: 2002/02/06 22:21:12 $
  + * @version CVS $Revision: 1.12 $ $Date: 2002/02/07 16:50:50 $
    */
   public abstract class AbstractContainer
      extends AbstractLogEnabled
  @@ -46,7 +46,7 @@
   
       protected Context                m_context;
       private   ComponentManager       m_manager;
  -    private   ComponentManager       m_childManager;
  +    protected ComponentManager       m_childManager;
       protected LoggerManager          m_logManager;
       protected PoolManager            m_poolManager;
       protected Queue                  m_commandQueue;
  @@ -228,6 +228,12 @@
                                             handler);
               }
           }
  +
  +        if ( getLogger().isDebugEnabled() )
  +        {
  +            getLogger().debug( "Assigned handler " + handler.getClass().getName() +
  +                               " to role " + role );
  +        }
       }
   
       /**
  @@ -237,6 +243,11 @@
           throws ConfigurationException
       {
           managerMap.put( role, selector );
  +
  +        if ( getLogger().isDebugEnabled() )
  +        {
  +            getLogger().debug( "Assigned ComponentSelector to role " + role );
  +        }
       }
   
       /**
  @@ -267,6 +278,12 @@
               }
           }
   
  +        if ( getLogger().isDebugEnabled() )
  +        {
  +            getLogger().debug( "Component " + klass.getName() +
  +                               " uses handler " + handlerKlass.getName() );
  +        }
  +
           return handler;
       }
   
  @@ -393,7 +410,7 @@
            * This constructor is for a ContainerComponentManager with no parent
            * ComponentManager
            */
  -        protected ContainerComponentManager( Map componentMap )
  +        public ContainerComponentManager( Map componentMap )
           {
               this( componentMap, null );
           }
  @@ -402,7 +419,7 @@
            * This constructor is for a ContainerComponentManager with a parent
            * ComponentManager
            */
  -        protected ContainerComponentManager( Map componentMap, ComponentManager parent
)
  +        public ContainerComponentManager( Map componentMap, ComponentManager parent )
           {
               m_parent = null;
               m_components = componentMap;
  @@ -504,7 +521,7 @@
           private final Map m_components;
           private final Map m_used;
   
  -        protected ContainerComponentSelector( Map selectorMap )
  +        public ContainerComponentSelector( Map selectorMap )
           {
               m_components = selectorMap;
               m_used = new HashMap( m_components.size() );
  @@ -594,6 +611,11 @@
                   if ( ! m_handler.isInitialized() )
                   {
                       m_handler.initialize();
  +
  +                    if ( m_logger.isDebugEnabled() )
  +                    {
  +                        m_logger.debug( "Initialized Handler " + m_handler );
  +                    }
                   }
               }
               catch ( Exception e )
  @@ -625,6 +647,11 @@
           public void execute()
           {
               m_handler.dispose();
  +
  +            if ( m_logger.isDebugEnabled() )
  +            {
  +                m_logger.debug( "Disposed of Handler " + m_handler );
  +            }
           }
       }
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message