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/logger/src/java/org/apache/avalon/excalibur/logger/factory DatagramTargetFactory.java FileTargetFactory.java JDBCTargetFactory.java LF5TargetFactory.java SMTPTargetFactory.java ServletTargetFactory.java SocketTargetFactory.java StreamTargetFactory.java
Date Tue, 27 May 2003 07:30:29 GMT
donaldp     2003/05/27 00:30:29

  Modified:    logger/src/java/org/apache/avalon/excalibur/logger
                        DefaultLogKitManager.java
                        DefaultLogTargetFactoryManager.java
                        DefaultLogTargetManager.java
                        DefaultLoggerManager.java
                        Log4JConfLoggerManager.java Log4JLoggerManager.java
                        LogKitLoggerManager.java SimpleLogKitManager.java
               logger/src/java/org/apache/avalon/excalibur/logger/factory
                        DatagramTargetFactory.java FileTargetFactory.java
                        JDBCTargetFactory.java LF5TargetFactory.java
                        SMTPTargetFactory.java ServletTargetFactory.java
                        SocketTargetFactory.java StreamTargetFactory.java
  Log:
  Styled and optimized imports
  
  Revision  Changes    Path
  1.10      +12 -13    avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogKitManager.java
  
  Index: DefaultLogKitManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogKitManager.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DefaultLogKitManager.java	22 Mar 2003 12:46:48 -0000	1.9
  +++ DefaultLogKitManager.java	27 May 2003 07:30:27 -0000	1.10
  @@ -52,7 +52,6 @@
   import java.io.File;
   import java.util.HashMap;
   import java.util.Map;
  -
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -209,28 +208,28 @@
           final LogTargetManager targetManager = setupTargetManager( targets, targetFactoryManager
);
   
           final Configuration categories = configuration.getChild( "categories" );
  -        final String debugURL = configuration.getAttribute("debug", null);
  +        final String debugURL = configuration.getAttribute( "debug", null );
           final Configuration[] category = categories.getChildren( "category" );
           setupLoggers( targetManager, m_prefix, category );
  -        
  -        if ( null != debugURL )
  +
  +        if( null != debugURL )
           {
               try
               {
  -                final File rootContext = (File)m_context.get("context-root");
  +                final File rootContext = (File)m_context.get( "context-root" );
                   DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
  -                Configuration debugCategories = builder.buildFromFile(new File(rootContext,
debugURL));
  -                final Configuration[] debugCat = debugCategories.getChildren("category");
  -                setupLoggers( targetManager, m_prefix, debugCat);
  +                Configuration debugCategories = builder.buildFromFile( new File( rootContext,
debugURL ) );
  +                final Configuration[] debugCat = debugCategories.getChildren( "category"
);
  +                setupLoggers( targetManager, m_prefix, debugCat );
               }
  -            catch (ConfigurationException ce)
  +            catch( ConfigurationException ce )
               {
                   throw ce;
               }
  -            catch (Exception e)
  +            catch( Exception e )
               {
  -                getLogger().info("Either there was no \"debug.xlog\" file, or there was
a problem reading it.");
  -                getLogger().debug(e.getMessage(), e);
  +                getLogger().info( "Either there was no \"debug.xlog\" file, or there was
a problem reading it." );
  +                getLogger().debug( e.getMessage(), e );
                   // swallow exception because it is not critical.
               }
           }
  
  
  
  1.11      +2 -3      avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetFactoryManager.java
  
  Index: DefaultLogTargetFactoryManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetFactoryManager.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DefaultLogTargetFactoryManager.java	29 Mar 2003 18:53:25 -0000	1.10
  +++ DefaultLogTargetFactoryManager.java	27 May 2003 07:30:27 -0000	1.11
  @@ -51,7 +51,6 @@
   
   import java.util.HashMap;
   import java.util.Map;
  -
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.framework.configuration.Configurable;
  @@ -76,7 +75,7 @@
       implements LogTargetFactoryManager, Contextualizable, Configurable
   {
       private static final Resources REZ =
  -        ResourceManager.getPackageResources(DefaultLogTargetFactoryManager.class);
  +        ResourceManager.getPackageResources( DefaultLogTargetFactoryManager.class );
   
       /** Map for name to logger mapping */
       private final Map m_factories = new HashMap();
  
  
  
  1.12      +5 -6      avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetManager.java
  
  Index: DefaultLogTargetManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetManager.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DefaultLogTargetManager.java	22 Mar 2003 12:46:48 -0000	1.11
  +++ DefaultLogTargetManager.java	27 May 2003 07:30:27 -0000	1.12
  @@ -51,7 +51,6 @@
   
   import java.util.HashMap;
   import java.util.Map;
  -
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.framework.configuration.Configurable;
  @@ -73,7 +72,7 @@
       implements LogTargetManager, LogTargetFactoryManageable, Configurable
   {
       private static final Resources REZ =
  -        ResourceManager.getPackageResources(DefaultLogTargetManager.class);
  +        ResourceManager.getPackageResources( DefaultLogTargetManager.class );
   
       /** Map for ID to LogTarget mapping */
       final private Map m_targets = new HashMap();
  @@ -112,7 +111,7 @@
       {
           if( null == m_factoryManager )
           {
  -            final String message = REZ.getString("target.error.null-target-factory");
  +            final String message = REZ.getString( "target.error.null-target-factory" );
               throw new ConfigurationException( message );
           }
   
  @@ -123,14 +122,14 @@
               final LogTargetFactory logTargetFactory = m_factoryManager.getLogTargetFactory(
targetName );
               if( logTargetFactory == null )
               {
  -                final String message = REZ.getString("target.error.missing", targetName);
  +                final String message = REZ.getString( "target.error.missing", targetName
);
                   throw new ConfigurationException( message );
               }
               final LogTarget logTarget = logTargetFactory.createTarget( confs[ i ] );
               final String targetId = confs[ i ].getAttribute( "id" );
               if( getLogger().isDebugEnabled() )
               {
  -                final String message = REZ.getString("target.notice.add", targetId);
  +                final String message = REZ.getString( "target.notice.add", targetId );
                   getLogger().debug( message );
               }
               m_targets.put( targetId, logTarget );
  
  
  
  1.6       +62 -57    avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLoggerManager.java
  
  Index: DefaultLoggerManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLoggerManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultLoggerManager.java	29 Mar 2003 18:53:25 -0000	1.5
  +++ DefaultLoggerManager.java	27 May 2003 07:30:27 -0000	1.6
  @@ -71,19 +71,19 @@
    * The idea is to have one single configuration file where you can
    * define, which logger manager (Log4J, LogKit etc.) you want to use, so
    * you don't have to hard-code this.
  - * 
  + *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
    * @version CVS $Revision$ $Date$
    */
   
  -public final class DefaultLoggerManager 
  -    implements LoggerManager, 
  -                ThreadSafe, 
  -                LogEnabled, 
  -                Contextualizable, 
  -                Configurable, 
  -                Serviceable,
  -                Disposable
  +public final class DefaultLoggerManager
  +    implements LoggerManager,
  +    ThreadSafe,
  +    LogEnabled,
  +    Contextualizable,
  +    Configurable,
  +    Serviceable,
  +    Disposable
   {
       /** The used LoggerManager */
       private LoggerManager m_loggermanager;
  @@ -96,13 +96,13 @@
   
       /** The prefix */
       private String m_prefix;
  -    
  +
       /** The service manager */
       private ServiceManager m_manager;
  -    
  +
       /** Do we have to dispose the manager */
       private boolean m_disposeManager = false;
  -    
  +
       /**
        * Creates a new <code>DefaultLoggerManager</code>. .
        */
  @@ -113,7 +113,7 @@
       /**
        * Creates a new <code>DefaultLoggerManager</code>. .
        */
  -    public DefaultLoggerManager(String prefix)
  +    public DefaultLoggerManager( String prefix )
       {
           m_prefix = prefix;
       }
  @@ -167,91 +167,96 @@
           throws ConfigurationException
       {
           // first we test for the class name to use
  -        final String className = configuration.getAttribute("manager-class", null);
  -        
  -        if ( null != className ) 
  +        final String className = configuration.getAttribute( "manager-class", null );
  +
  +        if( null != className )
           {
               // is a prefix available?
  -            final String prefix = configuration.getAttribute("prefix", m_prefix);
  -        
  +            final String prefix = configuration.getAttribute( "prefix", m_prefix );
  +
               // create logger manager
  -            try {
  -                if ( null == prefix )
  +            try
  +            {
  +                if( null == prefix )
                   {
                       m_loggermanager = (LoggerManager)Class.forName( className ).newInstance();
                   }
                   else
                   {
                       m_loggermanager = (LoggerManager)Class.forName( className )
  -                                                          .getConstructor(new Class[] {String.class})
  -                                                          .newInstance(new Object[] {prefix});
  +                        .getConstructor( new Class[]{String.class} )
  +                        .newInstance( new Object[]{prefix} );
                   }
  -            } 
  -            catch (Exception e) 
  +            }
  +            catch( Exception e )
               {
  -                throw new ConfigurationException("Unable to create new logger manager for
class " + className, e);
  +                throw new ConfigurationException( "Unable to create new logger manager
for class " + className, e );
               }
  -        
  +
               // now test for some lifecycle interfaces
  -            if ( m_loggermanager instanceof LogEnabled ) 
  +            if( m_loggermanager instanceof LogEnabled )
               {
  -                ((LogEnabled)m_loggermanager).enableLogging( m_logger);
  +                ( (LogEnabled)m_loggermanager ).enableLogging( m_logger );
               }
  -        
  -            if ( m_loggermanager instanceof Contextualizable)
  +
  +            if( m_loggermanager instanceof Contextualizable )
               {
  -                try 
  +                try
                   {
  -                    ((Contextualizable)m_loggermanager).contextualize( m_context );
  -                } 
  -                catch (ContextException ce)
  +                    ( (Contextualizable)m_loggermanager ).contextualize( m_context );
  +                }
  +                catch( ContextException ce )
                   {
  -                    throw new ConfigurationException("Unable to contextualize new logger
manager.", ce);
  +                    throw new ConfigurationException( "Unable to contextualize new logger
manager.", ce );
                   }
               }
  -        
  -            if ( m_loggermanager instanceof Configurable )
  +
  +            if( m_loggermanager instanceof Configurable )
               {
  -                ((Configurable)m_loggermanager).configure(configuration.getChildren()[0]);
  +                ( (Configurable)m_loggermanager ).configure( configuration.getChildren()[
0 ] );
               }
  -            else if ( m_loggermanager instanceof Parameterizable ) 
  +            else if( m_loggermanager instanceof Parameterizable )
               {
  -                try 
  +                try
                   {
  -                    ((Parameterizable)m_loggermanager).parameterize(Parameters.fromConfiguration(configuration.getChildren()[0]));
  -                } 
  -                catch (ParameterException pe) 
  +                    ( (Parameterizable)m_loggermanager ).parameterize( Parameters.fromConfiguration(
configuration.getChildren()[ 0 ] ) );
  +                }
  +                catch( ParameterException pe )
                   {
  -                    throw new ConfigurationException("Unable to parameterize new logger
manager.", pe);
  +                    throw new ConfigurationException( "Unable to parameterize new logger
manager.", pe );
                   }
               }
  -        } 
  +        }
           else
           {
               // now test for role name
  -            final String roleName = configuration.getAttribute("manager-role", null);
  -            if ( null == roleName ) 
  +            final String roleName = configuration.getAttribute( "manager-role", null );
  +            if( null == roleName )
               {
  -                throw new ConfigurationException("The LoggerManager needs either a manager-role
or a manager-class");
  +                throw new ConfigurationException( "The LoggerManager needs either a manager-role
or a manager-class" );
               }
  -            
  -            try {
  +
  +            try
  +            {
                   m_loggermanager = (LoggerManager)m_manager.lookup( roleName );
                   m_disposeManager = true;
  -            } catch (ServiceException e) {
  -                throw new ConfigurationException("Unable to lookup logger manager with
role " + roleName);
  +            }
  +            catch( ServiceException e )
  +            {
  +                throw new ConfigurationException( "Unable to lookup logger manager with
role " + roleName );
               }
           }
       }
   
  -    public void service(ServiceManager manager) 
  -        throws ServiceException 
  +    public void service( ServiceManager manager )
  +        throws ServiceException
       {
           m_manager = manager;
       }
   
  -    public void dispose() {
  -        if ( m_disposeManager && null != m_manager)
  +    public void dispose()
  +    {
  +        if( m_disposeManager && null != m_manager )
           {
               m_manager.release( m_loggermanager );
           }
  
  
  
  1.4       +15 -15    avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/Log4JConfLoggerManager.java
  
  Index: Log4JConfLoggerManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/Log4JConfLoggerManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Log4JConfLoggerManager.java	25 Feb 2003 16:28:24 -0000	1.3
  +++ Log4JConfLoggerManager.java	27 May 2003 07:30:27 -0000	1.4
  @@ -3,34 +3,34 @@
    ============================================================================
                      The Apache Software License, Version 1.1
    ============================================================================
  - 
  +
    Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  - 
  +
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  - 
  +
    1. Redistributions of  source code must  retain the above copyright  notice,
       this list of conditions and the following disclaimer.
  - 
  +
    2. Redistributions in binary form must reproduce the above copyright notice,
       this list of conditions and the following disclaimer in the documentation
       and/or other materials provided with the distribution.
  - 
  +
    3. The end-user documentation included with the redistribution, if any, must
       include  the following  acknowledgment:  "This product includes  software
       developed  by the  Apache Software Foundation  (http://www.apache.org/)."
       Alternately, this  acknowledgment may  appear in the software itself,  if
       and wherever such third-party acknowledgments normally appear.
  - 
  - 4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"  
  -    must not be used to endorse or promote products derived from this  software 
  -    without  prior written permission. For written permission, please contact 
  +
  + 4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"
  +    must not be used to endorse or promote products derived from this  software
  +    without  prior written permission. For written permission, please contact
       apache@apache.org.
  - 
  +
    5. Products  derived from this software may not  be called "Apache", nor may
       "Apache" appear  in their name,  without prior written permission  of the
       Apache Software Foundation.
  - 
  +
    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
    FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
  @@ -41,11 +41,11 @@
    ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
    (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - 
  +
    This software  consists of voluntary contributions made  by many individuals
  - on  behalf of the Apache Software  Foundation. For more  information on the 
  + on  behalf of the Apache Software  Foundation. For more  information on the
    Apache Software Foundation, please see <http://www.apache.org/>.
  - 
  +
   */
   package org.apache.avalon.excalibur.logger;
   
  
  
  
  1.15      +1 -2      avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/Log4JLoggerManager.java
  
  Index: Log4JLoggerManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/Log4JLoggerManager.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Log4JLoggerManager.java	22 Mar 2003 12:46:48 -0000	1.14
  +++ Log4JLoggerManager.java	27 May 2003 07:30:27 -0000	1.15
  @@ -51,7 +51,6 @@
   
   import java.util.HashMap;
   import java.util.Map;
  -
   import org.apache.avalon.framework.logger.Log4JLogger;
   import org.apache.avalon.framework.logger.LogEnabled;
   import org.apache.avalon.framework.logger.Logger;
  
  
  
  1.15      +3 -4      avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/LogKitLoggerManager.java
  
  Index: LogKitLoggerManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/LogKitLoggerManager.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- LogKitLoggerManager.java	22 Mar 2003 12:46:48 -0000	1.14
  +++ LogKitLoggerManager.java	27 May 2003 07:30:27 -0000	1.15
  @@ -51,7 +51,6 @@
   
   import java.util.HashMap;
   import java.util.Map;
  -
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -338,8 +337,8 @@
           {
               final String category = categories[ i ].getAttribute( "name" );
               final String loglevel = categories[ i ].getAttribute( "log-level" ).toUpperCase();
  -            final boolean additive = categories[i].getAttributeAsBoolean( "additive",
  -                                                                          defaultAdditive
);
  +            final boolean additive = categories[ i ].getAttributeAsBoolean( "additive",
  +                                                                            defaultAdditive
);
   
               final Configuration[] targets = categories[ i ].getChildren( "log-target" );
               final LogTarget[] logTargets = new LogTarget[ targets.length ];
  
  
  
  1.4       +14 -15    avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/SimpleLogKitManager.java
  
  Index: SimpleLogKitManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/SimpleLogKitManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SimpleLogKitManager.java	25 Feb 2003 16:28:24 -0000	1.3
  +++ SimpleLogKitManager.java	27 May 2003 07:30:28 -0000	1.4
  @@ -3,34 +3,34 @@
    ============================================================================
                      The Apache Software License, Version 1.1
    ============================================================================
  - 
  +
    Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  - 
  +
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  - 
  +
    1. Redistributions of  source code must  retain the above copyright  notice,
       this list of conditions and the following disclaimer.
  - 
  +
    2. Redistributions in binary form must reproduce the above copyright notice,
       this list of conditions and the following disclaimer in the documentation
       and/or other materials provided with the distribution.
  - 
  +
    3. The end-user documentation included with the redistribution, if any, must
       include  the following  acknowledgment:  "This product includes  software
       developed  by the  Apache Software Foundation  (http://www.apache.org/)."
       Alternately, this  acknowledgment may  appear in the software itself,  if
       and wherever such third-party acknowledgments normally appear.
  - 
  - 4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"  
  -    must not be used to endorse or promote products derived from this  software 
  -    without  prior written permission. For written permission, please contact 
  +
  + 4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"
  +    must not be used to endorse or promote products derived from this  software
  +    without  prior written permission. For written permission, please contact
       apache@apache.org.
  - 
  +
    5. Products  derived from this software may not  be called "Apache", nor may
       "Apache" appear  in their name,  without prior written permission  of the
       Apache Software Foundation.
  - 
  +
    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
    FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
  @@ -41,18 +41,17 @@
    ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
    (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - 
  +
    This software  consists of voluntary contributions made  by many individuals
  - on  behalf of the Apache Software  Foundation. For more  information on the 
  + on  behalf of the Apache Software  Foundation. For more  information on the
    Apache Software Foundation, please see <http://www.apache.org/>.
  - 
  +
   */
   package org.apache.avalon.excalibur.logger;
   
   import java.io.File;
   import java.io.IOException;
   import java.util.HashMap;
  -
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.framework.configuration.Configurable;
  
  
  
  1.7       +0 -1      avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/DatagramTargetFactory.java
  
  Index: DatagramTargetFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/DatagramTargetFactory.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DatagramTargetFactory.java	22 Mar 2003 12:46:49 -0000	1.6
  +++ DatagramTargetFactory.java	27 May 2003 07:30:28 -0000	1.7
  @@ -52,7 +52,6 @@
   import java.io.IOException;
   import java.net.InetAddress;
   import java.net.UnknownHostException;
  -
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.log.LogTarget;
  
  
  
  1.10      +6 -7      avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/FileTargetFactory.java
  
  Index: FileTargetFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/FileTargetFactory.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- FileTargetFactory.java	7 Apr 2003 06:56:23 -0000	1.9
  +++ FileTargetFactory.java	27 May 2003 07:30:28 -0000	1.10
  @@ -52,7 +52,6 @@
   import java.io.File;
   import java.io.IOException;
   import java.util.StringTokenizer;
  -
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.context.ContextException;
  @@ -266,11 +265,11 @@
               final String value = conf.getValue( "yyyyMMdd" );
               return new RotateStrategyByDate( value );
           }
  -        else if ( "interval".equals( type ) )
  +        else if( "interval".equals( type ) )
           {
               // default rotate strategy
               final String value = conf.getValue( "24:00:00" );
  -    
  +
               // interpret a string like: ddd:hh:mm:ss ...
               final StringTokenizer tokenizer = new StringTokenizer( value, ":" );
               final int count = tokenizer.countTokens();
  @@ -295,14 +294,14 @@
                       time += no * SECOND;
                   }
               }
  -    
  +
               return new RotateStrategyByTime( time );
           }
           else // "time"
           {
               // default rotate strategy
               final String value = conf.getValue( "24:00:00" );
  -    
  +
               // interpret a string like: hh:mm:ss ...
               final StringTokenizer tokenizer = new StringTokenizer( value, ":" );
               final int count = tokenizer.countTokens();
  @@ -323,7 +322,7 @@
                       time += no * SECOND;
                   }
               }
  -    
  +
               return new RotateStrategyByTimeOfDay( time );
           }
       }
  
  
  
  1.8       +1 -2      avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/JDBCTargetFactory.java
  
  Index: JDBCTargetFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/JDBCTargetFactory.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JDBCTargetFactory.java	22 Mar 2003 12:46:49 -0000	1.7
  +++ JDBCTargetFactory.java	27 May 2003 07:30:28 -0000	1.8
  @@ -53,7 +53,6 @@
   import javax.naming.InitialContext;
   import javax.naming.NamingException;
   import javax.sql.DataSource;
  -
   import org.apache.avalon.excalibur.logger.LogTargetFactory;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  
  
  
  1.6       +6 -6      avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/LF5TargetFactory.java
  
  Index: LF5TargetFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/LF5TargetFactory.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- LF5TargetFactory.java	22 Mar 2003 12:46:49 -0000	1.5
  +++ LF5TargetFactory.java	27 May 2003 07:30:28 -0000	1.6
  @@ -66,7 +66,7 @@
    * &lt;/lf5&gt;
    * </pre>
    *
  - * The optional "NDC-pattern" configuration defines the pattern that will be used to 
  + * The optional "NDC-pattern" configuration defines the pattern that will be used to
    * format the log event for display on the "NDC" line in the Swing GUI.
    *
    * @author <a href="sylvain@apache.org">Sylvain Wallez</a>
  @@ -76,16 +76,16 @@
   public class LF5TargetFactory implements LogTargetFactory
   {
       public LogTarget createTarget( final Configuration configuration )
  -      throws ConfigurationException
  +        throws ConfigurationException
       {
           LF5LogTarget result = new LF5LogTarget();
  -        
  +
           Configuration child = configuration.getChild( "NDC-pattern", false );
  -        if ( null != child )
  +        if( null != child )
           {
               result.setNDCFormatter( new FormatterFactory().createFormatter( child ) );
           }
  -        
  +
           return result;
       }
   }
  
  
  
  1.12      +3 -4      avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/SMTPTargetFactory.java
  
  Index: SMTPTargetFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/SMTPTargetFactory.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- SMTPTargetFactory.java	7 Apr 2003 11:24:34 -0000	1.11
  +++ SMTPTargetFactory.java	27 May 2003 07:30:28 -0000	1.12
  @@ -53,7 +53,6 @@
   import javax.mail.Session;
   import javax.mail.internet.AddressException;
   import javax.mail.internet.InternetAddress;
  -
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.context.ContextException;
  @@ -177,7 +176,7 @@
       {
           final Configuration sessionConfig = config.getChild( "session", false );
   
  -        if ( null == sessionConfig )
  +        if( null == sessionConfig )
           {
               final String contextkey =
                   m_configuration.getAttribute( "context-key", "session-context" );
  @@ -187,7 +186,7 @@
                   throw new ConfigurationException( "Context not available" );
               }
   
  -            return (Session) m_context.get( contextkey );
  +            return (Session)m_context.get( contextkey );
           }
           else
           {
  
  
  
  1.8       +1 -2      avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/ServletTargetFactory.java
  
  Index: ServletTargetFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/ServletTargetFactory.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ServletTargetFactory.java	7 Apr 2003 11:25:33 -0000	1.7
  +++ ServletTargetFactory.java	27 May 2003 07:30:28 -0000	1.8
  @@ -50,7 +50,6 @@
   package org.apache.avalon.excalibur.logger.factory;
   
   import javax.servlet.ServletContext;
  -
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.context.ContextException;
  
  
  
  1.9       +0 -1      avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/SocketTargetFactory.java
  
  Index: SocketTargetFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/SocketTargetFactory.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SocketTargetFactory.java	7 Apr 2003 11:26:13 -0000	1.8
  +++ SocketTargetFactory.java	27 May 2003 07:30:28 -0000	1.9
  @@ -52,7 +52,6 @@
   import java.io.IOException;
   import java.net.InetAddress;
   import java.net.UnknownHostException;
  -
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.log.LogTarget;
  
  
  
  1.8       +1 -2      avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/StreamTargetFactory.java
  
  Index: StreamTargetFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/StreamTargetFactory.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- StreamTargetFactory.java	7 Apr 2003 11:26:39 -0000	1.7
  +++ StreamTargetFactory.java	27 May 2003 07:30:28 -0000	1.8
  @@ -50,7 +50,6 @@
   package org.apache.avalon.excalibur.logger.factory;
   
   import java.io.OutputStream;
  -
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.context.Context;
  
  
  

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


Mime
View raw message