avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From l...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util ContextManager.java ContextManagerConstants.java
Date Mon, 05 Aug 2002 04:40:40 GMT
leif        2002/08/04 21:40:40

  Modified:    fortress/examples ant.properties build.xml
               fortress/examples/src/java/org/apache/excalibur/fortress/examples/components
                        TranslatorImpl.java
               fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing
                        Main.java SwingContainer.xlog
               fortress/src/java/org/apache/excalibur/fortress
                        AbstractContainer.java
               fortress/src/java/org/apache/excalibur/fortress/handler
                        AbstractComponentHandler.java ComponentFactory.java
                        FactoryComponentHandler.java
                        PerThreadComponentHandler.java
                        PoolableComponentHandler.java
                        ThreadSafeComponentHandler.java
               fortress/src/java/org/apache/excalibur/fortress/util
                        ContextManager.java ContextManagerConstants.java
  Added:       fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing
                        SwingContainer.instruments
  Log:
  Bring fortress up to date with the latest version of the Wrapper.
  Also added Instrumentation support to the swing example application.
  
  Revision  Changes    Path
  1.6       +6 -0      jakarta-avalon-excalibur/fortress/examples/ant.properties
  
  Index: ant.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/examples/ant.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ant.properties	4 Aug 2002 01:07:39 -0000	1.5
  +++ ant.properties	5 Aug 2002 04:40:39 -0000	1.6
  @@ -8,6 +8,12 @@
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
  +# ----- Excalibur altrmi -----
  +excalibur-altrmi.home=${basepath}/../altrmi/dist
  +excalibur-altrmi-common.jar=${excalibur-altrmi.home}/excalibur-altrmi-common.jar
  +excalibur-altrmi-server-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-impl.jar
  +excalibur-altrmi-server-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-interfaces.jar
  +
   # ----- Excalibur collections, version 1.0 or later -----
   excalibur-collections.home=${basepath}/../collections/dist
   excalibur-collections.lib=${excalibur-collections.home}
  
  
  
  1.8       +24 -16    jakarta-avalon-excalibur/fortress/examples/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/examples/build.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- build.xml	2 Aug 2002 20:22:54 -0000	1.7
  +++ build.xml	5 Aug 2002 04:40:39 -0000	1.8
  @@ -53,6 +53,14 @@
           <copy file="${excalibur-sourceresolve.jar}"
               todir="${lib.dir}" preservelastmodified="yes"/>
   
  +        <!-- Excalibur Altrmi jars -->
  +        <copy file="${excalibur-altrmi-common.jar}"
  +            todir="${lib.dir}" preservelastmodified="yes"/>
  +        <copy file="${excalibur-altrmi-server-impl.jar}"
  +            todir="${lib.dir}" preservelastmodified="yes"/>
  +        <copy file="${excalibur-altrmi-server-interfaces.jar}"
  +            todir="${lib.dir}" preservelastmodified="yes"/>
  +        
           <!-- Excalibur Logger jar -->
           <copy file="${excalibur-logger.jar}"
               todir="${lib.dir}" preservelastmodified="yes"/>
  @@ -84,7 +92,7 @@
           <!-- Excalibur concurrent jar -->
           <copy file="${excalibur-concurrent.jar}"
               todir="${lib.dir}" preservelastmodified="yes"/>
  -	    
  +        
           <!-- Excalibur util jar -->
           <copy file="${excalibur-util.jar}"
               todir="${lib.dir}" preservelastmodified="yes"/>
  @@ -189,7 +197,7 @@
               <include name="**/*.java"/>
               <exclude name="**/servlet/*.java" unless="servlet.present"/>
           </javac>
  -	
  +    
           <!-- copy resources to same location as .class files -->
           <copy todir="${build.classes.dir}">
               <fileset dir="${src.java.dir}">
  @@ -210,20 +218,20 @@
       
       <target name="webapp" depends="jar">
       
  -    	<mkdir dir="${build.dir}/servlet"/>
  -	<mkdir dir="${build.dir}/servlet/WEB-INF"/>
  -	<mkdir dir="${build.dir}/servlet/WEB-INF/lib"/>
  -	
  -	<copy todir="${build.dir}/servlet/WEB-INF/lib">
  -	    <fileset dir="${lib.dir}">
  -	        <include name="*.jar"/>
  -		<exclude name="servlet*"/>
  -	    </fileset>
  -	</copy>
  -	
  -	<copy todir="${build.dir}/servlet/WEB-INF"
  -	      file="conf/web.xml"/>
  -	      
  +        <mkdir dir="${build.dir}/servlet"/>
  +    <mkdir dir="${build.dir}/servlet/WEB-INF"/>
  +    <mkdir dir="${build.dir}/servlet/WEB-INF/lib"/>
  +    
  +    <copy todir="${build.dir}/servlet/WEB-INF/lib">
  +        <fileset dir="${lib.dir}">
  +         <include name="*.jar"/>
  +        <exclude name="servlet*"/>
  +        </fileset>
  +    </copy>
  +    
  +    <copy todir="${build.dir}/servlet/WEB-INF"
  +          file="conf/web.xml"/>
  +          
       </target>
   
       <!-- =================================================================== -->
  
  
  
  1.2       +19 -2     jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/components/TranslatorImpl.java
  
  Index: TranslatorImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/components/TranslatorImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TranslatorImpl.java	4 Jul 2002 09:43:24 -0000	1.1
  +++ TranslatorImpl.java	5 Aug 2002 04:40:39 -0000	1.2
  @@ -11,6 +11,9 @@
   import java.util.Map;
   import java.util.Set;
   
  +import org.apache.excalibur.instrument.AbstractLogEnabledInstrumentable;
  +import org.apache.excalibur.instrument.CounterInstrument;
  +
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
  @@ -37,11 +40,22 @@
    * @author <a href="mailto:crafterm@apache.org">Marcus Crafter</a>
    * @version CVS $Revision$ $Date$
    */
  -public class TranslatorImpl extends AbstractLogEnabled
  +public class TranslatorImpl extends AbstractLogEnabledInstrumentable
       implements Translator, Configurable
   {
  +    // Instrument to count the number of translations performed
  +    private CounterInstrument m_translationsInstrument;
  +    
       // internal store of translation mappings
       private Map m_keys = new HashMap();
  +    
  +    /**
  +     * Create a new TranslatorImpl.
  +     */
  +    public TranslatorImpl()
  +    {
  +        addInstrument( m_translationsInstrument = new CounterInstrument( "translations"
) );
  +    }
   
       /**
        * Configures this component. Reads configuration information
  @@ -121,6 +135,9 @@
        */
       public String getTranslation( String key, String language )
       {
  +        // Notify the Instrument Manager
  +        m_translationsInstrument.increment();
  +        
           Map translationMap = ( Map ) m_keys.get( key );
           return ( String ) translationMap.get( language );
       }
  
  
  
  1.2       +2 -1      jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing/Main.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Main.java	4 Jul 2002 12:06:57 -0000	1.1
  +++ Main.java	5 Aug 2002 04:40:39 -0000	1.2
  @@ -47,6 +47,7 @@
           contextBuilder.setContainerConfiguration( "resource://org/apache/excalibur/fortress/examples/swing/SwingContainer.xconf"
);
           contextBuilder.setLoggerManagerConfiguration( "resource://org/apache/excalibur/fortress/examples/swing/SwingContainer.xlog"
);
           contextBuilder.setRoleManagerConfiguration( "resource://org/apache/excalibur/fortress/examples/swing/SwingContainer.roles"
);
  +        contextBuilder.setInstrumentManagerConfiguration( "resource://org/apache/excalibur/fortress/examples/swing/SwingContainer.instruments"
);
   
           ContextManager contextManager = new ContextManager( contextBuilder.getContext(),
null );
           contextManager.initialize();
  
  
  
  1.2       +1 -1      jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing/SwingContainer.xlog
  
  Index: SwingContainer.xlog
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing/SwingContainer.xlog,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SwingContainer.xlog	4 Jul 2002 09:43:24 -0000	1.1
  +++ SwingContainer.xlog	5 Aug 2002 04:40:39 -0000	1.2
  @@ -7,7 +7,7 @@
          <file id="root">
           <filename>fortress-examples.log</filename>
           <format type="extended">
  -          %7.7{priority} %5.5{time}   [%8.8{category}] (%{context}): %{message}\n%{throwable}
  +          %7.7{priority} %5.5{time}   [%16.16{category}] (%{context}): %{message}\n%{throwable}
           </format>
          </file>
        </targets>
  
  
  
  1.1                  jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing/SwingContainer.instruments
  
  Index: SwingContainer.instruments
  ===================================================================
  <instrument logger="im">
      <name>SwingContainer</name>
      <description>Fortress SwingContainer Example</description>
      
      <connectors>
          <connector class="altrmi" port="15555"/>
      </connectors>
      
      <state-file interval="60000" use-compact-samples="true">
          SwingContainer.sampledata
      </state-file>
      
      <instrumentables>
          <instrumentable name="instrument-manager" description="Instrument Manager">
              <instrument name="active-thread-count" description="Active Thread Count">
                  <sample type="max" interval="1000" size="600" description="Maximum each
second."/>
              </instrument>
              
              <instrument name="total-memory" description="Total Memory">
                  <sample type="max" interval="1000" size="600" description="Maximum each
second."/>
              </instrument>
              
              <instrument name="free-memory" description="Free Memory">
                  <sample type="min" interval="1000" size="600" description="Minimum each
second."/>
              </instrument>
              
              <instrument name="memory" description="In-Use Memory">
                  <sample type="max" interval="1000" size="600" description="Maximum each
second."/>
              </instrument>
          </instrumentable>
      </instrumentables>
  </instrument>
  
  
  1.52      +13 -1     jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/AbstractContainer.java
  
  Index: AbstractContainer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/AbstractContainer.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- AbstractContainer.java	31 Jul 2002 20:23:50 -0000	1.51
  +++ AbstractContainer.java	5 Aug 2002 04:40:40 -0000	1.52
  @@ -12,6 +12,8 @@
   import java.util.Iterator;
   import java.util.List;
   
  +import org.apache.excalibur.instrument.Instrumentable;
  +import org.apache.excalibur.instrument.InstrumentManager;
   import org.apache.avalon.excalibur.collections.BucketMap;
   import org.apache.avalon.excalibur.collections.FixedSizeBuffer;
   import org.apache.avalon.excalibur.logger.LoggerManager;
  @@ -60,6 +62,7 @@
       protected Queue m_commandQueue;
       protected ClassLoader m_classLoader;
       protected RoleManager m_roleManager;
  +    protected InstrumentManager m_instrumentManager;
       protected Configuration m_configuration;
       protected BucketMap m_configs = new BucketMap();
       protected BucketMap m_mapper = new BucketMap();
  @@ -129,6 +132,8 @@
           {
               m_roleManager = new ExcaliburRoleManager();
           }
  +        
  +        m_instrumentManager = (InstrumentManager)m_context.get( Container.INSTRUMENT_MANAGER
);
       }
   
       /**
  @@ -243,6 +248,13 @@
                   m_extManager,
                   new Boolean( isLazy )
               } );
  +            
  +            if ( handler instanceof Instrumentable )
  +            {
  +                Instrumentable instrumentable = (Instrumentable)handler;
  +                m_instrumentManager.registerInstrumentable(
  +                    instrumentable, instrumentable.getInstrumentableName() );
  +            }
           }
           catch( final Exception e )
           {
  
  
  
  1.11      +11 -28    jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/AbstractComponentHandler.java
  
  Index: AbstractComponentHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/AbstractComponentHandler.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- AbstractComponentHandler.java	30 Jul 2002 14:15:42 -0000	1.10
  +++ AbstractComponentHandler.java	5 Aug 2002 04:40:40 -0000	1.11
  @@ -7,8 +7,10 @@
    */
   package org.apache.excalibur.fortress.handler;
   
  +import org.apache.excalibur.instrument.AbstractInstrumentable;
   import org.apache.excalibur.instrument.Instrument;
  -import org.apache.excalibur.instrument.Instrumentable;
  +import org.apache.excalibur.instrument.InstrumentManager;
  +
   import org.apache.avalon.excalibur.logger.LoggerManager;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.configuration.Configuration;
  @@ -28,13 +30,12 @@
    * @since 4.0
    */
   public abstract class AbstractComponentHandler
  -    implements ComponentHandler, Disposable, Instrumentable
  +    extends AbstractInstrumentable
  +    implements ComponentHandler, Disposable
   {
       /** The instance of the ComponentFactory that creates and disposes of the Component
*/
       protected final ComponentFactory m_factory;
   
  -    protected String m_name;
  -
       /** State management boolean stating whether the Handler is initialized or not */
       protected boolean m_initialized = false;
   
  @@ -67,7 +68,11 @@
           throws Exception
       {
           m_logkit = (LoggerManager)context.get( Container.LOGGER_MANAGER );
  -        m_factory = new ComponentFactory( componentClass, config, service, context, m_logkit,
extManager );
  +        InstrumentManager instrumentManager =
  +            (InstrumentManager)context.get( Container.INSTRUMENT_MANAGER );
  +        m_factory = new ComponentFactory( componentClass, config, service, context, m_logkit,
  +            extManager, instrumentManager );
  +        addChildInstrumentable( m_factory );
           m_context = context;
           m_isLazy = isLazy.booleanValue();
       }
  @@ -146,28 +151,6 @@
           }
   
           m_disposed = true;
  -    }
  -
  -    public final void setInstrumentableName( String name )
  -    {
  -        m_name = name;
  -    }
  -
  -    public final String getInstrumentableName()
  -    {
  -        return m_name;
  -    }
  -
  -    public final Instrument[] getInstruments()
  -    {
  -        return Instrumentable.EMPTY_INSTRUMENT_ARRAY;
  -    }
  -
  -    public final Instrumentable[] getChildInstrumentables()
  -    {
  -        return new Instrumentable[]{
  -            m_factory
  -        };
       }
   
       public String toString()
  
  
  
  1.20      +35 -5     jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ComponentFactory.java
  
  Index: ComponentFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ComponentFactory.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ComponentFactory.java	30 Jul 2002 14:15:42 -0000	1.19
  +++ ComponentFactory.java	5 Aug 2002 04:40:40 -0000	1.20
  @@ -10,6 +10,9 @@
   import org.apache.excalibur.instrument.CounterInstrument;
   import org.apache.excalibur.instrument.Instrument;
   import org.apache.excalibur.instrument.Instrumentable;
  +import org.apache.excalibur.instrument.InstrumentManageable;
  +import org.apache.excalibur.instrument.InstrumentManager;
  +
   import org.apache.avalon.excalibur.logger.LoggerManager;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.container.ContainerUtil;
  @@ -20,6 +23,7 @@
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.avalon.framework.thread.ThreadSafe;
  +
   import org.apache.excalibur.fortress.lifecycle.LifecycleExtensionManager;
   import org.apache.excalibur.fortress.lookup.ServiceComponentManager;
   import org.apache.excalibur.mpool.ObjectFactory;
  @@ -38,6 +42,11 @@
       private CounterInstrument m_newInstance;
       private CounterInstrument m_dispose;
   
  +    /**
  +     * Name of the Instrumentable.  Maps to the id of the component in the configuration.
  +     */
  +    private String m_instrumentableName;
  +    
       /** The class which this <code>ComponentFactory</code>
        * should create.
        */
  @@ -66,6 +75,10 @@
       /** Lifecycle extensions manager
        */
       private final LifecycleExtensionManager m_extManager;
  +    
  +    /** InstrumentManager
  +     */
  +    private final InstrumentManager m_instrumentManager;
   
       /**
        * Construct a new component factory for the specified component.
  @@ -82,7 +95,8 @@
                                final ServiceManager serviceManager,
                                final Context context,
                                final LoggerManager logkit,
  -                             final LifecycleExtensionManager extManager )
  +                             final LifecycleExtensionManager extManager,
  +                             final InstrumentManager instrumentManager )
       {
           m_componentClass = componentClass;
           m_configuration = configuration;
  @@ -91,9 +105,11 @@
           m_logManager = logkit;
           m_extManager = extManager;
           m_logger = m_logManager.getLoggerForCategory( "system.factory" );
  +        m_instrumentManager = instrumentManager;
  +        m_instrumentableName = configuration.getAttribute( "id", componentClass.getName()
);
   
  -        m_newInstance = new CounterInstrument( "Create " + getInstrumentableName() );
  -        m_dispose = new CounterInstrument( "Destroy " + getInstrumentableName() );
  +        m_newInstance = new CounterInstrument( "creates" );
  +        m_dispose = new CounterInstrument( "destroys" );
       }
   
       public Object newInstance()
  @@ -121,6 +137,11 @@
                   ( (LogEnabled)component ).enableLogging( m_logManager.getLoggerForCategory(
logger ) );
               }
           }
  +        
  +        if( component instanceof InstrumentManageable )
  +        {
  +            ( (InstrumentManageable)component ).setInstrumentManager( m_instrumentManager
);
  +        }
   
           ContainerUtil.contextualize( component, m_context );
           ContainerUtil.compose( component, new ServiceComponentManager( m_serviceManager
));
  @@ -136,6 +157,15 @@
           m_extManager.executeCreationExtensions( component, m_context );
   
           ContainerUtil.initialize( component );
  +        
  +        if( component instanceof Instrumentable )
  +        {
  +            Instrumentable instrumentable = (Instrumentable)component;
  +            instrumentable.setInstrumentableName( m_instrumentableName );
  +            m_instrumentManager.registerInstrumentable(
  +                (Instrumentable)component, m_instrumentableName );
  +        }
  +        
           ContainerUtil.start( component );
   
           if( m_newInstance.isActive() )
  @@ -184,7 +214,7 @@
   
       public final String getInstrumentableName()
       {
  -        return getCreatedClass().getName();
  +        return m_instrumentableName;
       }
   
       public final Instrument[] getInstruments()
  
  
  
  1.22      +2 -2      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/FactoryComponentHandler.java
  
  Index: FactoryComponentHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/FactoryComponentHandler.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- FactoryComponentHandler.java	26 Jul 2002 06:38:27 -0000	1.21
  +++ FactoryComponentHandler.java	5 Aug 2002 04:40:40 -0000	1.22
  @@ -39,7 +39,7 @@
       {
           super( componentClass, config, service, context, extManager, isLazy );
           m_logger = m_logkit.getLoggerForCategory( "system.handler.factory" );
  -        m_name = "FactoryComponentHandler";
  +        setInstrumentableName( "FactoryComponentHandler" );
       }
   
       /**
  
  
  
  1.23      +3 -3      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/PerThreadComponentHandler.java
  
  Index: PerThreadComponentHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/PerThreadComponentHandler.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- PerThreadComponentHandler.java	26 Jul 2002 06:38:27 -0000	1.22
  +++ PerThreadComponentHandler.java	5 Aug 2002 04:40:40 -0000	1.23
  @@ -42,7 +42,7 @@
           super( componentClass, config, service, context, extManager, isLazy );
           m_instance = new ThreadLocalComponent( m_factory );
           m_logger = m_logkit.getLoggerForCategory( "system.handler.perthread" );
  -        m_name = "PerThreadComponentHandler";
  +        setInstrumentableName( "PerThreadComponentHandler" );
       }
   
       /**
  @@ -79,7 +79,7 @@
       {
           super.get();
   
  -	return m_instance.get();
  +    return m_instance.get();
       }
   
       /**
  
  
  
  1.26      +3 -3      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/PoolableComponentHandler.java
  
  Index: PoolableComponentHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/PoolableComponentHandler.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- PoolableComponentHandler.java	26 Jul 2002 06:38:27 -0000	1.25
  +++ PoolableComponentHandler.java	5 Aug 2002 04:40:40 -0000	1.26
  @@ -53,7 +53,7 @@
           m_poolMin = config.getAttributeAsInteger( "pool-min", 10 );
           m_logger = m_logkit.getLoggerForCategory( "system.handler.poolable" );
           m_poolManager = (PoolManager)context.get( Container.POOL_MANAGER );
  -        m_name = "PoolableComponentHandler";
  +        setInstrumentableName( "PoolableComponentHandler" );
       }
   
       /**
  @@ -85,7 +85,7 @@
       {
           super.get();
   
  -	return m_pool.acquire();
  +    return m_pool.acquire();
       }
   
       /**
  
  
  
  1.23      +2 -2      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ThreadSafeComponentHandler.java
  
  Index: ThreadSafeComponentHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ThreadSafeComponentHandler.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- ThreadSafeComponentHandler.java	26 Jul 2002 06:38:27 -0000	1.22
  +++ ThreadSafeComponentHandler.java	5 Aug 2002 04:40:40 -0000	1.23
  @@ -43,7 +43,7 @@
       {
           super( componentClass, config, service, context, extManager, isLazy );
           m_logger = m_logkit.getLoggerForCategory( "system.handler.threadsafe" );
  -        m_name = "ThreadSafeComponentHandler";
  +        setInstrumentableName( "ThreadSafeComponentHandler" );
       }
   
       /**
  
  
  
  1.27      +3 -3      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.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- ContextManager.java	30 Jul 2002 14:15:42 -0000	1.26
  +++ ContextManager.java	5 Aug 2002 04:40:40 -0000	1.27
  @@ -665,7 +665,7 @@
       {
           try
           {
  -            // Try copying an already existing logger manager from the override context.
  +            // Try copying an already existing instrument manager from the override context.
   
               childContext.put( INSTRUMENT_MANAGER, rootContext.get( INSTRUMENT_MANAGER )
);
           }
  @@ -692,7 +692,7 @@
                   profilerConfig = EMPTY_CONFIG;
               }
   
  -            DefaultInstrumentManager instrumentManager = new DefaultInstrumentManager(
INSTRUMENT_MANAGER_NAME );
  +            DefaultInstrumentManager instrumentManager = new DefaultInstrumentManager();
               instrumentManager.enableLogging( getLogger() );
               instrumentManager.configure( profilerConfig );
               instrumentManager.initialize();
  
  
  
  1.8       +1 -2      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManagerConstants.java
  
  Index: ContextManagerConstants.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManagerConstants.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ContextManagerConstants.java	25 Jun 2002 13:39:37 -0000	1.7
  +++ ContextManagerConstants.java	5 Aug 2002 04:40:40 -0000	1.8
  @@ -22,7 +22,6 @@
       String LOGGER_MANAGER_CONFIGURATION = "container.logManager.config";
       String LOGGER_MANAGER_CONFIGURATION_URI = "container.logManager.config.uri";
   
  -    String INSTRUMENT_MANAGER_NAME = "container.instrumentManager";
       String INSTRUMENT_MANAGER_CONFIGURATION = "container.instrumentManager.config";
       String INSTRUMENT_MANAGER_CONFIGURATION_URI = "container.instrumentManager.config.uri";
   
  
  
  

--
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