avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system Container.java ContainerManager.java
Date Tue, 05 Feb 2002 20:38:17 GMT
bloritsch    02/02/05 12:38:17

  Modified:    src/scratchpad/org/apache/avalon/excalibur/system
                        Container.java ContainerManager.java
  Log:
  make LoggerManager cause a full failure (getLogger() causes an infinite loop if LoggerManager
is not created)
  
  Revision  Changes    Path
  1.6       +2 -2      jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system/Container.java
  
  Index: Container.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system/Container.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Container.java	25 Jan 2002 20:15:11 -0000	1.5
  +++ Container.java	5 Feb 2002 20:38:17 -0000	1.6
  @@ -16,12 +16,12 @@
    * Manager can expose that to the instantiating class.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2002/01/25 20:15:11 $
  + * @version CVS $Revision: 1.6 $ $Date: 2002/02/05 20:38:17 $
    */
   public interface Container
   {
       String CONTEXT_CLASSLOADER = "container.classloader";
  -    String CONTEXT_DIRECTORY   = "container.rootDir";
  +    String CONTEXT_DIRECTORY   = "context-root";
       String WORK_DIRECTORY      = "container.workDir";
       String LOGGER_MANAGER      = "container.logManager";
       String COMMAND_QUEUE       = "container.commandQueue";
  
  
  
  1.19      +4 -2      jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system/ContainerManager.java
  
  Index: ContainerManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system/ContainerManager.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ContainerManager.java	5 Feb 2002 20:06:52 -0000	1.18
  +++ ContainerManager.java	5 Feb 2002 20:38:17 -0000	1.19
  @@ -116,7 +116,7 @@
    * </table>
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.18 $ $Date: 2002/02/05 20:06:52 $
  + * @version CVS $Revision: 1.19 $ $Date: 2002/02/05 20:38:17 $
    */
   public class ContainerManager
   {
  @@ -422,7 +422,9 @@
               }
               catch (Exception e)
               {
  -                getLogger().warn("Could not completely set up LogKitLoggerManager", e);
  +                // We cannot log the exception as the logger has not been set up.
  +                throw new CascadingRuntimeException(
  +                        "Could not completely set up LoggerManager.", e );
               }
   
               m_logManager = logManager;
  
  
  

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