avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util CompositeException.java ContextBuilder.java ContextManager.java FortressConfig.java LifecycleExtensionManager.java OverridableContext.java Service.java
Date Wed, 19 Mar 2003 12:55:49 GMT
donaldp     2003/03/19 04:55:48

  Modified:    fortress/src/java/org/apache/avalon/fortress RoleEntry.java
               fortress/src/java/org/apache/avalon/fortress/impl
                        AbstractContainer.java ComponentHandlerEntry.java
                        ComponentHandlerMetaData.java DefaultContainer.java
               fortress/src/java/org/apache/avalon/fortress/impl/extensions
                        InstrumentableCreator.java
               fortress/src/java/org/apache/avalon/fortress/impl/handler
                        AbstractComponentHandler.java ComponentFactory.java
                        LEAwareComponentHandler.java
                        PoolableComponentHandler.java
                        PrepareHandlerCommand.java ProxyHelper.java
                        ProxyObjectFactory.java
               fortress/src/java/org/apache/avalon/fortress/impl/lookup
                        FortressServiceManager.java
                        FortressServiceSelector.java
               fortress/src/java/org/apache/avalon/fortress/impl/role
                        AbstractRoleManager.java ServiceRoleManager.java
               fortress/src/java/org/apache/avalon/fortress/util
                        CompositeException.java ContextBuilder.java
                        ContextManager.java FortressConfig.java
                        LifecycleExtensionManager.java
                        OverridableContext.java Service.java
  Log:
  style and optimize imports
  
  Revision  Changes    Path
  1.4       +5 -5      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/RoleEntry.java
  
  Index: RoleEntry.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/RoleEntry.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RoleEntry.java	19 Mar 2003 12:49:31 -0000	1.3
  +++ RoleEntry.java	19 Mar 2003 12:55:45 -0000	1.4
  @@ -97,10 +97,10 @@
       }
   
       /**
  -    * Get the <code>Class</code> for the component type's {@link org.apache.avalon.fortress.impl.handler.ComponentHandler}.
  -    *
  -    * @return the <code>Class</code>
  -    */
  +     * Get the <code>Class</code> for the component type's {@link org.apache.avalon.fortress.impl.handler.ComponentHandler}.
  +     *
  +     * @return the <code>Class</code>
  +     */
       public Class getHandlerClass()
       {
           return m_handlerClass;
  
  
  
  1.14      +21 -23    avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/AbstractContainer.java
  
  Index: AbstractContainer.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/AbstractContainer.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- AbstractContainer.java	7 Mar 2003 20:21:26 -0000	1.13
  +++ AbstractContainer.java	19 Mar 2003 12:55:45 -0000	1.14
  @@ -53,7 +53,6 @@
   import java.util.Iterator;
   import java.util.List;
   import java.util.Map;
  -
   import org.apache.avalon.excalibur.logger.LoggerManager;
   import org.apache.avalon.fortress.Container;
   import org.apache.avalon.fortress.RoleEntry;
  @@ -205,17 +204,17 @@
            */
           boolean isInstrumentEnabled = false;
           Iterator it = m_extManager.creatorExtensionsIterator();
  -        while(it.hasNext())
  +        while( it.hasNext() )
           {
  -            if (it.next() instanceof InstrumentableCreator)
  +            if( it.next() instanceof InstrumentableCreator )
               {
                   isInstrumentEnabled = true;
               }
           }
  -        
  -        if ( ! isInstrumentEnabled )
  +
  +        if( !isInstrumentEnabled )
           {
  -            m_extManager.addCreatorExtension(new InstrumentableCreator(m_instrumentManager));
  +            m_extManager.addCreatorExtension( new InstrumentableCreator( m_instrumentManager ) );
           }
   
           if( serviceManager.hasService( Queue.ROLE ) )
  @@ -277,7 +276,7 @@
        * @throws Exception if unable to create a Handler for the component
        */
       protected void addComponent( final ComponentHandlerMetaData metaData )
  -            throws IllegalArgumentException, Exception
  +        throws IllegalArgumentException, Exception
       {
           // figure out Role
           final String classname = metaData.getClassname();
  @@ -288,10 +287,10 @@
               throw new IllegalArgumentException( message );
           }
   
  -        if( DEFAULT_ENTRY.equals(metaData.getName()) ||
  -            SELECTOR_ENTRY.equals(metaData.getName()) )
  +        if( DEFAULT_ENTRY.equals( metaData.getName() ) ||
  +            SELECTOR_ENTRY.equals( metaData.getName() ) )
           {
  -            throw new IllegalArgumentException("Using a reserved id name" + metaData.getName());
  +            throw new IllegalArgumentException( "Using a reserved id name" + metaData.getName() );
           }
   
           // create a handler for the combo of Role+MetaData
  @@ -317,20 +316,19 @@
   
               hintMap.put( metaData.getName(), handler );
   
  -            if( (! hintMap.containsKey( SELECTOR_ENTRY )) && (hintMap.size() > 1) )
  +            if( ( !hintMap.containsKey( SELECTOR_ENTRY ) ) && ( hintMap.size() > 1 ) )
               {
                   hintMap.put( SELECTOR_ENTRY,
                                new FortressServiceSelector( this, role ) );
               }
   
  -            if ( metaData.getConfiguration().getAttributeAsBoolean( "default", false ) )
  +            if( metaData.getConfiguration().getAttributeAsBoolean( "default", false ) )
               {
                   hintMap.put( DEFAULT_ENTRY, handler );
               }
           }
       }
   
  -
       /**
        * Get a ComponentHandler with the default constructor for the component class passed in.
        *
  @@ -341,7 +339,7 @@
        */
       private ComponentHandler getComponentHandler( final RoleEntry roleEntry,
                                                     final ComponentHandlerMetaData metaData )
  -            throws Exception
  +        throws Exception
       {
           // get info from params
           ComponentHandler handler = null;
  @@ -351,16 +349,16 @@
           try
           {
               final ObjectFactory factory =
  -                            createObjectFactory( classname, configuration );
  +                createObjectFactory( classname, configuration );
   
               // create the appropriate handler instance
               final ComponentHandler targetHandler =
  -                    (ComponentHandler)roleEntry.getHandlerClass().newInstance();
  +                (ComponentHandler)roleEntry.getHandlerClass().newInstance();
   
               // do the handler lifecycle
               ContainerUtil.contextualize( targetHandler, m_context );
               final DefaultServiceManager serviceManager =
  -                    new DefaultServiceManager( getServiceManager() );
  +                new DefaultServiceManager( getServiceManager() );
               serviceManager.put( ObjectFactory.ROLE, factory );
               serviceManager.makeReadOnly();
   
  @@ -600,7 +598,7 @@
   
                   if( getLogger().isWarnEnabled() )
                   {
  -                    final String message = "Could not initialize component "+ cName;
  +                    final String message = "Could not initialize component " + cName;
                       getLogger().warn( message, e );
                   }
                   buffer.add( e );
  @@ -611,8 +609,8 @@
           // throw an exception
           if( buffer.size() > 0 )
           {
  -            throw new CompositeException( (Exception[])buffer.toArray( new Exception[0] ),
  -                        "unable to instantiate one or more components" );
  +            throw new CompositeException( (Exception[])buffer.toArray( new Exception[ 0 ] ),
  +                                          "unable to instantiate one or more components" );
           }
       }
   
  @@ -627,9 +625,9 @@
               final ComponentHandlerEntry entry = (ComponentHandlerEntry)i.next();
               final ComponentHandler handler = entry.getHandler();
   
  -            if (getLogger().isDebugEnabled()) getLogger().debug("Shutting down: " + handler);
  +            if( getLogger().isDebugEnabled() ) getLogger().debug( "Shutting down: " + handler );
               ContainerUtil.dispose( handler );
  -            if (getLogger().isDebugEnabled()) getLogger().debug("Done.");
  +            if( getLogger().isDebugEnabled() ) getLogger().debug( "Done." );
           }
       }
   
  
  
  
  1.4       +2 -3      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/ComponentHandlerEntry.java
  
  Index: ComponentHandlerEntry.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/ComponentHandlerEntry.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ComponentHandlerEntry.java	5 Mar 2003 15:02:33 -0000	1.3
  +++ ComponentHandlerEntry.java	19 Mar 2003 12:55:45 -0000	1.4
  @@ -81,9 +81,8 @@
               throw new NullPointerException( "metaData" );
           }
   
  -
           m_handler = handler;
  -        m_metaData= metaData;
  +        m_metaData = metaData;
       }
   
       /**
  
  
  
  1.4       +24 -24    avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/ComponentHandlerMetaData.java
  
  Index: ComponentHandlerMetaData.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/ComponentHandlerMetaData.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ComponentHandlerMetaData.java	5 Mar 2003 15:02:33 -0000	1.3
  +++ ComponentHandlerMetaData.java	19 Mar 2003 12:55:45 -0000	1.4
  @@ -64,13 +64,13 @@
       private final Configuration m_configuration;
       private final boolean m_lazyActivation;
   
  -   /**
  -    * Creation of a new impl handler meta data instance.
  -    * @param name the handler name
  -    * @param classname the handler classname
  -    * @param configuration the handler configuration
  -    * @param laxyActivation the activation policy
  -    */
  +    /**
  +     * Creation of a new impl handler meta data instance.
  +     * @param name the handler name
  +     * @param classname the handler classname
  +     * @param configuration the handler configuration
  +     * @param laxyActivation the activation policy
  +     */
       public ComponentHandlerMetaData( final String name,
                                        final String classname,
                                        final Configuration configuration,
  @@ -95,37 +95,37 @@
           m_lazyActivation = lazyActivation;
       }
   
  -   /**
  -    * Returns the handler name
  -    * @return the handler name
  -    */
  +    /**
  +     * Returns the handler name
  +     * @return the handler name
  +     */
       public String getName()
       {
           return m_name;
       }
   
  -   /**
  -    * Returns the handler classname
  -    * @return the classname
  -    */
  +    /**
  +     * Returns the handler classname
  +     * @return the classname
  +     */
       public String getClassname()
       {
           return m_classname;
       }
   
  -   /**
  -    * Returns the handler configuration
  -    * @return the configuration
  -    */
  +    /**
  +     * Returns the handler configuration
  +     * @return the configuration
  +     */
       public Configuration getConfiguration()
       {
           return m_configuration;
       }
   
  -   /**
  -    * Returns the handler activation policy
  -    * @return the activation policy
  -    */
  +    /**
  +     * Returns the handler activation policy
  +     * @return the activation policy
  +     */
       public boolean isLazyActivation()
       {
           return m_lazyActivation;
  
  
  
  1.6       +5 -5      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/DefaultContainer.java
  
  Index: DefaultContainer.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/DefaultContainer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultContainer.java	25 Feb 2003 16:28:33 -0000	1.5
  +++ DefaultContainer.java	19 Mar 2003 12:55:46 -0000	1.6
  @@ -103,11 +103,11 @@
           {
               final Configuration element = elements[ i ];
               final String hint = element.getAttribute( "id", null );
  -            if ( null == hint )
  +            if( null == hint )
               {
                   // Only components with an id attribute are treated as components.
                   getLogger().debug( "Ignoring configuration for component, " + element.getName()
  -                    + ", because the id attribute is missing." );
  +                                   + ", because the id attribute is missing." );
               }
               else
               {
  @@ -120,9 +120,9 @@
                   {
                       addComponent( metaData );
                   }
  -                catch (Exception e)
  +                catch( Exception e )
                   {
  -                    throw new ConfigurationException("Could not add component", e);
  +                    throw new ConfigurationException( "Could not add component", e );
                   }
               }
           }
  
  
  
  1.4       +6 -6      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/extensions/InstrumentableCreator.java
  
  Index: InstrumentableCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/extensions/InstrumentableCreator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- InstrumentableCreator.java	11 Mar 2003 14:09:40 -0000	1.3
  +++ InstrumentableCreator.java	19 Mar 2003 12:55:46 -0000	1.4
  @@ -68,21 +68,21 @@
   {
       private final InstrumentManager m_instrumentManager;
       private final boolean m_instrumentEnabled;
  -    
  -    public InstrumentableCreator(InstrumentManager instrumentManager)
  +
  +    public InstrumentableCreator( InstrumentManager instrumentManager )
       {
           m_instrumentManager = instrumentManager;
           m_instrumentEnabled = instrumentManager != null;
       }
  -    
  +
       /**
        * Assign the instrumentables and InstrumentManageables
        */
  -    public void create(Object object, Context context) throws Exception
  +    public void create( Object object, Context context ) throws Exception
       {
           if( m_instrumentEnabled && object instanceof Instrumentable )
           {
  -            String instrumentableName = (String)context.get("component.name");
  +            String instrumentableName = (String)context.get( "component.name" );
               final Instrumentable instrumentable = (Instrumentable)object;
               instrumentable.setInstrumentableName( instrumentableName );
   
  @@ -91,7 +91,7 @@
                   instrumentable, instrumentable.getInstrumentableName() );
   
           }
  -        
  +
           if( m_instrumentEnabled && object instanceof InstrumentManageable )
           {
               ( (InstrumentManageable)object ).setInstrumentManager( m_instrumentManager );
  
  
  
  1.8       +8 -6      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/handler/AbstractComponentHandler.java
  
  Index: AbstractComponentHandler.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/handler/AbstractComponentHandler.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AbstractComponentHandler.java	6 Mar 2003 19:42:08 -0000	1.7
  +++ AbstractComponentHandler.java	19 Mar 2003 12:55:46 -0000	1.8
  @@ -74,8 +74,8 @@
       extends AbstractLogEnabledInstrumentable
       implements Serviceable, Initializable, Disposable, ComponentHandler
   {
  -    private CounterInstrument m_request = new CounterInstrument("requests");
  -    private CounterInstrument m_release = new CounterInstrument("releases");
  +    private CounterInstrument m_request = new CounterInstrument( "requests" );
  +    private CounterInstrument m_release = new CounterInstrument( "releases" );
   
       /**
        * The instance of the ComponentFactory that creates and disposes of the
  @@ -216,7 +216,7 @@
               throw new IllegalStateException( message );
           }
   
  -        if ( m_request.isActive() )
  +        if( m_request.isActive() )
           {
               m_request.increment();
           }
  @@ -247,7 +247,7 @@
               throw new IllegalStateException( message );
           }
   
  -        if ( m_release.isActive() )
  +        if( m_release.isActive() )
           {
               m_release.increment();
           }
  @@ -260,7 +260,9 @@
        *
        * @param component the component
        */
  -    protected void doPut( final Object component ) {}
  +    protected void doPut( final Object component )
  +    {
  +    }
   
       /**
        * Create a new component for handler.
  
  
  
  1.13      +2 -2      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/handler/ComponentFactory.java
  
  Index: ComponentFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/handler/ComponentFactory.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ComponentFactory.java	19 Mar 2003 12:51:52 -0000	1.12
  +++ ComponentFactory.java	19 Mar 2003 12:55:46 -0000	1.13
  @@ -51,8 +51,8 @@
   
   import org.apache.avalon.excalibur.logger.LoggerManager;
   import org.apache.avalon.fortress.util.LifecycleExtensionManager;
  -import org.apache.avalon.framework.component.WrapperComponentManager;
   import org.apache.avalon.framework.component.Composable;
  +import org.apache.avalon.framework.component.WrapperComponentManager;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.container.ContainerUtil;
   import org.apache.avalon.framework.context.Context;
  
  
  
  1.8       +14 -14    avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/handler/LEAwareComponentHandler.java
  
  Index: LEAwareComponentHandler.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/handler/LEAwareComponentHandler.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- LEAwareComponentHandler.java	7 Mar 2003 20:21:26 -0000	1.7
  +++ LEAwareComponentHandler.java	19 Mar 2003 12:55:46 -0000	1.8
  @@ -68,12 +68,12 @@
       private final LifecycleExtensionManager m_extManager;
       private final Context m_context;
   
  -   /**
  -    * Creation of a new handler.
  -    * @param componentHandler the handler
  -    * @param extManager the extension manager
  -    * @param context the context
  -    */
  +    /**
  +     * Creation of a new handler.
  +     * @param componentHandler the handler
  +     * @param extManager the extension manager
  +     * @param context the context
  +     */
       public LEAwareComponentHandler( final ComponentHandler componentHandler,
                                       final LifecycleExtensionManager extManager,
                                       final Context context )
  @@ -107,10 +107,10 @@
           return m_componentHandler.getComponentClass();
       }
   
  -   /**
  -    * Prepare the handler.
  -    * @exception Exception if a handler preparation error occurs
  -    */
  +    /**
  +     * Prepare the handler.
  +     * @exception Exception if a handler preparation error occurs
  +     */
       public void prepareHandler()
           throws Exception
       {
  @@ -148,9 +148,9 @@
           m_componentHandler.put( component );
       }
   
  -   /**
  -    * Disposal of the handler.
  -    */
  +    /**
  +     * Disposal of the handler.
  +     */
       public void dispose()
       {
           ContainerUtil.dispose( m_componentHandler );
  
  
  
  1.4       +8 -8      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/handler/PoolableComponentHandler.java
  
  Index: PoolableComponentHandler.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/handler/PoolableComponentHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PoolableComponentHandler.java	19 Mar 2003 12:53:56 -0000	1.3
  +++ PoolableComponentHandler.java	19 Mar 2003 12:55:46 -0000	1.4
  @@ -92,13 +92,13 @@
               (PoolManager)serviceManager.lookup( PoolManager.ROLE );
       }
   
  -   /**
  -    * Configuration of the handler under which the minimum pool size
  -    * is established.
  -    * @param configuration the configuration fragment
  -    * @exception ConfigurationException if the supplied configuration attribute 
  -    *    for 'pool-min' cannot be resolved to an integer value
  -    */
  +    /**
  +     * Configuration of the handler under which the minimum pool size
  +     * is established.
  +     * @param configuration the configuration fragment
  +     * @exception ConfigurationException if the supplied configuration attribute
  +     *    for 'pool-min' cannot be resolved to an integer value
  +     */
       public void configure( final Configuration configuration )
           throws ConfigurationException
       {
  
  
  
  1.5       +10 -10    avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/handler/PrepareHandlerCommand.java
  
  Index: PrepareHandlerCommand.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/handler/PrepareHandlerCommand.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PrepareHandlerCommand.java	14 Feb 2003 20:51:08 -0000	1.4
  +++ PrepareHandlerCommand.java	19 Mar 2003 12:55:46 -0000	1.5
  @@ -64,11 +64,11 @@
       private final ComponentHandler m_handler;
       private final Logger m_logger;
   
  -   /**
  -    * Creation of a new prepare handler command.
  -    * @param handler the compoent handler
  -    * @param logger the logging channel
  -    */
  +    /**
  +     * Creation of a new prepare handler command.
  +     * @param handler the compoent handler
  +     * @param logger the logging channel
  +     */
       public PrepareHandlerCommand( final ComponentHandler handler,
                                     final Logger logger )
       {
  @@ -76,10 +76,10 @@
           m_logger = ( null == logger ) ? new NullLogger() : logger;
       }
   
  -   /**
  -    * Invoke execution of the handler
  -    * @exception java.lang.Exception if a handler execution exception occurs
  -    */
  +    /**
  +     * Invoke execution of the handler
  +     * @exception java.lang.Exception if a handler execution exception occurs
  +     */
       public void execute()
           throws Exception
       {
  
  
  
  1.6       +0 -1      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/handler/ProxyHelper.java
  
  Index: ProxyHelper.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/handler/ProxyHelper.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ProxyHelper.java	6 Mar 2003 19:42:08 -0000	1.5
  +++ ProxyHelper.java	19 Mar 2003 12:55:46 -0000	1.6
  @@ -52,7 +52,6 @@
   import java.io.Serializable;
   import java.lang.reflect.Proxy;
   import java.util.ArrayList;
  -
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.activity.Startable;
  
  
  
  1.4       +15 -15    avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/handler/ProxyObjectFactory.java
  
  Index: ProxyObjectFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/handler/ProxyObjectFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ProxyObjectFactory.java	6 Mar 2003 19:42:08 -0000	1.3
  +++ ProxyObjectFactory.java	19 Mar 2003 12:55:46 -0000	1.4
  @@ -124,11 +124,11 @@
       /* (non-Javadoc)
        * @see org.apache.excalibur.instrument.Instrumentable#setInstrumentableName(java.lang.String)
        */
  -    public void setInstrumentableName(String name)
  +    public void setInstrumentableName( String name )
       {
  -        if ( m_objectFactory instanceof Instrumentable )
  +        if( m_objectFactory instanceof Instrumentable )
           {
  -            ((Instrumentable)m_objectFactory).setInstrumentableName(name);
  +            ( (Instrumentable)m_objectFactory ).setInstrumentableName( name );
           }
       }
   
  @@ -137,11 +137,11 @@
        */
       public String getInstrumentableName()
       {
  -        if ( m_objectFactory instanceof Instrumentable )
  +        if( m_objectFactory instanceof Instrumentable )
           {
  -            return ((Instrumentable)m_objectFactory).getInstrumentableName();
  +            return ( (Instrumentable)m_objectFactory ).getInstrumentableName();
           }
  -        
  +
           return "";
       }
   
  @@ -150,12 +150,12 @@
        */
       public Instrument[] getInstruments()
       {
  -        if ( m_objectFactory instanceof Instrumentable )
  +        if( m_objectFactory instanceof Instrumentable )
           {
  -            return ((Instrumentable)m_objectFactory).getInstruments();
  +            return ( (Instrumentable)m_objectFactory ).getInstruments();
           }
  -        
  -        return new Instrument[] {};
  +
  +        return new Instrument[]{};
       }
   
       /* (non-Javadoc)
  @@ -163,11 +163,11 @@
        */
       public Instrumentable[] getChildInstrumentables()
       {
  -        if ( m_objectFactory instanceof Instrumentable )
  +        if( m_objectFactory instanceof Instrumentable )
           {
  -            return ((Instrumentable)m_objectFactory).getChildInstrumentables();
  +            return ( (Instrumentable)m_objectFactory ).getChildInstrumentables();
           }
  -        
  -        return new Instrumentable[] {};
  +
  +        return new Instrumentable[]{};
       }
   }
  
  
  
  1.9       +1 -2      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/lookup/FortressServiceManager.java
  
  Index: FortressServiceManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/lookup/FortressServiceManager.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- FortressServiceManager.java	19 Mar 2003 12:48:49 -0000	1.8
  +++ FortressServiceManager.java	19 Mar 2003 12:55:47 -0000	1.9
  @@ -50,7 +50,6 @@
   package org.apache.avalon.fortress.impl.lookup;
   
   import java.util.Map;
  -
   import org.apache.avalon.fortress.Container;
   import org.apache.avalon.fortress.impl.AbstractContainer;
   import org.apache.avalon.fortress.impl.handler.ComponentHandler;
  
  
  
  1.6       +8 -9      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/lookup/FortressServiceSelector.java
  
  Index: FortressServiceSelector.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/lookup/FortressServiceSelector.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FortressServiceSelector.java	27 Feb 2003 20:04:53 -0000	1.5
  +++ FortressServiceSelector.java	19 Mar 2003 12:55:47 -0000	1.6
  @@ -50,7 +50,6 @@
   package org.apache.avalon.fortress.impl.lookup;
   
   import java.util.Map;
  -
   import org.apache.avalon.fortress.Container;
   import org.apache.avalon.fortress.impl.handler.ComponentHandler;
   import org.apache.avalon.framework.service.ServiceException;
  @@ -72,11 +71,11 @@
       private final Container m_container;
       private final Map m_used;
   
  -   /**
  -    * Creation of  new service selector.
  -    * @param container the impl
  -    * @param key a key
  -    */
  +    /**
  +     * Creation of  new service selector.
  +     * @param container the impl
  +     * @param key a key
  +     */
       public FortressServiceSelector( final Container container,
                                       final String key )
       {
  @@ -101,7 +100,7 @@
           {
               final ComponentHandler handler = getHandler( hint );
               final Object component = handler.get();
  -            m_used.put( new ComponentKey(component), handler );
  +            m_used.put( new ComponentKey( component ), handler );
               return component;
           }
           catch( final ServiceException ce )
  @@ -124,7 +123,7 @@
       public void release( Object component )
       {
           final ComponentHandler handler =
  -            (ComponentHandler)m_used.remove( new ComponentKey(component) );
  +            (ComponentHandler)m_used.remove( new ComponentKey( component ) );
           if( null != handler )
           {
               handler.put( component );
  
  
  
  1.6       +18 -19    avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/role/AbstractRoleManager.java
  
  Index: AbstractRoleManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/role/AbstractRoleManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractRoleManager.java	17 Mar 2003 20:55:37 -0000	1.5
  +++ AbstractRoleManager.java	19 Mar 2003 12:55:48 -0000	1.6
  @@ -51,7 +51,6 @@
   
   import java.util.HashMap;
   import java.util.Map;
  -
   import org.apache.avalon.fortress.RoleManager;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   
  @@ -67,9 +66,9 @@
       extends AbstractLogEnabled
       implements org.apache.avalon.fortress.RoleManager
   {
  -   /**
  -    * The classloader used to load and check roles and components.
  -    */
  +    /**
  +     * The classloader used to load and check roles and components.
  +     */
       private final ClassLoader m_loader;
   
       /**
  @@ -125,13 +124,13 @@
           m_parent = parent;
       }
   
  -   /**
  -    * Addition of a role to the role manager.
  -    * @param shortName the shor name for the role
  -    * @param role the role
  -    * @param classname the class name
  -    * @param handlerClassName the handler classname
  -    */
  +    /**
  +     * Addition of a role to the role manager.
  +     * @param shortName the shor name for the role
  +     * @param role the role
  +     * @param classname the class name
  +     * @param handlerClassName the handler classname
  +     */
       protected void addRole( final String shortName,
                               final String role,
                               final String className,
  @@ -205,11 +204,11 @@
           }
       }
   
  -   /**
  -    * Return a role name relative to a supplied short name
  -    * @param shortname the short name
  -    * @return the role entry
  -    */
  +    /**
  +     * Return a role name relative to a supplied short name
  +     * @param shortname the short name
  +     * @return the role entry
  +     */
       public org.apache.avalon.fortress.RoleEntry getRoleForShortName( final String shortname )
       {
           final org.apache.avalon.fortress.RoleEntry roleEntry = (org.apache.avalon.fortress.RoleEntry)m_shorthands.get( shortname );
  @@ -226,11 +225,11 @@
               return null;
           }
       }
  -    
  +
       /**
        * Get the classloader used for the RoleManager for any class that
        * extends this one.
  -     * 
  +     *
        * @return ClassLoader
        */
       protected ClassLoader getLoader()
  
  
  
  1.2       +88 -88    avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/role/ServiceRoleManager.java
  
  Index: ServiceRoleManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/role/ServiceRoleManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServiceRoleManager.java	18 Mar 2003 17:11:09 -0000	1.1
  +++ ServiceRoleManager.java	19 Mar 2003 12:55:48 -0000	1.2
  @@ -68,7 +68,6 @@
   import java.util.Set;
   import java.util.regex.Matcher;
   import java.util.regex.Pattern;
  -
   import org.apache.avalon.fortress.RoleManager;
   import org.apache.avalon.fortress.impl.handler.PerThreadComponentHandler;
   import org.apache.avalon.fortress.impl.handler.PoolableComponentHandler;
  @@ -81,35 +80,35 @@
    * services and the meta-information into one role manager.  This really gets
    * rid of the need of multiple role managers.  It uses a set of entries in your
    * JARs to do its magic.
  - * 
  + *
    * <p><code><b>/services.list</b></code></p>
  - * 
  + *
    * <p>
    *   This lists all the services that are <em>defined</em> in this jar.
    * </p>
  - * 
  + *
    * <p><code><b>/META-INF/services/</b><i>my.class.Name</i></code></p>
  - * 
  + *
    * <p>
    *   One entry for each service where there are implementations for a role.  This
    *   follows the JAR services mechanism.
    * </p>
  - * 
  + *
    * <p><code><i>/my/class/Implementation.meta</i></code></p>
  - * 
  + *
    * <p>
    *   There is one entry sitting right beside every implementation class.  This
    *   holds all the meta information for the associated class.  It is a simple
    *   properties file.
    * </p>
  - * 
  + *
    * <h3>ANT Tasks available</h3>
    * <p>
    *   We have a couple of ANT tasks to make this really easy.  If you add this
    *   to your ANT build script (customizing it to make it work in your environment),
    *   it will make your life alot easier:
    * </p>
  - * 
  + *
    * <pre>
    *   &lt;taskdef name="collect-metainfo" classname="org.d_haven.guiapp.tools.ComponentMetaInfoCollector"&gt;
    *     &lt;classpath&gt;
  @@ -117,14 +116,14 @@
    *       &lt;pathelement path="${tools.dir}/guiapp-tools.jar"/&gt;
    *     &lt;/classpath&gt;
    *   &lt;/taskdef&gt;
  - * 
  + *
    *   &lt;taskdef name="collect-services" classname="org.d_haven.guiapp.tools.ServiceCollector"&gt;
    *     &lt;classpath&gt;
    *       &lt;path refid="project.class.path"/&gt;
    *       &lt;pathelement path="${tools.dir}/guiapp-tools.jar"/&gt;
    *     &lt;/classpath&gt;
    *   &lt;/taskdef&gt;
  - *      
  + *
    *   &lt;collect-metainfo destdir="${build.classes}"&gt;
    *      &lt;fileset dir="${src.dir}"/&gt;
    *   &lt;/collect-metainfo&gt;
  @@ -132,7 +131,7 @@
    *   &lt;collect-services inputjar="${build.dir}/${name}-core.jar"
    *                     outputjar="${lib.dir}/${name}.jar"/&gt;
    * </pre>
  - * 
  + *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    */
   public class ServiceRoleManager extends AbstractRoleManager implements Initializable
  @@ -140,17 +139,17 @@
       /** Translate from scope to component handler */
       private static final Map m_scopeMap;
       /** Used to split words in class names */
  -    private static final Pattern upperCase = Pattern.compile("([A-Z]+)");
  -    
  +    private static final Pattern upperCase = Pattern.compile( "([A-Z]+)" );
  +
       // Initialize the scope map
       static
       {
           Map scopes = new HashMap();
  -        scopes.put("container", ThreadSafeComponentHandler.class.getName());
  -        scopes.put("thread", PerThreadComponentHandler.class.getName());
  -        scopes.put("request", PoolableComponentHandler.class.getName());
  -        
  -        m_scopeMap = Collections.unmodifiableMap(scopes);
  +        scopes.put( "container", ThreadSafeComponentHandler.class.getName() );
  +        scopes.put( "thread", PerThreadComponentHandler.class.getName() );
  +        scopes.put( "request", PoolableComponentHandler.class.getName() );
  +
  +        m_scopeMap = Collections.unmodifiableMap( scopes );
       }
   
       /**
  @@ -158,58 +157,59 @@
        */
       public ServiceRoleManager()
       {
  -        super(null);
  +        super( null );
       }
  -    
  +
       /**
        * Create a ServiceRoleManager with a parent RoleManager.
  -     * 
  +     *
        * @param parent
        */
  -    public ServiceRoleManager(RoleManager parent)
  +    public ServiceRoleManager( RoleManager parent )
       {
  -        super(parent, null);
  +        super( parent, null );
       }
  -    
  +
       /**
        * Create a ServiceRoleManager with the supplied classloader and
        * parent RoleManager.
  -     * 
  +     *
        * @param parent
        * @param loader
        */
  -    public ServiceRoleManager(RoleManager parent, ClassLoader loader)
  +    public ServiceRoleManager( RoleManager parent, ClassLoader loader )
       {
  -        super(parent, loader);
  +        super( parent, loader );
       }
   
       /**
        * Convert a Component implmentation classname into a shorthand
        * name.  It assumes all classnames for a particular component is
        * unique.
  -     * 
  +     *
        * @param string  The classname of a component
        * @return String the short name
        */
  -    public static final String createShortName(String className)
  +    public static final String createShortName( String className )
       {
  -        Matcher matcher = upperCase.matcher(className.substring(className.lastIndexOf('.') + 1));
  +        Matcher matcher = upperCase.matcher( className.substring( className.lastIndexOf( '.' ) + 1 ) );
           StringBuffer shortName = new StringBuffer();
  - 
  -        while (matcher.find())
  +
  +        while( matcher.find() )
           {
  -            if ( shortName.length() == 0 )
  +            if( shortName.length() == 0 )
               {
  -                matcher.appendReplacement(shortName, "$1");;
  +                matcher.appendReplacement( shortName, "$1" );
  +                ;
               }
               else
               {
  -                matcher.appendReplacement(shortName, "-$1");
  +                matcher.appendReplacement( shortName, "-$1" );
               }
           }
  -        
  -        matcher.appendTail(shortName);
  -        
  +
  +        matcher.appendTail( shortName );
  +
           return shortName.toString().toLowerCase();
       }
   
  @@ -220,127 +220,127 @@
       public void initialize() throws Exception
       {
           Set services = new HashSet();
  -        
  -        Enumeration enum = getLoader().getResources("services.list");
  -        while (enum.hasMoreElements())
  +
  +        Enumeration enum = getLoader().getResources( "services.list" );
  +        while( enum.hasMoreElements() )
           {
  -            readEntries(services, (URL)enum.nextElement());
  +            readEntries( services, (URL)enum.nextElement() );
           }
  -        
  +
           Iterator it = services.iterator();
  -        while (it.hasNext())
  +        while( it.hasNext() )
           {
               String role = (String)it.next();
  -            getLogger().debug("Adding service: " + role);
  -            setupImplementations(role);
  +            getLogger().debug( "Adding service: " + role );
  +            setupImplementations( role );
           }
       }
   
       /**
        * Get all the implementations of a service and set up their meta
        * information.
  -     * 
  +     *
        * @param role
        */
  -    private void setupImplementations(String role)
  +    private void setupImplementations( String role )
           throws IOException, ClassNotFoundException
       {
  -        Iterator it = Service.providers(getLoader().loadClass(role));
  -        
  -        while (it.hasNext())
  +        Iterator it = Service.providers( getLoader().loadClass( role ) );
  +
  +        while( it.hasNext() )
           {
  -            String impl = ((Class)it.next()).getName();
  -            getLogger().debug("Reading meta info for " + impl);
  -            readMeta(role, impl);
  +            String impl = ( (Class)it.next() ).getName();
  +            getLogger().debug( "Reading meta info for " + impl );
  +            readMeta( role, impl );
           }
       }
   
       /**
        * Read the meta information in and actually add the role.
  -     * 
  +     *
        * @param role
        * @param implementation
        */
  -    private void readMeta(String role, String implementation)
  +    private void readMeta( String role, String implementation )
       {
           Properties meta = new Properties();
  -        
  +
           try
           {
  -            meta.load(getLoader().getResourceAsStream(translate(implementation)));
  +            meta.load( getLoader().getResourceAsStream( translate( implementation ) ) );
           }
  -        catch (IOException ioe)
  +        catch( IOException ioe )
           {
  -            getLogger().error("Could not load meta information for " +
  -                              implementation + ", skipping this class.");
  +            getLogger().error( "Could not load meta information for " +
  +                               implementation + ", skipping this class." );
               return;
           }
  -        
  -        String shortName = meta.getProperty("avalon.configname", createShortName(implementation));
  -        String handler = getHandler(meta);
  -        
  -        addRole(shortName, role, implementation, handler);
  +
  +        String shortName = meta.getProperty( "avalon.configname", createShortName( implementation ) );
  +        String handler = getHandler( meta );
  +
  +        addRole( shortName, role, implementation, handler );
       }
   
       /**
        * Get the name of the requested component handler.
  -     * 
  +     *
        * @param meta
        * @return String
        */
  -    private String getHandler(Properties meta)
  +    private String getHandler( Properties meta )
       {
  -        String scope = meta.getProperty("avalon.scope", null);
  +        String scope = meta.getProperty( "avalon.scope", null );
           String handler = null;
  -        
  -        if (null != scope)
  +
  +        if( null != scope )
           {
  -            handler = (String)m_scopeMap.get(scope);
  +            handler = (String)m_scopeMap.get( scope );
           }
           else
           {
  -            handler = meta.getProperty("fortress.handler");
  +            handler = meta.getProperty( "fortress.handler" );
           }
  -        
  -        if (null == handler)
  +
  +        if( null == handler )
           {
               handler = PerThreadComponentHandler.class.getName();
           }
  -        
  +
           return handler;
       }
   
       /**
        * Translate a class name into the meta file name.
  -     * 
  +     *
        * @param implementation
        * @return String
        */
  -    private String translate(String implementation)
  +    private String translate( String implementation )
       {
  -        String entry = implementation.replace('.', '/');
  -        entry += ".meta"; 
  +        String entry = implementation.replace( '.', '/' );
  +        entry += ".meta";
           return entry;
       }
   
       /**
        * Read entries in a list file and add them all to the provided Set.
  -     * 
  +     *
        * @param services
        * @param url
        */
  -    private void readEntries(Set entries, URL url)
  +    private void readEntries( Set entries, URL url )
           throws IOException
       {
  -        BufferedReader reader = new BufferedReader( new InputStreamReader(url.openStream()) );
  -        
  +        BufferedReader reader = new BufferedReader( new InputStreamReader( url.openStream() ) );
  +
           String entry = reader.readLine();
  -        while (entry != null)
  +        while( entry != null )
           {
  -            entries.add(entry);
  +            entries.add( entry );
               entry = reader.readLine();
           }
  -        
  +
           reader.close();
       }
   }
  
  
  
  1.2       +4 -2      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/CompositeException.java
  
  Index: CompositeException.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/CompositeException.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CompositeException.java	27 Jan 2003 16:55:42 -0000	1.1
  +++ CompositeException.java	19 Mar 2003 12:55:48 -0000	1.2
  @@ -12,10 +12,11 @@
       {
           this( ex, null );
       }
  +
       public CompositeException( Exception[] ex, String message )
       {
           m_ex = ex;
  -        if( ex == null || ex.length < 1)
  +        if( ex == null || ex.length < 1 )
           {
               throw new IllegalArgumentException( "you must specify a contained exception!" );
           }
  @@ -24,7 +25,7 @@
               final StringBuffer msg = new StringBuffer();
               for( int i = 0; i < ex.length; i++ )
               {
  -                msg.append( ex[i].getMessage() );
  +                msg.append( ex[ i ].getMessage() );
               }
               m_message = msg.toString();
           }
  @@ -36,6 +37,7 @@
       {
           return m_ex;
       }
  +
       public String toString()
       {
           return m_message;
  
  
  
  1.6       +1 -2      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/ContextBuilder.java
  
  Index: ContextBuilder.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/ContextBuilder.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ContextBuilder.java	19 Mar 2003 12:48:34 -0000	1.5
  +++ ContextBuilder.java	19 Mar 2003 12:55:48 -0000	1.6
  @@ -50,7 +50,6 @@
   package org.apache.avalon.fortress.util;
   
   import java.io.File;
  -
   import org.apache.avalon.excalibur.logger.LoggerManager;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.context.Context;
  
  
  
  1.9       +16 -17    avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/ContextManager.java
  
  Index: ContextManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/ContextManager.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ContextManager.java	13 Mar 2003 06:04:56 -0000	1.8
  +++ ContextManager.java	19 Mar 2003 12:55:48 -0000	1.9
  @@ -53,7 +53,6 @@
   import java.util.Collections;
   import java.util.Comparator;
   import java.util.Iterator;
  -
   import org.apache.avalon.excalibur.logger.LogKitLoggerManager;
   import org.apache.avalon.excalibur.logger.LoggerManager;
   import org.apache.avalon.fortress.RoleManager;
  @@ -269,7 +268,7 @@
                   }
                   catch( ContextException cex )
                   {
  -                    getLogger().debug("Could not initialize the Configuration", ce);
  +                    getLogger().debug( "Could not initialize the Configuration", ce );
                       // Guess there is none.
                       return;
                   }
  @@ -297,7 +296,7 @@
           catch( ContextException ce )
           {
               getLogger().debug( "Could not copy Context parameters.  This may be Ok depending on "
  -                + "other configured context values." );
  +                               + "other configured context values." );
           }
       }
   
  @@ -326,9 +325,9 @@
   
               try
               {
  -                if (getLogger().isDebugEnabled()) getLogger().debug("Shutting down: " + o);
  +                if( getLogger().isDebugEnabled() ) getLogger().debug( "Shutting down: " + o );
                   ContainerUtil.shutdown( o );
  -                if (getLogger().isDebugEnabled()) getLogger().debug("Done.");
  +                if( getLogger().isDebugEnabled() ) getLogger().debug( "Done." );
               }
               catch( Exception e )
               {
  @@ -545,7 +544,7 @@
           catch( ContextException ce )
           {
               getLogger().debug( "Could not copy context entry: " + RoleManager.ROLE
  -                + ".  This may be Ok depending on other configured context values." );
  +                               + ".  This may be Ok depending on other configured context values." );
           }
   
           Configuration roleConfig =
  @@ -563,7 +562,7 @@
               }
               catch( ContextException ce )
               {
  -                getLogger().debug("Could not initialize the RoleManager", ce);
  +                getLogger().debug( "Could not initialize the RoleManager", ce );
                   // No RoleManager available anywhere.
                   roleConfig = EMPTY_CONFIG;
               }
  @@ -641,7 +640,7 @@
           catch( ContextException ce )
           {
               getLogger().debug( "A preloaded Configuration was not found for key: " + configKey
  -                + "  This may be Ok depending on other configured context values." );
  +                               + "  This may be Ok depending on other configured context values." );
           }
   
           String configUri = null;
  @@ -652,7 +651,7 @@
           catch( ContextException ce )
           {
               getLogger().debug( "A configuration URI was not specified either: " + uriKey
  -                + "  One or the other is required." );
  +                               + "  One or the other is required." );
               return null;
           }
   
  @@ -930,20 +929,20 @@
   
           public int compare( Object a, Object b )
           {
  -            int typeA = typeOf(a);
  -            int typeB = typeOf(b);
  +            int typeA = typeOf( a );
  +            int typeB = typeOf( b );
   
  -            if (typeA < typeB) return -1;
  -            if (typeA > typeB) return 1;
  +            if( typeA < typeB ) return -1;
  +            if( typeA > typeB ) return 1;
               return 0;
           }
   
  -        private int typeOf(Object obj)
  +        private int typeOf( Object obj )
           {
               int retVal = 1; // Doesn't matter the type
   
  -            if (obj instanceof CommandManager) retVal = 0;
  -            if (obj instanceof ThreadManager) retVal = 2;
  +            if( obj instanceof CommandManager ) retVal = 0;
  +            if( obj instanceof ThreadManager ) retVal = 2;
   
               return retVal;
           }
  
  
  
  1.6       +2 -3      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/FortressConfig.java
  
  Index: FortressConfig.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/FortressConfig.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FortressConfig.java	7 Mar 2003 20:21:26 -0000	1.5
  +++ FortressConfig.java	19 Mar 2003 12:55:48 -0000	1.6
  @@ -50,7 +50,6 @@
   package org.apache.avalon.fortress.util;
   
   import java.io.File;
  -
   import org.apache.avalon.excalibur.logger.LoggerManager;
   import org.apache.avalon.fortress.impl.DefaultContainer;
   import org.apache.avalon.framework.configuration.Configuration;
  @@ -163,7 +162,7 @@
       {
           m_context.put( ContextManagerConstants.SERVICE_MANAGER, componentManager );
       }
  -    
  +
       public void setLifecycleExtensionManager( final LifecycleExtensionManager extensionManager )
       {
           m_context.put( LifecycleExtensionManager.ROLE, extensionManager );
  
  
  
  1.3       +2 -2      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/LifecycleExtensionManager.java
  
  Index: LifecycleExtensionManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/LifecycleExtensionManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LifecycleExtensionManager.java	11 Mar 2003 14:09:41 -0000	1.2
  +++ LifecycleExtensionManager.java	19 Mar 2003 12:55:48 -0000	1.3
  @@ -53,7 +53,6 @@
   import java.util.Collections;
   import java.util.Iterator;
   import java.util.List;
  -
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.lifecycle.Accessor;
  @@ -302,6 +301,7 @@
       {
           m_creatorExtensions.clear();
       }
  +
       // Lifecycle method constants, these are passed to executeExtensions()
       protected static final int ACCESS = 0;
       protected static final int RELEASE = 1;
  
  
  
  1.3       +10 -10    avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/OverridableContext.java
  
  Index: OverridableContext.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/OverridableContext.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- OverridableContext.java	7 Feb 2003 16:08:12 -0000	1.2
  +++ OverridableContext.java	19 Mar 2003 12:55:48 -0000	1.3
  @@ -62,20 +62,20 @@
   public final class OverridableContext
       extends DefaultContext
   {
  -   /**
  -    * Creation of a new overridable context.
  -    * @param parent the parent context
  -    */
  +    /**
  +     * Creation of a new overridable context.
  +     * @param parent the parent context
  +     */
       public OverridableContext( Context parent )
       {
           super( parent );
       }
   
  -   /**
  -    * Add a context entry to the context.
  -    * @param key the context key
  -    * @param value the context value
  -    */
  +    /**
  +     * Add a context entry to the context.
  +     * @param key the context key
  +     * @param value the context value
  +     */
       public void put( final Object key, final Object value )
       {
           if( null == value )
  
  
  
  1.3       +5 -5      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/Service.java
  
  Index: Service.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util/Service.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Service.java	18 Mar 2003 18:07:37 -0000	1.2
  +++ Service.java	19 Mar 2003 12:55:48 -0000	1.3
  @@ -54,7 +54,6 @@
    */
   package org.apache.avalon.fortress.util;
   
  -
   import java.io.BufferedReader;
   import java.io.IOException;
   import java.io.InputStream;
  @@ -89,7 +88,8 @@
        * Private constructor to keep from instantiating this class
        */
       private Service()
  -    {}
  +    {
  +    }
   
       /**
        * Get all the providers for the specified services.
  @@ -108,7 +108,7 @@
               loader = klass.getClassLoader();
           }
   
  -        Set providerSet = ( Set )providers.get( serviceFile );
  +        Set providerSet = (Set)providers.get( serviceFile );
   
           if( null == providerSet )
           {
  @@ -133,11 +133,11 @@
                   {
                       try
                       {
  -                        URL url = ( URL )enum.nextElement();
  +                        URL url = (URL)enum.nextElement();
                           InputStream is = url.openStream();
                           BufferedReader reader = new BufferedReader(
                               new InputStreamReader( is,
  -                            "UTF-8" ) );
  +                                                   "UTF-8" ) );
   
                           String line = reader.readLine();
                           while( null != line )
  
  
  

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


Mime
View raw message