ceki 01/09/04 13:06:23
Modified: src/java/org/apache/log4j AppenderSkeleton.java
Category.java Hierarchy.java Priority.java
PropertyConfigurator.java
src/java/org/apache/log4j/examples Makefile
src/java/org/apache/log4j/examples/appserver
AppServerCategory.java
AppServerCategoryFactory.java
AppServerLoggingEvent.java
src/java/org/apache/log4j/spi LoggingEvent.java
RootCategory.java
src/java/org/apache/log4j/xml/examples XLogger.java
XTest.java
Log:
Changes so that the javadocs are created with less warnings.
Revision Changes Path
1.17 +4 -4 jakarta-log4j/src/java/org/apache/log4j/AppenderSkeleton.java
Index: AppenderSkeleton.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/AppenderSkeleton.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AppenderSkeleton.java 2001/09/02 20:05:38 1.16
+++ AppenderSkeleton.java 2001/09/04 20:06:23 1.17
@@ -35,7 +35,7 @@
/**
There is no level threshold filtering by default. */
- protected Level threshold;
+ protected Priority threshold;
/**
It is assumed and enforced that errorHandler is never null.
@@ -173,7 +173,7 @@
@since 1.1 */
public
- Level getThreshold() {
+ Priority getThreshold() {
return threshold;
}
@@ -185,8 +185,8 @@
*/
public
- boolean isAsSevereAsThreshold(Level level) {
- return ((threshold == null) || level.isGreaterOrEqual(threshold));
+ boolean isAsSevereAsThreshold(Priority priority) {
+ return ((threshold == null) || priority.isGreaterOrEqual(threshold));
}
1.47 +2 -2 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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Category.java 2001/09/04 18:44:47 1.46
+++ Category.java 2001/09/04 20:06:23 1.47
@@ -609,14 +609,14 @@
/**
Like {@link #getInstance(String)} except that the type of category
instantiated depends on the type returned by the {@link
- CategoryFactory#makeNewCategoryInstance} method of the
+ LoggerFactory#makeNewLoggerInstance} method of the
<code>factory</code> parameter.
<p>This method is intended to be used by sub-classes.
@param name The name of the category to retrieve.
- @param factory A {@link CategoryFactory} implementation that will
+ @param factory A {@link LoggerFactory} implementation that will
actually create a new Instance.
@since 0.8.5 */
1.30 +2 -2 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Hierarchy.java 2001/09/04 18:44:47 1.29
+++ Hierarchy.java 2001/09/04 20:06:23 1.30
@@ -41,8 +41,8 @@
default package access.
<p>The structure of the category hierarchy is maintained by the
- {@link #getInstance} method. The hierarchy is such that children
- link to their parent but parents do not have any pointers to their
+ {@link #getLogger} method. The hierarchy is such that children link
+ to their parent but parents do not have any pointers to their
children. Moreover, categories can be instantiated in any order, in
particular descendant before ancestor.
1.15 +1 -1 jakarta-log4j/src/java/org/apache/log4j/Priority.java
Index: Priority.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Priority.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Priority.java 2001/09/04 18:44:47 1.14
+++ Priority.java 2001/09/04 20:06:23 1.15
@@ -138,7 +138,7 @@
Convert the string passed as argument to a priority. If the
conversion fails, then this method returns {@link #DEBUG}.
- @deprecated Please use the {@link Level.toPLevel(String)} method instead.}
+ @deprecated Please use the {@link Level#toLevel(String)} method instead.}
*/
1.35 +3 -3
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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- PropertyConfigurator.java 2001/09/04 15:23:52 1.34
+++ PropertyConfigurator.java 2001/09/04 20:06:23 1.35
@@ -94,8 +94,8 @@
static final String APPENDER_PREFIX = "log4j.appender.";
static final String RENDERER_PREFIX = "log4j.renderer.";
- /** Key for specifying the {@link org.apache.log4j.spi.CategoryFactory
- CategoryFactory}. Currently set to
+ /** Key for specifying the {@link org.apache.log4j.spi.LoggerFactory
+ LoggerFactory}. Currently set to
"<code>log4j.categoryFactory</code>". */
public static final String CATEGORY_FACTORY_KEY = "log4j.categoryFactory";
@@ -443,7 +443,7 @@
/**
Check the provided <code>Properties</code> object for a
- {@link org.apache.log4j.spi.CategoryFactory CategoryFactory}
+ {@link org.apache.log4j.spi.LoggerFactory LoggerFactory}
entry specified by {@link #CATEGORY_FACTORY_KEY}. If such an entry
exists, an attempt is made to create an instance using the default
constructor. This instance is used for subsequent Category creations
1.7 +1 -3 jakarta-log4j/src/java/org/apache/log4j/examples/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/examples/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile 2001/09/04 18:44:47 1.6
+++ Makefile 2001/09/04 20:06:23 1.7
@@ -13,9 +13,7 @@
JRMI:=NumberCruncherServer.java
-SUBDIRS :=
-
-#appserver
+SUBDIRS := appserver
# include master-rule file
include $(DEPTH)/make/make.inc
1.13 +12 -13
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AppServerCategory.java 2001/09/03 22:10:10 1.12
+++ AppServerCategory.java 2001/09/04 20:06:23 1.13
@@ -44,23 +44,22 @@
* <code>AppServerCategory</code> instance, it is usually more
* convenient to set them once on {@link AppServerCategoryFactory}.
* The factory can then be associated with the
- * <code>AppServerCategory</code> class via {@link #setFactory}
- * or with the entire hierarchy via
- * {@link org.apache.log4j.Hierarchy#setCategoryFactory}. In the
- * former case, you should use {@link AppServerCategory#getInstance}
- * to create new categories. In the latter case, you would use
- * {@link org.apache.log4j.Category#getInstance(String)}. The former
- * method allows finer granularity of control; the latter is more
- * convenient. Reliance on the
- * {@link org.apache.log4j.PropertyConfigurator} will employ the
- * latter.
+ * <code>AppServerCategory</code> class via {@link #setFactory} or
+ * with the entire hierarchy via {@link
+ * org.apache.log4j.Hierarchy#setLoggerFactory}. In the former case,
+ * you should use {@link AppServerCategory#getInstance} to create new
+ * categories. In the latter case, you would use {@link
+ * org.apache.log4j.Category#getInstance(String)}. The former method
+ * allows finer granularity of control; the latter is more
+ * convenient. Reliance on the {@link
+ * org.apache.log4j.PropertyConfigurator} will employ the latter.
*
* <p>More convenient still is to rely on the
* {@link org.apache.log4j.Category} static initializer. See the
* package level documention for details.
*
* @author Paul Glezen */
-public class AppServerCategory extends Category {
+public class AppServerCategory extends Logger {
private static String FQCN = AppServerCategory.class.getName();
@@ -85,7 +84,7 @@
/**
* Construct a new AppServerCategory with the provided
* attributes. The constructor is protected because the only
- * classes invoking it should be a CategoryFactory subclass or
+ * classes invoking it should be a LoggerFactory subclass or
* a subclass of AppServerCategory.
*
* @param categoryName the name of the category.
@@ -147,7 +146,7 @@
* signature indicates <code>Category</code> to maintain
* compatibility with the base class.
*/
- public static Category getInstance(String name) {
+ public static Logger getInstance(String name) {
if (factory == null)
factory = new AppServerCategoryFactory();
return Category.getInstance(name, factory);
1.10 +2 -2
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AppServerCategoryFactory.java 2001/09/03 22:10:10 1.9
+++ AppServerCategoryFactory.java 2001/09/04 20:06:23 1.10
@@ -133,8 +133,8 @@
*/
public
Logger makeNewLoggerInstance(String name) {
- Category result = new AppServerCategory(name, hostname, server,
- component, version);
+ Logger result = new AppServerCategory(name, hostname, server,
+ component, version);
if ( messageBundle != null )
result.setResourceBundle( messageBundle );
1.5 +10 -10
jakarta-log4j/src/java/org/apache/log4j/examples/appserver/AppServerLoggingEvent.java
Index: AppServerLoggingEvent.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/examples/appserver/AppServerLoggingEvent.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AppServerLoggingEvent.java 2001/06/26 18:28:53 1.4
+++ AppServerLoggingEvent.java 2001/09/04 20:06:23 1.5
@@ -52,16 +52,16 @@
* @param message The message of this event.
* @param throwable The throwable of this event.
*/
- public AppServerLoggingEvent( String fqnOfCategoryClass,
- AppServerCategory category,
- Priority priority,
- Object message,
- Throwable throwable) {
- super(fqnOfCategoryClass, category, priority, message, throwable);
+ public AppServerLoggingEvent(String fqnOfCategoryClass,
+ AppServerCategory logger,
+ Priority priority,
+ Object message,
+ Throwable throwable) {
+ super(fqnOfCategoryClass, logger, priority, message, throwable);
- hostname = category.getHostname();
- component = category.getComponent();
- server = category.getServer();
- version = category.getVersion();
+ hostname = logger.getHostname();
+ component = logger.getComponent();
+ server = logger.getServer();
+ version = logger.getVersion();
}
}
1.22 +3 -3 jakarta-log4j/src/java/org/apache/log4j/spi/LoggingEvent.java
Index: LoggingEvent.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/spi/LoggingEvent.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- LoggingEvent.java 2001/09/04 18:44:47 1.21
+++ LoggingEvent.java 2001/09/04 20:06:23 1.22
@@ -55,7 +55,7 @@
/** Level of logging event. Level cannot be serializable
because it is a flyweight. Due to its special seralization it
cannot be declared final either. */
- transient public Level level;
+ transient public Priority level;
/** The nested diagnostic context (NDC) of logging event. */
private String ndc;
@@ -119,11 +119,11 @@
@param message The message of this event.
@param throwable The throwable of this event. */
public LoggingEvent(String fqnOfCategoryClass, Category logger,
- Level level, Object message, Throwable throwable) {
+ Priority priority, Object message, Throwable throwable) {
this.fqnOfCategoryClass = fqnOfCategoryClass;
this.logger = logger;
this.loggerName = logger.getName();
- this.level = level;
+ this.level = priority;
this.message = message;
if(throwable != null) {
this.throwableInfo = new ThrowableInformation(throwable);
1.9 +1 -1 jakarta-log4j/src/java/org/apache/log4j/spi/RootCategory.java
Index: RootCategory.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/spi/RootCategory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RootCategory.java 2001/09/04 18:44:47 1.8
+++ RootCategory.java 2001/09/04 20:06:23 1.9
@@ -18,7 +18,7 @@
<p>First, it cannot be assigned a <code>null</code>
priority. Second, since root category cannot have a parent, the
- {@link #getChainedPriority} method always returns the value of the
+ {@link #getChainedLevel} method always returns the value of the
level field without walking the hierarchy.
@author Ceki Gülcü
1.2 +1 -1
jakarta-log4j/src/java/org/apache/log4j/xml/examples/XLogger.java
Index: XLogger.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/examples/XLogger.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XLogger.java 2001/09/04 18:47:08 1.1
+++ XLogger.java 2001/09/04 20:06:23 1.2
@@ -18,7 +18,7 @@
/**
A simple example showing Category sub-classing. It shows the
- minimum steps necessary to implement one's {@link CategoryFactory}.
+ minimum steps necessary to implement one's {@link LoggerFactory}.
Note that sub-classes follow the hiearchy even if its categories
belong to different classes.
1.6 +1 -1 jakarta-log4j/src/java/org/apache/log4j/xml/examples/XTest.java
Index: XTest.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/examples/XTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XTest.java 2001/09/04 18:44:48 1.5
+++ XTest.java 2001/09/04 20:06:23 1.6
@@ -9,7 +9,7 @@
/**
A simple example showing Category sub-classing. It shows the
minimum steps necessary to implement one's {@link
- org.apache.log4j.spi.CategoryFactory} and that sub-classes can follow the
+ org.apache.log4j.spi.LoggerFactory} and that sub-classes can follow the
hiearchy
See <b><a href="doc-files/XCategory.java">source
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
