avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util FortressConfig.java
Date Sun, 10 Nov 2002 16:20:49 GMT
donaldp     2002/11/10 08:20:49

  Modified:    fortress/src/java/org/apache/excalibur/fortress/util
                        FortressConfig.java
  Log:
  Naming conventions
  
  Revision  Changes    Path
  1.2       +48 -48    jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/FortressConfig.java
  
  Index: FortressConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/FortressConfig.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FortressConfig.java	10 Nov 2002 16:18:23 -0000	1.1
  +++ FortressConfig.java	10 Nov 2002 16:20:49 -0000	1.2
  @@ -63,14 +63,14 @@
   import org.apache.excalibur.mpool.PoolManager;
   
   /**
  - * Helper class to create a context for the ContextManager.
  + * Helper class to create a m_context for the ContextManager.
    */
   public class FortressConfig
   {
  -    private final DefaultContext context;
  +    private final DefaultContext m_context;
   
       /**
  -     * Creates a context builder and initializes it with default values.
  +     * Creates a m_context builder and initializes it with default values.
        * The default values are:
        *
        * <ul>
  @@ -80,7 +80,7 @@
        * <li>CONTEXT_DIRECTORY = "../"</li>
        * <li>WORK_DIRECTORY = "/tmp"</li>
        * <li>LOG_CATEGORY = "fortress"</li>
  -     * <li>CONTEXT_CLASSLOADER = the thread context class loader</li>
  +     * <li>CONTEXT_CLASSLOADER = the thread m_context class loader</li>
        * </ul>
        */
       public FortressConfig()
  @@ -89,17 +89,17 @@
       }
   
       /**
  -     * Creates a context builder and initializes it with default values.
  +     * Creates a m_context builder and initializes it with default values.
        *
  -     * @param parent parent context with default values.
  +     * @param parent parent m_context with default values.
        */
       public FortressConfig( Context parent )
       {
  -        context = new OverridableContext( parent );
  +        m_context = new OverridableContext( parent );
       }
   
       /**
  -     * Creates a default context.
  +     * Creates a default m_context.
        */
       public static final Context createDefaultConfig()
       {
  @@ -107,7 +107,7 @@
       }
   
       /**
  -     * Creates a default context.
  +     * Creates a default m_context.
        */
       public static final Context createDefaultConfig( ClassLoader classLoader )
       {
  @@ -140,27 +140,27 @@
       }
   
       /**
  -     * Finalizes the context and returns it.
  +     * Finalizes the m_context and returns it.
        */
       public Context getContext()
       {
  -        context.makeReadOnly();
  -        return context;
  +        m_context.makeReadOnly();
  +        return m_context;
       }
   
       public void setCommandQueue( final Queue commandQueue )
       {
  -        context.put( Queue.ROLE, commandQueue );
  +        m_context.put( Queue.ROLE, commandQueue );
       }
   
       public void setServiceManagerParent( final ServiceManager serviceManager )
       {
  -        context.put( ContextManagerConstants.SERVICE_MANAGER_PARENT, serviceManager );
  +        m_context.put( ContextManagerConstants.SERVICE_MANAGER_PARENT, serviceManager );
       }
   
       public void setServiceManager( final ServiceManager componentManager )
       {
  -        context.put( ContextManagerConstants.SERVICE_MANAGER, componentManager );
  +        m_context.put( ContextManagerConstants.SERVICE_MANAGER, componentManager );
       }
   
       public void setContainerClass( final String containerClass )
  @@ -169,133 +169,133 @@
           ClassLoader classLoader = null;
           try
           {
  -            classLoader = (ClassLoader)context.get( ClassLoader.class.getName() );
  +            classLoader = (ClassLoader)m_context.get( ClassLoader.class.getName() );
           }
           catch( ContextException ce )
           {
               classLoader = Thread.currentThread().getContextClassLoader();
           }
   
  -        context.put( ContextManagerConstants.CONTAINER_CLASS, classLoader.loadClass( containerClass
) );
  +        m_context.put( ContextManagerConstants.CONTAINER_CLASS, classLoader.loadClass(
containerClass ) );
       }
   
       public void setContainerClass( final Class containerClass )
       {
  -        context.put( ContextManagerConstants.CONTAINER_CLASS, containerClass );
  +        m_context.put( ContextManagerConstants.CONTAINER_CLASS, containerClass );
       }
   
       public void setContainerConfiguration( final Configuration config )
       {
  -        context.put( ContextManagerConstants.CONFIGURATION, config );
  -        context.put( ContextManagerConstants.CONFIGURATION_URI, null );
  +        m_context.put( ContextManagerConstants.CONFIGURATION, config );
  +        m_context.put( ContextManagerConstants.CONFIGURATION_URI, null );
       }
   
       public void setContainerConfiguration( final String location )
       {
  -        context.put( ContextManagerConstants.CONFIGURATION_URI, location );
  +        m_context.put( ContextManagerConstants.CONFIGURATION_URI, location );
       }
   
       public void setAssemblyConfiguration( final Configuration config )
       {
  -        context.put( ContextManagerConstants.ASSEMBLY_CONFIGURATION, config );
  -        context.put( ContextManagerConstants.ASSEMBLY_CONFIGURATION_URI, null );
  +        m_context.put( ContextManagerConstants.ASSEMBLY_CONFIGURATION, config );
  +        m_context.put( ContextManagerConstants.ASSEMBLY_CONFIGURATION_URI, null );
       }
   
       public void setAssemblyConfiguration( final String location )
       {
  -        context.put( ContextManagerConstants.ASSEMBLY_CONFIGURATION_URI, location );
  +        m_context.put( ContextManagerConstants.ASSEMBLY_CONFIGURATION_URI, location );
       }
   
       public void setContextClassLoader( final ClassLoader loader )
       {
  -        context.put( ClassLoader.class.getName(), loader );
  +        m_context.put( ClassLoader.class.getName(), loader );
       }
   
       public void setContextDirectory( final File file )
       {
  -        context.put( ContextManagerConstants.CONTEXT_DIRECTORY, file );
  +        m_context.put( ContextManagerConstants.CONTEXT_DIRECTORY, file );
       }
   
       public void setContextDirectory( final String directory )
       {
  -        context.put( ContextManagerConstants.CONTEXT_DIRECTORY, new File( directory ) );
  +        m_context.put( ContextManagerConstants.CONTEXT_DIRECTORY, new File( directory )
);
       }
   
       public void setLoggerCategory( final String category )
       {
  -        context.put( ContextManagerConstants.LOG_CATEGORY, category );
  +        m_context.put( ContextManagerConstants.LOG_CATEGORY, category );
       }
   
       public void setLoggerManager( final LoggerManager logManager )
       {
  -        context.put( LoggerManager.ROLE, logManager );
  -        context.put( ContextManagerConstants.LOGGER_MANAGER_CONFIGURATION, null );
  -        context.put( ContextManagerConstants.LOGGER_MANAGER_CONFIGURATION_URI, null );
  +        m_context.put( LoggerManager.ROLE, logManager );
  +        m_context.put( ContextManagerConstants.LOGGER_MANAGER_CONFIGURATION, null );
  +        m_context.put( ContextManagerConstants.LOGGER_MANAGER_CONFIGURATION_URI, null );
       }
   
       public void setLoggerManagerConfiguration( final Configuration config )
       {
  -        context.put( ContextManagerConstants.LOGGER_MANAGER_CONFIGURATION, config );
  -        context.put( ContextManagerConstants.LOGGER_MANAGER_CONFIGURATION_URI, null );
  +        m_context.put( ContextManagerConstants.LOGGER_MANAGER_CONFIGURATION, config );
  +        m_context.put( ContextManagerConstants.LOGGER_MANAGER_CONFIGURATION_URI, null );
       }
   
       public void setLoggerManagerConfiguration( final String location )
       {
  -        context.put( ContextManagerConstants.LOGGER_MANAGER_CONFIGURATION_URI, location
);
  +        m_context.put( ContextManagerConstants.LOGGER_MANAGER_CONFIGURATION_URI, location
);
       }
   
       public void setInstrumentManager( final InstrumentManager profiler )
       {
  -        context.put( InstrumentManager.ROLE, profiler );
  -        context.put( ContextManagerConstants.INSTRUMENT_MANAGER_CONFIGURATION, null );
  -        context.put( ContextManagerConstants.INSTRUMENT_MANAGER_CONFIGURATION_URI, null
);
  +        m_context.put( InstrumentManager.ROLE, profiler );
  +        m_context.put( ContextManagerConstants.INSTRUMENT_MANAGER_CONFIGURATION, null );
  +        m_context.put( ContextManagerConstants.INSTRUMENT_MANAGER_CONFIGURATION_URI, null
);
       }
   
       public void setInstrumentManagerConfiguration( final Configuration config )
       {
  -        context.put( ContextManagerConstants.INSTRUMENT_MANAGER_CONFIGURATION, config );
  -        context.put( ContextManagerConstants.INSTRUMENT_MANAGER_CONFIGURATION_URI, null
);
  +        m_context.put( ContextManagerConstants.INSTRUMENT_MANAGER_CONFIGURATION, config
);
  +        m_context.put( ContextManagerConstants.INSTRUMENT_MANAGER_CONFIGURATION_URI, null
);
       }
   
       public void setInstrumentManagerConfiguration( final String location )
       {
  -        context.put( ContextManagerConstants.INSTRUMENT_MANAGER_CONFIGURATION_URI, location
);
  +        m_context.put( ContextManagerConstants.INSTRUMENT_MANAGER_CONFIGURATION_URI, location
);
       }
   
       public void setNumberOfThreadsPerCPU( final int numberOfThreads )
       {
  -        context.put( ContextManagerConstants.THREADS_CPU, new Integer( numberOfThreads
) );
  +        m_context.put( ContextManagerConstants.THREADS_CPU, new Integer( numberOfThreads
) );
       }
   
       public void setPoolManager( final PoolManager poolManager )
       {
  -        context.put( PoolManager.ROLE, poolManager );
  +        m_context.put( PoolManager.ROLE, poolManager );
       }
   
       public void setRoleManager( final RoleManager roleManager )
       {
  -        context.put( RoleManager.ROLE, roleManager );
  +        m_context.put( RoleManager.ROLE, roleManager );
       }
   
       public void setRoleManagerConfiguration( final Configuration config )
       {
  -        context.put( ContextManagerConstants.ROLE_MANAGER_CONFIGURATION, config );
  -        context.put( ContextManagerConstants.ROLE_MANAGER_CONFIGURATION_URI, null );
  +        m_context.put( ContextManagerConstants.ROLE_MANAGER_CONFIGURATION, config );
  +        m_context.put( ContextManagerConstants.ROLE_MANAGER_CONFIGURATION_URI, null );
       }
   
       public void setRoleManagerConfiguration( final String location )
       {
  -        context.put( ContextManagerConstants.ROLE_MANAGER_CONFIGURATION_URI, location );
  +        m_context.put( ContextManagerConstants.ROLE_MANAGER_CONFIGURATION_URI, location
);
       }
   
       public void setThreadTimeout( final long timeout )
       {
  -        context.put( ContextManagerConstants.THREAD_TIMEOUT, new Long( timeout ) );
  +        m_context.put( ContextManagerConstants.THREAD_TIMEOUT, new Long( timeout ) );
       }
   
       public void setWorkDirectory( final File file )
       {
  -        context.put( ContextManagerConstants.WORK_DIRECTORY, file );
  +        m_context.put( ContextManagerConstants.WORK_DIRECTORY, file );
       }
   
       public void setWorkDirectory( final String directory )
  
  
  

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