ceki 01/09/03 15:10:10
Modified: docs HISTORY
src/java/org/apache/log4j Category.java
DefaultCategoryFactory.java Hierarchy.java
Logger.java Makefile PropertyConfigurator.java
src/java/org/apache/log4j/examples MyCategory.java
MyCategoryFactory.java MyCategoryTest.java
src/java/org/apache/log4j/examples/appserver
AppServerCategory.java
AppServerCategoryFactory.java
src/java/org/apache/log4j/spi Makefile
src/java/org/apache/log4j/test FQCNTest.java
src/java/org/apache/log4j/xml DOMConfigurator.java
src/java/org/apache/log4j/xml/examples XCategory.java
Log:
- The CategoryFactory class has been replaced by the LoggerFactory
class. The makeNewCategoryInstance method has been renamed as
makeNewLoggerInstance. This change requires client code make use of
extended Category classes to be recompiled. [**]
Dependent classes have been modified to reflect this change.
Revision Changes Path
1.60 +8 -0 jakarta-log4j/docs/HISTORY
Index: HISTORY
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/HISTORY,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- HISTORY 2001/09/02 21:58:27 1.59
+++ HISTORY 2001/09/03 22:10:10 1.60
@@ -9,6 +9,14 @@
- Release of version 1.2alpha_0
+ - The CategoryFactory class has been replaced by the LoggerFactory
+ class. The makeNewCategoryInstance method has been renamed as
+ makeNewLoggerInstance. This change requires client code make use of
+ extended Category classes to be recompiled. [**]
+
+ - The Logger class replaced the Category class. Category class not
+ extends Logger for full backward compatibility. [*]
+
- The Category.assert method has been replaced by
Category.assertLog. This change was mecessary because assert is a
language reserved word in JDK 1.4. [**]
1.44 +6 -4 jakarta-log4j/src/java/org/apache/log4j/Category.java
Index: Category.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Category.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Category.java 2001/09/02 21:40:35 1.43
+++ Category.java 2001/09/03 22:10:10 1.44
@@ -23,7 +23,7 @@
import org.apache.log4j.spi.RootCategory;
import org.apache.log4j.spi.AppenderAttachable;
-import org.apache.log4j.spi.CategoryFactory;
+import org.apache.log4j.spi.LoggerFactory;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.helpers.NullEnumeration;
@@ -56,7 +56,7 @@
private static final String FQCN = Category.class.getName();
- private static CategoryFactory factory = new DefaultCategoryFactory();
+ private static LoggerFactory factory = new DefaultCategoryFactory();
/**
This constructor created a new <code>Category</code> instance and
@@ -158,11 +158,13 @@
<p>The root category is <em>not</em> included in the returned
{@link Enumeration}.
+
+ @deprecated FIXME FIXME FIXME FIXME FIXME FIXME FIXME
*/
public
static
Enumeration getCurrentCategories() {
- return defaultHierarchy.getCurrentCategories();
+ return defaultHierarchy.getCurrentLoggers();
}
@@ -217,7 +219,7 @@
@since 0.8.5 */
public
static
- Category getInstance(String name, CategoryFactory factory) {
+ Category getInstance(String name, LoggerFactory factory) {
return (Category) defaultHierarchy.getLogger(name, factory);
}
1.7 +3 -3
jakarta-log4j/src/java/org/apache/log4j/DefaultCategoryFactory.java
Index: DefaultCategoryFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/DefaultCategoryFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultCategoryFactory.java 2001/09/02 21:40:35 1.6
+++ DefaultCategoryFactory.java 2001/09/03 22:10:10 1.7
@@ -7,15 +7,15 @@
package org.apache.log4j;
-import org.apache.log4j.spi.CategoryFactory;
+import org.apache.log4j.spi.LoggerFactory;
-class DefaultCategoryFactory implements CategoryFactory {
+class DefaultCategoryFactory implements LoggerFactory {
DefaultCategoryFactory() {
}
public
- Logger makeNewCategoryInstance(String name) {
+ Logger makeNewLoggerInstance(String name) {
return new Category(name);
}
}
1.28 +12 -24 jakarta-log4j/src/java/org/apache/log4j/Hierarchy.java
Index: Hierarchy.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Hierarchy.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Hierarchy.java 2001/09/02 21:40:35 1.27
+++ Hierarchy.java 2001/09/03 22:10:10 1.28
@@ -23,8 +23,9 @@
import java.util.Vector;
import org.apache.log4j.spi.RootCategory;
-import org.apache.log4j.spi.CategoryFactory;
+import org.apache.log4j.spi.LoggerFactory;
import org.apache.log4j.spi.HierarchyEventListener;
+import org.apache.log4j.spi.LoggerRepository;
import org.apache.log4j.Appender;
import org.apache.log4j.or.RendererMap;
import org.apache.log4j.or.ObjectRenderer;
@@ -53,9 +54,9 @@
@author Ceki Gülcü
*/
-public class Hierarchy {
+public class Hierarchy implements LoggerRepository {
- private CategoryFactory defaultFactory;
+ private LoggerFactory defaultFactory;
private Vector listeners;
Hashtable ht;
@@ -261,8 +262,7 @@
}
}
-
-
+ public
void fireAddAppenderEvent(Logger logger, Appender appender) {
if(listeners != null) {
int size = listeners.size();
@@ -274,7 +274,6 @@
}
}
-
void fireRemoveAppenderEvent(Logger logger, Appender appender) {
if(listeners != null) {
int size = listeners.size();
@@ -327,7 +326,7 @@
*/
public
- Logger getLogger(String name, CategoryFactory factory) {
+ Logger getLogger(String name, LoggerFactory factory) {
//System.out.println("getInstance("+name+") called.");
CategoryKey key = new CategoryKey(name);
// Synchronize to prevent write conflicts. Read conflicts (in
@@ -338,7 +337,7 @@
synchronized(ht) {
Object o = ht.get(key);
if(o == null) {
- logger = factory.makeNewCategoryInstance(name);
+ logger = factory.makeNewLoggerInstance(name);
logger.setHierarchy(this);
ht.put(key, logger);
updateParents(logger);
@@ -347,7 +346,7 @@
return (Logger) o;
} else if (o instanceof ProvisionNode) {
//System.out.println("("+name+") ht.get(this) returned ProvisionNode");
- logger = factory.makeNewCategoryInstance(name);
+ logger = factory.makeNewLoggerInstance(name);
logger.setHierarchy(this);
ht.put(key, logger);
updateChildren((ProvisionNode) o, logger);
@@ -369,7 +368,7 @@
<p>The root logger is <em>not</em> included in the returned
{@link Enumeration}. */
public
- Enumeration getCurrentCategories() {
+ Enumeration getCurrentLoggers() {
// The accumlation in v is necessary because not all elements in
// ht are Logger objects as there might be some ProvisionNodes
// as well.
@@ -447,7 +446,7 @@
synchronized(ht) {
shutdown(); // nested locks are OK
- Enumeration cats = getCurrentCategories();
+ Enumeration cats = getCurrentLoggers();
while(cats.hasMoreElements()) {
Logger c = (Logger) cats.nextElement();
c.setLevel(null);
@@ -459,17 +458,6 @@
}
/**
- Set the default LoggerFactory instance.
-
- @since 1.1
- */
- public void setCategoryFactory(CategoryFactory factory) {
- if (factory != null) {
- defaultFactory = factory;
- }
- }
-
- /**
Does mothing.
@deprecated Deprecated with no replacement.
@@ -503,7 +491,7 @@
root.closeNestedAppenders();
synchronized(ht) {
- Enumeration cats = this.getCurrentCategories();
+ Enumeration cats = this.getCurrentLoggers();
while(cats.hasMoreElements()) {
Logger c = (Logger) cats.nextElement();
c.closeNestedAppenders();
@@ -511,7 +499,7 @@
// then, remove all appenders
root.removeAllAppenders();
- cats = this.getCurrentCategories();
+ cats = this.getCurrentLoggers();
while(cats.hasMoreElements()) {
Logger c = (Logger) cats.nextElement();
c.removeAllAppenders();
1.2 +2 -16 jakarta-log4j/src/java/org/apache/log4j/Logger.java
Index: Logger.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Logger.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Logger.java 2001/09/02 21:41:46 1.1
+++ Logger.java 2001/09/03 22:10:10 1.2
@@ -23,7 +23,7 @@
import org.apache.log4j.spi.RootCategory;
import org.apache.log4j.spi.AppenderAttachable;
-import org.apache.log4j.spi.CategoryFactory;
+import org.apache.log4j.spi.LoggerFactory;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.helpers.NullEnumeration;
@@ -538,20 +538,6 @@
}
/**
- Returns all the currently defined categories in the default
- hierarchy as an {@link java.util.Enumeration Enumeration}.
-
- <p>The root logger is <em>not</em> included in the returned
- {@link Enumeration}.
- */
- public
- static
- Enumeration getCurrentCategories() {
- return defaultHierarchy.getCurrentCategories();
- }
-
-
- /**
Return the default Hierarchy instance.
@since 1.0
@@ -621,7 +607,7 @@
@since 0.8.5 */
public
static
- Logger getLogger(String name, CategoryFactory factory) {
+ Logger getLogger(String name, LoggerFactory factory) {
return defaultHierarchy.getLogger(name, factory);
}
1.17 +2 -2 jakarta-log4j/src/java/org/apache/log4j/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile 2001/09/02 21:40:35 1.16
+++ Makefile 2001/09/03 22:10:10 1.17
@@ -25,10 +25,10 @@
Logger.java\
PropertyConfigurator.java\
BasicConfigurator.java\
+ HTMLLayout.java\
+ LogManager.java\
-# LogManager.java\
-# HTMLLayout.java\
ifdef $(ISJDK1)
1.33 +4 -4
jakarta-log4j/src/java/org/apache/log4j/PropertyConfigurator.java
Index: PropertyConfigurator.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/PropertyConfigurator.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- PropertyConfigurator.java 2001/09/02 21:40:35 1.32
+++ PropertyConfigurator.java 2001/09/03 22:10:10 1.33
@@ -19,7 +19,7 @@
//import org.apache.log4j.config.PropertySetterException;
import org.apache.log4j.spi.OptionHandler;
import org.apache.log4j.spi.Configurator;
-import org.apache.log4j.spi.CategoryFactory;
+import org.apache.log4j.spi.LoggerFactory;
import org.apache.log4j.or.ObjectRenderer;
import org.apache.log4j.or.RendererMap;
import org.apache.log4j.helpers.LogLog;
@@ -85,7 +85,7 @@
Used internally to keep track of configured appenders.
*/
protected Hashtable registry = new Hashtable(11);
- protected CategoryFactory categoryFactory = new DefaultCategoryFactory();
+ protected LoggerFactory categoryFactory = new DefaultCategoryFactory();
static final String CATEGORY_PREFIX = "log4j.category.";
static final String FACTORY_PREFIX = "log4j.factory";
@@ -456,9 +456,9 @@
props);
if(factoryClassName != null) {
LogLog.debug("Setting category factory to ["+factoryClassName+"].");
- categoryFactory = (CategoryFactory)
+ categoryFactory = (LoggerFactory)
OptionConverter.instantiateByClassName(factoryClassName,
- CategoryFactory.class,
+ LoggerFactory.class,
categoryFactory);
PropertySetter.setProperties(categoryFactory, props, FACTORY_PREFIX + ".");
}
1.14 +1 -1 jakarta-log4j/src/java/org/apache/log4j/examples/MyCategory.java
Index: MyCategory.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/examples/MyCategory.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- MyCategory.java 2001/09/02 20:05:39 1.13
+++ MyCategory.java 2001/09/03 22:10:10 1.14
@@ -8,7 +8,7 @@
package org.apache.log4j.examples;
import org.apache.log4j.*;
-import org.apache.log4j.spi.CategoryFactory;
+import org.apache.log4j.spi.LoggerFactory;
import org.apache.log4j.xml.DOMConfigurator;
import org.apache.log4j.xml.examples.XLevel;
import org.apache.log4j.PropertyConfigurator;
1.6 +3 -3
jakarta-log4j/src/java/org/apache/log4j/examples/MyCategoryFactory.java
Index: MyCategoryFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/examples/MyCategoryFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MyCategoryFactory.java 2001/09/02 21:40:36 1.5
+++ MyCategoryFactory.java 2001/09/03 22:10:10 1.6
@@ -8,7 +8,7 @@
package org.apache.log4j.examples;
import org.apache.log4j.Logger;
-import org.apache.log4j.spi.CategoryFactory;
+import org.apache.log4j.spi.LoggerFactory;
/**
A factory that makes new {@link MyCategory} objects.
@@ -17,7 +17,7 @@
code</a></b> for more details.
@author Ceki Gülcü */
-public class MyCategoryFactory implements CategoryFactory {
+public class MyCategoryFactory implements LoggerFactory {
/**
The constructor should be public as it will be called by
@@ -27,7 +27,7 @@
}
public
- Logger makeNewCategoryInstance(String name) {
+ Logger makeNewLoggerInstance(String name) {
return new MyCategory(name);
}
}
1.3 +1 -1
jakarta-log4j/src/java/org/apache/log4j/examples/MyCategoryTest.java
Index: MyCategoryTest.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/examples/MyCategoryTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MyCategoryTest.java 2001/09/02 20:05:39 1.2
+++ MyCategoryTest.java 2001/09/03 22:10:10 1.3
@@ -8,7 +8,7 @@
package org.apache.log4j.examples;
import org.apache.log4j.*;
-import org.apache.log4j.spi.CategoryFactory;
+import org.apache.log4j.spi.LoggerFactory;
import org.apache.log4j.xml.DOMConfigurator;
import org.apache.log4j.xml.examples.XLevel;
import org.apache.log4j.PropertyConfigurator;
1.12 +3 -3
jakarta-log4j/src/java/org/apache/log4j/examples/appserver/AppServerCategory.java
Index: AppServerCategory.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/examples/appserver/AppServerCategory.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AppServerCategory.java 2001/09/02 21:40:36 1.11
+++ AppServerCategory.java 2001/09/03 22:10:10 1.12
@@ -13,7 +13,7 @@
import org.apache.log4j.Priority;
import org.apache.log4j.Logger;
import org.apache.log4j.Category;
-import org.apache.log4j.spi.CategoryFactory;
+import org.apache.log4j.spi.LoggerFactory;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.helpers.OptionConverter;
@@ -80,7 +80,7 @@
/** A reference to the factory to create <code>AppServerCategory</code>
instances. */
- private static CategoryFactory factory;
+ private static LoggerFactory factory;
/**
* Construct a new AppServerCategory with the provided
@@ -210,7 +210,7 @@
*
* @param factory an <code>AppServerCategory</code> factory
*/
- public static void setFactory(CategoryFactory factory) {
+ public static void setFactory(LoggerFactory factory) {
AppServerCategory.factory = factory;
}
1.9 +3 -3
jakarta-log4j/src/java/org/apache/log4j/examples/appserver/AppServerCategoryFactory.java
Index: AppServerCategoryFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/examples/appserver/AppServerCategoryFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AppServerCategoryFactory.java 2001/09/02 21:40:36 1.8
+++ AppServerCategoryFactory.java 2001/09/03 22:10:10 1.9
@@ -8,7 +8,7 @@
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.Logger;
import org.apache.log4j.Category;
-import org.apache.log4j.spi.CategoryFactory;
+import org.apache.log4j.spi.LoggerFactory;
/**
* Creates correctly populated instances of
@@ -28,7 +28,7 @@
*
* @author Paul Glezen
*/
-public class AppServerCategoryFactory implements CategoryFactory {
+public class AppServerCategoryFactory implements LoggerFactory {
/** The hostname on which this factory resides. This is
determined dynamically using the java.net.InetAddress
@@ -132,7 +132,7 @@
* using the information contained in this instance.
*/
public
- Logger makeNewCategoryInstance(String name) {
+ Logger makeNewLoggerInstance(String name) {
Category result = new AppServerCategory(name, hostname, server,
component, version);
if ( messageBundle != null )
1.10 +3 -4 jakarta-log4j/src/java/org/apache/log4j/spi/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/spi/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile 2001/09/02 20:05:40 1.9
+++ Makefile 2001/09/03 22:10:10 1.10
@@ -13,10 +13,9 @@
ThrowableInformation.java\
TriggeringEventEvaluator.java\
HierarchyEventListener.java\
-
-# LoggerRepository.java\
-# DefaultRepositorySelector.java\
-# LoggerFactory.java\
+ LoggerRepository.java\
+ DefaultRepositorySelector.java\
+ LoggerFactory.java\
SUBDIRS :=
1.4 +2 -2 jakarta-log4j/src/java/org/apache/log4j/test/FQCNTest.java
Index: FQCNTest.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/test/FQCNTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FQCNTest.java 2001/09/02 21:40:36 1.3
+++ FQCNTest.java 2001/09/03 22:10:10 1.4
@@ -92,14 +92,14 @@
}
}
-class X1LoggerFactory implements CategoryFactory {
+class X1LoggerFactory implements LoggerFactory {
public
X1LoggerFactory() {
}
public
- Logger makeNewCategoryInstance(String name) {
+ Logger makeNewLoggerInstance(String name) {
return new X1Logger(name);
}
}
1.31 +2 -2 jakarta-log4j/src/java/org/apache/log4j/xml/DOMConfigurator.java
Index: DOMConfigurator.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/DOMConfigurator.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- DOMConfigurator.java 2001/09/02 21:40:36 1.30
+++ DOMConfigurator.java 2001/09/03 22:10:10 1.31
@@ -19,7 +19,7 @@
import org.apache.log4j.spi.ErrorHandler;
import org.apache.log4j.spi.AppenderAttachable;
import org.apache.log4j.spi.Configurator;
-import org.apache.log4j.spi.CategoryFactory;
+import org.apache.log4j.spi.LoggerFactory;
import org.apache.log4j.Appender;
import org.apache.log4j.Layout;
import org.apache.log4j.Level;
@@ -340,7 +340,7 @@
else {
LogLog.debug("Desired category factory: ["+className+']');
Object catFactory = OptionConverter.instantiateByClassName(className,
-
CategoryFactory.class,
+
LoggerFactory.class,
null);
PropertySetter propSetter = new PropertySetter(catFactory);
1.16 +3 -3
jakarta-log4j/src/java/org/apache/log4j/xml/examples/XCategory.java
Index: XCategory.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/examples/XCategory.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XCategory.java 2001/09/02 21:40:36 1.15
+++ XCategory.java 2001/09/03 22:10:10 1.16
@@ -13,7 +13,7 @@
import org.apache.log4j.Level;
import org.apache.log4j.spi.OptionHandler;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.CategoryFactory;
+import org.apache.log4j.spi.LoggerFactory;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.xml.examples.XLevel;
@@ -178,13 +178,13 @@
// Any sub-class of Category must also have its own implementation of
// CategoryFactory.
- public static class XFactory implements CategoryFactory {
+ public static class XFactory implements LoggerFactory {
public XFactory() {
}
public
- Logger makeNewCategoryInstance(String name) {
+ Logger makeNewLoggerInstance(String name) {
return new XCategory(name);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
