hoju 2005/07/22 23:31:49
Modified: src/java/org/apache/log4j Appender.java
AppenderSkeleton.java DailyRollingFileAppender.java
RollingFileAppender.java
Added: src/java/org/apache/log4j/helpers OnlyOnceErrorHandler.java
src/java/org/apache/log4j/spi ErrorHandler.java
src/java/org/apache/log4j/varia FallbackErrorHandler.java
Log:
Make 1.3 binary compatible with 1.2.xx as it pertains to the ErrorHandler
interface and implementations. Implementations are all NOP and clearly marked
as deprecated in the Javadoc. Same goes for get/set methods for error handlers
in appenders. This change allows LogWeb to compile and run against Log4j-1.3
where it was only compatible with 1.2.xx previously.
Revision Changes Path
1.21 +6 -4 logging-log4j/src/java/org/apache/log4j/Appender.java
Index: Appender.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/Appender.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Appender.java 8 Mar 2005 22:32:56 -0000 1.20
+++ Appender.java 23 Jul 2005 06:31:49 -0000 1.21
@@ -78,18 +78,20 @@
public String getName();
/**
- * Set the [EMAIL PROTECTED] ErrorHandler} for this appender.
+ * Set the [EMAIL PROTECTED] org.apache.log4j.spi.ErrorHandler} for this
appender.
*
* @since 0.9.0
+ * @deprecated As of 1.3
*/
- //public void setErrorHandler(ErrorHandler errorHandler);
+ public void setErrorHandler(org.apache.log4j.spi.ErrorHandler
errorHandler);
/**
- * Returns the [EMAIL PROTECTED] ErrorHandler} for this appender.
+ * Returns the [EMAIL PROTECTED] org.apache.log4j.spi.ErrorHandler} for
this appender.
*
* @since 1.1
+ * @deprecated As of 1.3
*/
- //public ErrorHandler getErrorHandler();
+ public org.apache.log4j.spi.ErrorHandler getErrorHandler();
/**
* Set the [EMAIL PROTECTED] Layout} for this appender.
1.42 +19 -5
logging-log4j/src/java/org/apache/log4j/AppenderSkeleton.java
Index: AppenderSkeleton.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/AppenderSkeleton.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- AppenderSkeleton.java 23 May 2005 00:21:56 -0000 1.41
+++ AppenderSkeleton.java 23 Jul 2005 06:31:49 -0000 1.42
@@ -51,8 +51,10 @@
/**
* It is assumed and enforced that errorHandler is never null.
+ *
+ * @deprecated as of 1.3
*/
- //protected ErrorHandler errorHandler = new OnlyOnceErrorHandler();
+ private final org.apache.log4j.spi.ErrorHandler errorHandler = new
org.apache.log4j.helpers.OnlyOnceErrorHandler();
/**
* The first filter in the filter chain. Set to <code>null</code>
initially.
@@ -162,13 +164,15 @@
}
/**
- * Return the currently set [EMAIL PROTECTED] ErrorHandler} for this
Appender.
+ * Return the hardcoded <code>OnlyOnceErrorHandler</code> for this
Appender.
+ * <code>ErrorHandler</code>'s are no longer utilized as of version 1.3.
*
* @since 0.9.0
+ * @deprecated As of 1.3
*/
-// public ErrorHandler getErrorHandler() {
-// return this.errorHandler;
-// }
+ public final org.apache.log4j.spi.ErrorHandler getErrorHandler() {
+ return this.errorHandler;
+ }
/**
* Returns the head Filter.
@@ -293,6 +297,16 @@
}
/**
+ * Ignored as of 1.3
+ *
+ * @since 0.9.0
+ * @deprecated As of 1.3
+ */
+ public final void setErrorHandler(org.apache.log4j.spi.ErrorHandler eh) {
+ ; //ignore
+ }
+
+ /**
* Set the layout for this appender. Note that some appenders have their
own
* (fixed) layouts or do not use one. For example, the [EMAIL PROTECTED]
* org.apache.log4j.net.SocketAppender} ignores the layout set here.
1.35 +30 -0
logging-log4j/src/java/org/apache/log4j/DailyRollingFileAppender.java
Index: DailyRollingFileAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/DailyRollingFileAppender.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- DailyRollingFileAppender.java 25 May 2005 21:16:27 -0000 1.34
+++ DailyRollingFileAppender.java 23 Jul 2005 06:31:49 -0000 1.35
@@ -37,6 +37,14 @@
* @deprecated Replaced by [EMAIL PROTECTED]
org.apache.log4j.rolling.RollingFileAppender}
*/
public final class DailyRollingFileAppender implements Appender,
OptionHandler {
+
+ /**
+ * It is assumed and enforced that errorHandler is never null.
+ *
+ * @deprecated as of 1.3
+ */
+ private final org.apache.log4j.spi.ErrorHandler errorHandler = new
org.apache.log4j.helpers.OnlyOnceErrorHandler();
+
/**
The date pattern used to initiate rollover.
*/
@@ -311,4 +319,26 @@
public void setBufferSize(final int bufferSize) {
rfa.setBufferSize(bufferSize);
}
+
+ /**
+ * Return the hardcoded <code>OnlyOnceErrorHandler</code> for this
Appender.
+ * <code>ErrorHandler</code>'s are no longer utilized as of version 1.3.
+ *
+ * @since 0.9.0
+ * @deprecated As of 1.3
+ */
+ public final org.apache.log4j.spi.ErrorHandler getErrorHandler() {
+ return this.errorHandler;
+ }
+
+ /**
+ * Ignored as of 1.3
+ *
+ * @since 0.9.0
+ * @deprecated As of 1.3
+ */
+ public final void setErrorHandler(org.apache.log4j.spi.ErrorHandler eh) {
+ ; //ignore
+ }
+
}
1.28 +29 -0
logging-log4j/src/java/org/apache/log4j/RollingFileAppender.java
Index: RollingFileAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/RollingFileAppender.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- RollingFileAppender.java 25 May 2005 21:16:27 -0000 1.27
+++ RollingFileAppender.java 23 Jul 2005 06:31:49 -0000 1.28
@@ -39,6 +39,14 @@
* @deprecated Replaced by [EMAIL PROTECTED]
org.apache.log4j.rolling.RollingFileAppender}
*/
public class RollingFileAppender implements Appender, OptionHandler {
+
+ /**
+ * It is assumed and enforced that errorHandler is never null.
+ *
+ * @deprecated as of 1.3
+ */
+ private final org.apache.log4j.spi.ErrorHandler errorHandler = new
org.apache.log4j.helpers.OnlyOnceErrorHandler();
+
/**
The default maximum file size is 10MB.
*/
@@ -382,4 +390,25 @@
rfa.rollover();
}
+ /**
+ * Return the hardcoded <code>OnlyOnceErrorHandler</code> for this
Appender.
+ * <code>ErrorHandler</code>'s are no longer utilized as of version 1.3.
+ *
+ * @since 0.9.0
+ * @deprecated As of 1.3
+ */
+ public final org.apache.log4j.spi.ErrorHandler getErrorHandler() {
+ return this.errorHandler;
+ }
+
+ /**
+ * Ignored as of 1.3
+ *
+ * @since 0.9.0
+ * @deprecated As of 1.3
+ */
+ public final void setErrorHandler(org.apache.log4j.spi.ErrorHandler eh) {
+ ; //ignore
+ }
+
}
1.14 +20 -77
logging-log4j/src/java/org/apache/log4j/helpers/OnlyOnceErrorHandler.java
1.10 +12 -57
logging-log4j/src/java/org/apache/log4j/spi/ErrorHandler.java
1.11 +20 -127
logging-log4j/src/java/org/apache/log4j/varia/FallbackErrorHandler.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
