cvs commit: jakarta-avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger DefaultLogTargetFactoryManager.java DefaultLogTargetManager.java

[colus]

colus       2002/11/25 23:44:45

  Modified:    logger/src/java/org/apache/avalon/excalibur/logger
                        DefaultLogTargetFactoryManager.java
                        DefaultLogTargetManager.java
  Log:
  Extract messages to separate lines.
  
  Submitted by: Peter Donald <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.4       +16 -6     
jakarta-avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetFactoryManager.java
  
  Index: DefaultLogTargetFactoryManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetFactoryManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultLogTargetFactoryManager.java       7 Aug 2002 13:36:59 -0000       
1.3
  +++ DefaultLogTargetFactoryManager.java       26 Nov 2002 07:44:45 -0000      
1.4
  @@ -173,15 +173,21 @@
               }
               catch( final ClassNotFoundException cnfe )
               {
  -                throw new ConfigurationException( "cannot find 
LogTargetFactory class " + factoryClass, cnfe );
  +                final String message =
  +                    "cannot find LogTargetFactory class " + factoryClass;
  +                throw new ConfigurationException( message, cnfe );
               }
               catch( final InstantiationException ie )
               {
  -                throw new ConfigurationException( "cannot instantiate 
LogTargetFactory class " + factoryClass, ie );
  +                final String message =
  +                    "cannot instantiate LogTargetFactory class " + 
factoryClass;
  +                throw new ConfigurationException( message, ie );
               }
               catch( final IllegalAccessException iae )
               {
  -                throw new ConfigurationException( "cannot access 
LogTargetFactory class " + factoryClass, iae );
  +                final String message =
  +                    "cannot access LogTargetFactory class " + factoryClass;
  +                throw new ConfigurationException( message, iae );
               }
   
               ContainerUtil.enableLogging( logTargetFactory, getLogger() );
  @@ -191,7 +197,9 @@
               }
               catch( final ContextException ce )
               {
  -                throw new ConfigurationException( "cannot contextualize 
LogTargetFactory " + factoryClass, ce );
  +                final String message =
  +                    "cannot contextualize LogTargetFactory " + factoryClass;
  +                throw new ConfigurationException( message, ce );
               }
               ContainerUtil.configure( logTargetFactory, confs[ i ] );
   
  @@ -202,7 +210,9 @@
   
               if( getLogger().isDebugEnabled() )
               {
  -                getLogger().debug( "added new LogTargetFactory of type " + 
factoryType );
  +                final String message =
  +                    "added new LogTargetFactory of type " + factoryType;
  +                getLogger().debug( message );
               }
               m_factories.put( factoryType, logTargetFactory );
           }
  
  
  
  1.6       +8 -5      
jakarta-avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetManager.java
  
  Index: DefaultLogTargetManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultLogTargetManager.java      2 Oct 2002 01:47:02 -0000       1.5
  +++ DefaultLogTargetManager.java      26 Nov 2002 07:44:45 -0000      1.6
  @@ -106,7 +106,8 @@
       {
           if( null == m_factoryManager )
           {
  -            throw new ConfigurationException( "LogTargetFactory not 
received" );
  +            final String message = "LogTargetFactory not received";
  +            throw new ConfigurationException( message );
           }
   
           final Configuration[] confs = configuration.getChildren();
  @@ -116,14 +117,16 @@
               final LogTargetFactory logTargetFactory = 
m_factoryManager.getLogTargetFactory( targetName );
               if( logTargetFactory == null )
               {
  -                throw new ConfigurationException( "Factory definition for '" 
+ targetName
  -                                                  + "' missing from logger 
configuration." );
  +                final String message = "Factory definition for '" + 
targetName
  +                    + "' missing from logger configuration.";
  +                throw new ConfigurationException( message );
               }
               final LogTarget logTarget = logTargetFactory.createTarget( 
confs[ i ] );
               final String targetId = confs[ i ].getAttribute( "id" );
               if( getLogger().isDebugEnabled() )
               {
  -                getLogger().debug( "added new LogTarget of id " + targetId );
  +                final String message = "added new LogTarget of id " + 
targetId;
  +                getLogger().debug( message );
               }
               m_targets.put( targetId, logTarget );
           }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>