You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@excalibur.apache.org by do...@apache.org on 2004/06/26 10:40:34 UTC
svn commit: rev 22128 - excalibur/trunk/logger/src/java/org/apache/avalon/excalibur/logger
Author: donaldp
Date: Sat Jun 26 01:40:33 2004
New Revision: 22128
Removed:
excalibur/trunk/logger/src/java/org/apache/avalon/excalibur/logger/Resources.properties
Modified:
excalibur/trunk/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetFactoryManager.java
excalibur/trunk/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetManager.java
excalibur/trunk/logger/src/java/org/apache/avalon/excalibur/logger/SimpleLogKitManager.java
Log:
Remove dependency on i18n package by using the strings directly.
This also fixed a bug where the resource id differed between the java source and the resource file
Modified: excalibur/trunk/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetFactoryManager.java
==============================================================================
--- excalibur/trunk/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetFactoryManager.java (original)
+++ excalibur/trunk/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetFactoryManager.java Sat Jun 26 01:40:33 2004
@@ -18,8 +18,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;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -41,9 +39,6 @@
extends AbstractLogEnabled
implements LogTargetFactoryManager, Contextualizable, Configurable
{
- private static final Resources REZ =
- ResourceManager.getPackageResources( DefaultLogTargetFactoryManager.class );
-
/** Map for name to logger mapping */
private final Map m_factories = new HashMap();
@@ -127,19 +122,19 @@
catch( final ClassNotFoundException cnfe )
{
final String message =
- REZ.getString( "target-factory.error.find-class", factoryClass );
+ "Cannot instantiate LogTargetFactory class " + factoryClass;
throw new ConfigurationException( message, cnfe );
}
catch( final InstantiationException ie )
{
final String message =
- REZ.getString( "target-factory.error.instantiate-class", factoryClass );
+ "Cannot instantiate LogTargetFactory class " + factoryClass;
throw new ConfigurationException( message, ie );
}
catch( final IllegalAccessException iae )
{
final String message =
- REZ.getString( "target-factory.error.access-class", factoryClass );
+ "Cannot access LogTargetFactory class " + factoryClass;
throw new ConfigurationException( message, iae );
}
@@ -151,7 +146,7 @@
catch( final ContextException ce )
{
final String message =
- REZ.getString( "target-factory.error.contextualize", factoryClass );
+ "Cannot contextualize LogTargetFactory " + factoryClass;
throw new ConfigurationException( message, ce );
}
ContainerUtil.configure( logTargetFactory, confs[ i ] );
@@ -164,7 +159,7 @@
if( getLogger().isDebugEnabled() )
{
final String message =
- REZ.getString( "target-factory.notice.add", factoryType );
+ "Added new LogTargetFactory of type " + factoryType;
getLogger().debug( message );
}
m_factories.put( factoryType, logTargetFactory );
Modified: excalibur/trunk/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetManager.java
==============================================================================
--- excalibur/trunk/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetManager.java (original)
+++ excalibur/trunk/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetManager.java Sat Jun 26 01:40:33 2004
@@ -18,8 +18,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;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -38,9 +36,6 @@
extends AbstractLogEnabled
implements LogTargetManager, LogTargetFactoryManageable, Configurable
{
- private static final Resources REZ =
- ResourceManager.getPackageResources( DefaultLogTargetManager.class );
-
/** Map for ID to LogTarget mapping */
final private Map m_targets = new HashMap();
@@ -78,7 +73,7 @@
{
if( null == m_factoryManager )
{
- final String message = REZ.getString( "target.error.null-target-factory" );
+ final String message = "LogTargetFactory not received.";
throw new ConfigurationException( message );
}
@@ -89,14 +84,16 @@
final LogTargetFactory logTargetFactory = m_factoryManager.getLogTargetFactory( targetName );
if( logTargetFactory == null )
{
- final String message = REZ.getString( "target.error.missing", targetName );
+ 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() )
{
- final String message = REZ.getString( "target.notice.add", targetId );
+ final String message = "Added new LogTarget of id " + targetId;
getLogger().debug( message );
}
m_targets.put( targetId, logTarget );
Modified: excalibur/trunk/logger/src/java/org/apache/avalon/excalibur/logger/SimpleLogKitManager.java
==============================================================================
--- excalibur/trunk/logger/src/java/org/apache/avalon/excalibur/logger/SimpleLogKitManager.java (original)
+++ excalibur/trunk/logger/src/java/org/apache/avalon/excalibur/logger/SimpleLogKitManager.java Sat Jun 26 01:40:33 2004
@@ -18,11 +18,10 @@
import java.io.File;
import java.io.IOException;
-import java.util.HashMap;
import java.util.Collection;
+import java.util.HashMap;
import java.util.Iterator;
-import org.apache.avalon.excalibur.i18n.ResourceManager;
-import org.apache.avalon.excalibur.i18n.Resources;
+import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -32,13 +31,12 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.AvalonFormatter;
import org.apache.avalon.framework.logger.LogKitLogger;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.log.Hierarchy;
import org.apache.log.LogTarget;
import org.apache.log.Logger;
import org.apache.log.Priority;
-import org.apache.log.util.Closeable;
import org.apache.log.output.io.FileTarget;
+import org.apache.log.util.Closeable;
/**
* A {@link LoggerManager} that supports the old <logs version="1.0"/>
@@ -51,9 +49,6 @@
extends AbstractLogEnabled
implements LoggerManager, Contextualizable, Configurable, Disposable
{
- private static final Resources REZ =
- ResourceManager.getPackageResources( SimpleLogKitManager.class );
-
private static final String DEFAULT_FORMAT =
"%7.7{priority} %23.23{time:yyyy-MM-dd' 'HH:mm:ss.SSS} [%8.8{category}] (%{context}): "
+ "%{message}\n%{throwable}";
@@ -191,7 +186,8 @@
catch( final IOException ioe )
{
final String message =
- REZ.getString( "target.nocreate", name, file, ioe.getMessage() );
+ "Error creating LogTarget named \"" + name + "\" for file " +
+ file + ". (Reason: " + ioe.getMessage() + ").";
throw new ConfigurationException( message, ioe );
}
@@ -224,21 +220,27 @@
final LogTarget logTarget = (LogTarget)targets.get( target );
if( null == target )
{
- final String message = REZ.getString( "unknown-target", target, name );
+ final String message =
+ "Unable to locate LogTarget named \"" + target +
+ "\" for Logger named \"" + name + "\".";
throw new ConfigurationException( message );
}
final Priority priority = Priority.getPriorityForName( priorityName );
if( !priority.getName().equals( priorityName ) )
{
- final String message = REZ.getString( "unknown-priority", priorityName, name );
+ final String message =
+ "Unknown priority \"" + priorityName + "\" for Logger named \"" +
+ name + "\".";
throw new ConfigurationException( message );
}
if( getLogger().isDebugEnabled() )
{
final String message =
- REZ.getString( "category-create", name, target, priorityName );
+ "Creating a log category named \"" + name +
+ "\" that writes to \"" + target + "\" target at priority \"" +
+ priorityName + "\".";
getLogger().debug( message );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: scm-unsubscribe@excalibur.apache.org
For additional commands, e-mail: scm-help@excalibur.apache.org