You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by co...@apache.org on 2002/03/22 08:56:44 UTC
cvs commit: jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/factory AsyncLogTargetFactory.java FileTargetFactory.java FormatterFactory.java JDBCTargetFactory.java JMSTargetFactory.java PriorityFilterTargetFactory.java ServletTargetFactory.java StreamTargetFactory.java
colus 02/03/21 23:56:44
Modified: all/src/java/org/apache/avalon/excalibur/logger
DefaultLogKitManager.java
DefaultLogTargetManager.java
LogKitLoggerManager.java
all/src/java/org/apache/avalon/excalibur/logger/factory
AsyncLogTargetFactory.java FileTargetFactory.java
FormatterFactory.java JDBCTargetFactory.java
JMSTargetFactory.java
PriorityFilterTargetFactory.java
ServletTargetFactory.java StreamTargetFactory.java
Log:
Remove unused imports.
Fix some javadoc error.
Check variable naming style.
Revision Changes Path
1.16 +14 -14 jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/DefaultLogKitManager.java
Index: DefaultLogKitManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/DefaultLogKitManager.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DefaultLogKitManager.java 16 Mar 2002 00:05:40 -0000 1.15
+++ DefaultLogKitManager.java 22 Mar 2002 07:56:44 -0000 1.16
@@ -32,7 +32,7 @@
* supports the new framework Logger interface.
*
* @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
- * @version CVS $Revision: 1.15 $ $Date: 2002/03/16 00:05:40 $
+ * @version CVS $Revision: 1.16 $ $Date: 2002/03/22 07:56:44 $
* @since 4.0
*/
public class DefaultLogKitManager
@@ -241,7 +241,7 @@
/**
* Setup Loggers
*
- * @param configuration [] The array object of configurations for categories.
+ * @param categories The array object of configurations for categories.
* @throws ConfigurationException if the configuration is malformed
*/
private final void setupLoggers( final LogTargetManager targetManager,
@@ -255,42 +255,42 @@
final String loglevel = categories[ i ].getAttribute( "log-level" ).toUpperCase();
final Configuration[] targets = categories[ i ].getChildren( "log-target" );
- final LogTarget[] log_targets = new LogTarget[ targets.length ];
+ final LogTarget[] logTargets = new LogTarget[ targets.length ];
for( int j = 0; j < targets.length; j++ )
{
final String id = targets[ j ].getAttribute( "id-ref" );
- log_targets[ j ] = targetManager.getLogTarget( id );
+ logTargets[ j ] = targetManager.getLogTarget( id );
}
- if( "".equals( category ) && log_targets.length > 0 )
+ if( "".equals( category ) && logTargets.length > 0 )
{
m_hierarchy.setDefaultPriority( Priority.getPriorityForName( loglevel ) );
- m_hierarchy.setDefaultLogTargets( log_targets );
+ m_hierarchy.setDefaultLogTargets( logTargets );
}
- final String full_category;
+ final String fullCategory;
if( null == parentCategory )
{
- full_category = category;
+ fullCategory = category;
}
else
{
- full_category = parentCategory + Logger.CATEGORY_SEPARATOR + category;
+ fullCategory = parentCategory + Logger.CATEGORY_SEPARATOR + category;
}
- final Logger logger = m_hierarchy.getLoggerFor( full_category );
- m_loggers.put( full_category, logger );
+ final Logger logger = m_hierarchy.getLoggerFor( fullCategory );
+ m_loggers.put( fullCategory, logger );
if( getLogger().isDebugEnabled() )
{
- getLogger().debug( "added logger for category " + full_category );
+ getLogger().debug( "added logger for category " + fullCategory );
}
logger.setPriority( Priority.getPriorityForName( loglevel ) );
- logger.setLogTargets( log_targets );
+ logger.setLogTargets( logTargets );
final Configuration[] sub_categories = categories[ i ].getChildren( "category" );
if( null != sub_categories )
{
- setupLoggers( targetManager, full_category, sub_categories );
+ setupLoggers( targetManager, fullCategory, sub_categories );
}
}
}
1.7 +6 -6 jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetManager.java
Index: DefaultLogTargetManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultLogTargetManager.java 16 Mar 2002 00:05:40 -0000 1.6
+++ DefaultLogTargetManager.java 22 Mar 2002 07:56:44 -0000 1.7
@@ -23,7 +23,7 @@
* from a configuration file.
*
* @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
- * @version CVS $Revision: 1.6 $ $Date: 2002/03/16 00:05:40 $
+ * @version CVS $Revision: 1.7 $ $Date: 2002/03/22 07:56:44 $
* @since 4.0
*/
public class DefaultLogTargetManager
@@ -37,13 +37,13 @@
private Context m_context;
/** The LogTargetFactoryManager object */
- private LogTargetFactoryManager m_factory_manager;
+ private LogTargetFactoryManager m_factoryManager;
/**
* Retrieves a LogTarget for an ID. If this LogTargetManager
* does not have the match a null will be returned.
*
- * @param ID The LogTarget ID
+ * @param id The LogTarget ID
* @return the LogTarget or null if none is found.
*/
public final LogTarget getLogTarget( final String id )
@@ -69,7 +69,7 @@
*/
public final void setLogTargetFactoryManager( final LogTargetFactoryManager logTargetFactoryManager )
{
- m_factory_manager = logTargetFactoryManager;
+ m_factoryManager = logTargetFactoryManager;
}
/**
@@ -81,7 +81,7 @@
public final void configure( final Configuration configuration )
throws ConfigurationException
{
- if( null == m_factory_manager )
+ if( null == m_factoryManager )
{
throw new ConfigurationException( "LogTargetFactory not received" );
}
@@ -90,7 +90,7 @@
for( int i = 0; i < confs.length; i++ )
{
final String targetName = confs[ i ].getName();
- final LogTargetFactory logTargetFactory = m_factory_manager.getLogTargetFactory( targetName );
+ final LogTargetFactory logTargetFactory = m_factoryManager.getLogTargetFactory( targetName );
final LogTarget logTarget = logTargetFactory.createTarget( confs[ i ] );
final String targetId = confs[ i ].getAttribute( "id" );
if( getLogger().isDebugEnabled() )
1.3 +14 -14 jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/LogKitLoggerManager.java
Index: LogKitLoggerManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/LogKitLoggerManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LogKitLoggerManager.java 16 Mar 2002 00:05:40 -0000 1.2
+++ LogKitLoggerManager.java 22 Mar 2002 07:56:44 -0000 1.3
@@ -29,7 +29,7 @@
*
* @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.2 $ $Date: 2002/03/16 00:05:40 $
+ * @version CVS $Revision: 1.3 $ $Date: 2002/03/22 07:56:44 $
* @since 4.0
*/
public class LogKitLoggerManager
@@ -241,7 +241,7 @@
/**
* Setup Loggers
*
- * @param configuration [] The array object of configurations for categories.
+ * @param categories [] The array object of configurations for categories.
* @throws ConfigurationException if the configuration is malformed
*/
private final void setupLoggers( final LogTargetManager targetManager,
@@ -255,42 +255,42 @@
final String loglevel = categories[ i ].getAttribute( "log-level" ).toUpperCase();
final Configuration[] targets = categories[ i ].getChildren( "log-target" );
- final LogTarget[] log_targets = new LogTarget[ targets.length ];
+ final LogTarget[] logTargets = new LogTarget[ targets.length ];
for( int j = 0; j < targets.length; j++ )
{
final String id = targets[ j ].getAttribute( "id-ref" );
- log_targets[ j ] = targetManager.getLogTarget( id );
+ logTargets[ j ] = targetManager.getLogTarget( id );
}
- if( "".equals( category ) && log_targets.length > 0 )
+ if( "".equals( category ) && logTargets.length > 0 )
{
m_hierarchy.setDefaultPriority( Priority.getPriorityForName( loglevel ) );
- m_hierarchy.setDefaultLogTargets( log_targets );
+ m_hierarchy.setDefaultLogTargets( logTargets );
}
- final String full_category;
+ final String fullCategory;
if( null == parentCategory )
{
- full_category = category;
+ fullCategory = category;
}
else
{
- full_category = parentCategory + org.apache.log.Logger.CATEGORY_SEPARATOR + category;
+ fullCategory = parentCategory + org.apache.log.Logger.CATEGORY_SEPARATOR + category;
}
- final org.apache.log.Logger logger = m_hierarchy.getLoggerFor( full_category );
- m_loggers.put( full_category, new LogKitLogger( logger ) );
+ final org.apache.log.Logger logger = m_hierarchy.getLoggerFor( fullCategory );
+ m_loggers.put( fullCategory, new LogKitLogger( logger ) );
if( m_defaultLogger.isDebugEnabled() )
{
- m_defaultLogger.debug( "added logger for category " + full_category );
+ m_defaultLogger.debug( "added logger for category " + fullCategory );
}
logger.setPriority( Priority.getPriorityForName( loglevel ) );
- logger.setLogTargets( log_targets );
+ logger.setLogTargets( logTargets );
final Configuration[] sub_categories = categories[ i ].getChildren( "category" );
if( null != sub_categories )
{
- setupLoggers( targetManager, full_category, sub_categories );
+ setupLoggers( targetManager, fullCategory, sub_categories );
}
}
}
1.7 +1 -2 jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/factory/AsyncLogTargetFactory.java
Index: AsyncLogTargetFactory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/factory/AsyncLogTargetFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AsyncLogTargetFactory.java 16 Mar 2002 00:05:41 -0000 1.6
+++ AsyncLogTargetFactory.java 22 Mar 2002 07:56:44 -0000 1.7
@@ -12,7 +12,6 @@
import org.apache.avalon.excalibur.logger.LogTargetFactoryManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.context.ContextException;
import org.apache.log.LogTarget;
import org.apache.log.output.AsyncLogTarget;
@@ -47,7 +46,7 @@
* </p>
*
* @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
- * @version CVS $Revision: 1.6 $ $Date: 2002/03/16 00:05:41 $
+ * @version CVS $Revision: 1.7 $ $Date: 2002/03/22 07:56:44 $
* @since 4.0
*/
public final class AsyncLogTargetFactory
1.14 +15 -21 jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/factory/FileTargetFactory.java
Index: FileTargetFactory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/factory/FileTargetFactory.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FileTargetFactory.java 16 Mar 2002 00:05:41 -0000 1.13
+++ FileTargetFactory.java 22 Mar 2002 07:56:44 -0000 1.14
@@ -10,17 +10,11 @@
import java.io.File;
import java.io.IOException;
import java.util.StringTokenizer;
-import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
import org.apache.log.LogTarget;
-import org.apache.log.format.ExtendedPatternFormatter;
import org.apache.log.format.Formatter;
-import org.apache.log.format.PatternFormatter;
-import org.apache.log.format.RawFormatter;
import org.apache.log.output.io.FileTarget;
import org.apache.log.output.io.rotate.FileStrategy;
import org.apache.log.output.io.rotate.OrRotateStrategy;
@@ -112,7 +106,7 @@
* </dl>
*
* @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
- * @version CVS $Revision: 1.13 $ $Date: 2002/03/16 00:05:41 $
+ * @version CVS $Revision: 1.14 $ $Date: 2002/03/22 07:56:44 $
* @since 4.0
*/
public class FileTargetFactory
@@ -125,32 +119,32 @@
public final LogTarget createTarget( final Configuration configuration )
throws ConfigurationException
{
- final Configuration conf_filename = configuration.getChild( "filename" );
- final String filename = getFilename( conf_filename.getValue() );
+ final Configuration confFilename = configuration.getChild( "filename" );
+ final String filename = getFilename( confFilename.getValue() );
- final Configuration conf_rotation = configuration.getChild( "rotation", false );
+ final Configuration confRotation = configuration.getChild( "rotation", false );
- final Configuration conf_format = configuration.getChild( "format" );
+ final Configuration confFormat = configuration.getChild( "format" );
- final Configuration conf_append = configuration.getChild( "append" );
- final boolean append = conf_append.getValueAsBoolean( false );
+ final Configuration confAppend = configuration.getChild( "append" );
+ final boolean append = confAppend.getValueAsBoolean( false );
final LogTarget logtarget;
final File file = new File( filename );
- final Formatter formatter = getFormatter( conf_format );
+ final Formatter formatter = getFormatter( confFormat );
try
{
- if( null == conf_rotation )
+ if( null == confRotation )
{
logtarget = new FileTarget( file, append, formatter );
}
else
{
- final Configuration conf_strategy = conf_rotation.getChildren()[ 0 ];
- final RotateStrategy rotateStrategy = getRotateStrategy( conf_strategy );
- final FileStrategy fileStrategy = getFileStrategy( conf_rotation, file );
+ final Configuration confStrategy = confRotation.getChildren()[ 0 ];
+ final RotateStrategy rotateStrategy = getRotateStrategy( confStrategy );
+ final FileStrategy fileStrategy = getFileStrategy( confRotation, file );
logtarget =
new RotatingFileTarget( append, formatter, rotateStrategy, fileStrategy );
@@ -329,16 +323,16 @@
sb.append( rawFilename.substring( i, j ) );
}
int k = rawFilename.indexOf( '}', j );
- final String ctx_name = rawFilename.substring( j + 2, k );
+ final String ctxName = rawFilename.substring( j + 2, k );
final Object ctx;
try
{
- ctx = m_context.get( ctx_name );
+ ctx = m_context.get( ctxName );
}
catch( final ContextException ce )
{
throw new ConfigurationException(
- "missing entry '" + ctx_name + "' in Context." );
+ "missing entry '" + ctxName + "' in Context." );
}
sb.append( ctx.toString() );
i = k + 1;
1.5 +0 -2 jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/factory/FormatterFactory.java
Index: FormatterFactory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/factory/FormatterFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FormatterFactory.java 16 Mar 2002 00:05:41 -0000 1.4
+++ FormatterFactory.java 22 Mar 2002 07:56:44 -0000 1.5
@@ -6,9 +6,7 @@
package org.apache.avalon.excalibur.logger.factory;
-import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AvalonFormatter;
import org.apache.log.format.ExtendedPatternFormatter;
import org.apache.log.format.Formatter;
1.7 +1 -2 jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/factory/JDBCTargetFactory.java
Index: JDBCTargetFactory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/factory/JDBCTargetFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JDBCTargetFactory.java 16 Mar 2002 00:05:41 -0000 1.6
+++ JDBCTargetFactory.java 22 Mar 2002 07:56:44 -0000 1.7
@@ -12,7 +12,6 @@
import javax.naming.NamingException;
import javax.sql.DataSource;
import org.apache.avalon.excalibur.logger.LogTargetFactory;
-import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.log.LogTarget;
@@ -46,7 +45,7 @@
* </pre>
*
* @author <a href="mailto:mirceatoma@home.com">Mircea Toma</a>;
- * @version CVS $Revision: 1.6 $ $Date: 2002/03/16 00:05:41 $
+ * @version CVS $Revision: 1.7 $ $Date: 2002/03/22 07:56:44 $
*/
public class JDBCTargetFactory implements LogTargetFactory
{
1.4 +1 -2 jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/factory/JMSTargetFactory.java
Index: JMSTargetFactory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/factory/JMSTargetFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JMSTargetFactory.java 16 Mar 2002 00:05:41 -0000 1.3
+++ JMSTargetFactory.java 22 Mar 2002 07:56:44 -0000 1.4
@@ -17,7 +17,6 @@
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
import org.apache.avalon.excalibur.logger.LogTargetFactory;
-import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.log.LogTarget;
@@ -58,7 +57,7 @@
* </pre>
*
* @author <a href="mailto:mirceatoma@home.com">Mircea Toma</a>;
- * @version CVS $Revision: 1.3 $ $Date: 2002/03/16 00:05:41 $
+ * @version CVS $Revision: 1.4 $ $Date: 2002/03/22 07:56:44 $
*/
public class JMSTargetFactory implements LogTargetFactory
{
1.6 +1 -2 jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/factory/PriorityFilterTargetFactory.java
Index: PriorityFilterTargetFactory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/factory/PriorityFilterTargetFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PriorityFilterTargetFactory.java 16 Mar 2002 00:05:41 -0000 1.5
+++ PriorityFilterTargetFactory.java 22 Mar 2002 07:56:44 -0000 1.6
@@ -12,7 +12,6 @@
import org.apache.avalon.excalibur.logger.LogTargetFactoryManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.context.ContextException;
import org.apache.log.LogTarget;
import org.apache.log.Priority;
import org.apache.log.filter.PriorityFilter;
@@ -39,7 +38,7 @@
* </p>
*
* @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
- * @version CVS $Revision: 1.5 $ $Date: 2002/03/16 00:05:41 $
+ * @version CVS $Revision: 1.6 $ $Date: 2002/03/22 07:56:44 $
* @since 4.0
*/
public final class PriorityFilterTargetFactory
1.8 +1 -4 jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/factory/ServletTargetFactory.java
Index: ServletTargetFactory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/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 16 Mar 2002 00:05:41 -0000 1.7
+++ ServletTargetFactory.java 22 Mar 2002 07:56:44 -0000 1.8
@@ -12,10 +12,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.context.ContextException;
import org.apache.log.LogTarget;
-import org.apache.log.format.ExtendedPatternFormatter;
import org.apache.log.format.Formatter;
-import org.apache.log.format.PatternFormatter;
-import org.apache.log.format.RawFormatter;
import org.apache.log.output.ServletOutputLogTarget;
/**
@@ -46,7 +43,7 @@
* </dl>
*
* @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
- * @version CVS $Revision: 1.7 $ $Date: 2002/03/16 00:05:41 $
+ * @version CVS $Revision: 1.8 $ $Date: 2002/03/22 07:56:44 $
* @since 4.0
*/
public final class ServletTargetFactory
1.6 +1 -4 jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/factory/StreamTargetFactory.java
Index: StreamTargetFactory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/logger/factory/StreamTargetFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StreamTargetFactory.java 16 Mar 2002 00:05:41 -0000 1.5
+++ StreamTargetFactory.java 22 Mar 2002 07:56:44 -0000 1.6
@@ -15,10 +15,7 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.log.LogTarget;
-import org.apache.log.format.ExtendedPatternFormatter;
import org.apache.log.format.Formatter;
-import org.apache.log.format.PatternFormatter;
-import org.apache.log.format.RawFormatter;
import org.apache.log.output.io.StreamTarget;
/**
@@ -42,7 +39,7 @@
* <p>The syntax of "format" is the same as in <code>FileTargetFactory</code>.</p>
*
* @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
- * @version CVS $Revision: 1.5 $ $Date: 2002/03/16 00:05:41 $
+ * @version CVS $Revision: 1.6 $ $Date: 2002/03/22 07:56:44 $
*/
public class StreamTargetFactory
extends AbstractTargetFactory
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>