avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/util ContextManager.java
Date Mon, 10 Feb 2003 14:48:11 GMT
bloritsch    2003/02/10 06:48:11

  Modified:    fortress/src/java/org/apache/avalon/fortress
                        RoleManager.java
               fortress/src/java/org/apache/avalon/fortress/impl
                        DefaultContainerManager.java
               fortress/src/java/org/apache/avalon/fortress/util
                        ContextManager.java
  Log:
  more cleanup and logging points
  
  Revision  Changes    Path
  1.3       +3 -3      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/RoleManager.java
  
  Index: RoleManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/RoleManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RoleManager.java	7 Feb 2003 16:08:01 -0000	1.2
  +++ RoleManager.java	10 Feb 2003 14:48:10 -0000	1.3
  @@ -75,7 +75,7 @@
        *
        * @return the proper {@link org.apache.avalon.fortress.RoleEntry}
        */
  -    org.apache.avalon.fortress.RoleEntry getRoleForShortName( String shortname );
  +    RoleEntry getRoleForShortName( String shortname );
   
       /**
        * Get a <code>RoleEntry</code> for a component type.  This facilitates
  @@ -87,5 +87,5 @@
        *
        * @return the proper {@link org.apache.avalon.fortress.RoleEntry}
        */
  -    org.apache.avalon.fortress.RoleEntry getRoleForClassname( String classname );
  +    RoleEntry getRoleForClassname( String classname );
   }
  
  
  
  1.4       +8 -7      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/DefaultContainerManager.java
  
  Index: DefaultContainerManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/DefaultContainerManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultContainerManager.java	7 Feb 2003 22:37:52 -0000	1.3
  +++ DefaultContainerManager.java	10 Feb 2003 14:48:10 -0000	1.4
  @@ -65,6 +65,7 @@
   import org.apache.excalibur.event.Queue;
   import org.apache.avalon.fortress.util.ContextManager;
   import org.apache.avalon.fortress.RoleManager;
  +import org.apache.avalon.fortress.InitializationException;
   import org.apache.excalibur.instrument.InstrumentManager;
   import org.apache.excalibur.mpool.PoolManager;
   
  @@ -159,7 +160,7 @@
           initializeContainer();
       }
   
  -    protected void initializeContainer() throws org.apache.avalon.fortress.InitializationException
  +    protected void initializeContainer() throws InitializationException
       {
           if( null == m_containerInstance )
           {
  @@ -168,7 +169,7 @@
       }
   
       private void createContainer()
  -        throws org.apache.avalon.fortress.InitializationException
  +        throws InitializationException
       {
           final Context managerContext =
               m_contextManager.getContainerManagerContext();
  @@ -182,7 +183,7 @@
           {
               final String message =
                   "Cannot set up impl. Unable to create impl class";
  -            throw new org.apache.avalon.fortress.InitializationException( message, e );
  +            throw new InitializationException( message, e );
           }
   
           try
  @@ -192,7 +193,7 @@
   
               if( instance instanceof Composable )
               {
  -                throw new org.apache.avalon.fortress.InitializationException( "Composable
containers are not supported" );
  +                throw new InitializationException( "Composable containers are not supported"
);
               }
   
               final ServiceManager serviceManager =
  @@ -216,8 +217,8 @@
           catch( Exception e )
           {
               final String message =
  -                "Cannot set up impl. Startup lifecycle failure";
  -            throw new org.apache.avalon.fortress.InitializationException( message, e );
  +                "Cannot set up Container. Startup lifecycle failure";
  +            throw new InitializationException( message, e );
           }
       }
   
  
  
  
  1.4       +5 -3      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ContextManager.java	7 Feb 2003 22:37:52 -0000	1.3
  +++ ContextManager.java	10 Feb 2003 14:48:10 -0000	1.4
  @@ -295,7 +295,7 @@
           }
           catch( ContextException ce )
           {
  -            m_logger.debug("Could not initialize the Context", ce);
  +            m_logger.debug("Could not copy the parameters for the Context, ignoring the
exception.", ce);
           }
       }
   
  @@ -542,6 +542,8 @@
           }
           catch( ContextException ce )
           {
  +            m_logger.debug( "Could not copy context entry: " + RoleManager.ROLE +
  +                 ".  Ignoring exception.", ce );
           }
   
           Configuration roleConfig =
  @@ -552,7 +554,7 @@
               // See if we can inherit from the parent...
               try
               {
  -                m_childContext.get( org.apache.avalon.fortress.RoleManager.ROLE );
  +                m_childContext.get( RoleManager.ROLE );
   
                   // OK, done.
                   return;
  
  
  

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


Mime
View raw message