carnold 2005/03/08 14:32:58
Modified: src/java/org/apache/log4j Appender.java
AppenderSkeleton.java AsyncAppender.java
ConsoleAppender.java FileAppender.java
WriterAppender.java
src/java/org/apache/log4j/config ConfiguratorBase.java
src/java/org/apache/log4j/db DBAppender.java
src/java/org/apache/log4j/multiplex
AppenderFactoryUtils.java MultiplexAppender.java
src/java/org/apache/log4j/net JMSAppender.java
MulticastAppender.java SMTPAppender.java
SocketAppender.java SocketHubAppender.java
SyslogAppender.java TelnetAppender.java
UDPAppender.java
src/java/org/apache/log4j/rolling RollingFileAppender.java
src/java/org/apache/log4j/varia ListAppender.java
ListModelAppender.java NullAppender.java
tests/src/java/org/apache/log4j AbstractAppenderTest.java
AsyncAppenderTestCase.java ConsoleAppenderTest.java
FileAppenderTest.java LoggerTest.java
VectorAppender.java WriterAppenderTest.java
tests/src/java/org/apache/log4j/html Loop.java
tests/src/java/org/apache/log4j/multiplex
MultiplexAppenderTest.java
tests/src/java/org/apache/log4j/net SMTPAppenderTest.java
tests/src/java/org/apache/log4j/performance Loop.java
NullAppender.java
tests/src/java/org/apache/log4j/rolling
FilterBasedRollingTest.java
ObsoleteDailyRollingFileAppenderTest.java
ObsoleteRollingFileAppenderTest.java
RenamingTest.java SizeBasedRollingTest.java
TimeBasedRollingTest.java
Log:
Reversion of AppenderInterface per 2005-02-28 vote
Revision Changes Path
1.20 +0 -22 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Appender.java 25 Feb 2005 13:42:42 -0000 1.19
+++ Appender.java 8 Mar 2005 22:32:56 -0000 1.20
@@ -29,12 +29,6 @@
* @author Ceki Gülcü
*/
public interface Appender extends Component {
-
- /**
- * An appender must be activated before it can be used.
- */
- public void activate();
-
/**
* Add a filter to the end of the filter list.
*
@@ -71,22 +65,6 @@
*/
public void close();
-
- /**
- * Is this appender closed?
- *
- * @since 1.3
- */
- public boolean isClosed();
-
- /**
- * Is this appender in working order?
- *
- * @since 1.3
- */
- public boolean isActive();
-
-
/**
* Log in <code>Appender</code> specific way. When appropriate, Loggers
will
* call the <code>doAppend</code> method of appender implementations in
1.40 +33 -11
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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- AppenderSkeleton.java 25 Feb 2005 13:42:42 -0000 1.39
+++ AppenderSkeleton.java 8 Mar 2005 22:32:56 -0000 1.40
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -70,31 +70,53 @@
protected boolean closed = false;
/**
- * By default, an appender is not in working order. It must be configured
- * first.
+ * Is the appender ready for action.
*/
- protected boolean active = false;
+ protected boolean active;
/**
* The guard prevents an appender from repeatedly calling its own doAppend
* method.
*/
private boolean guard = false;
-
+
+ /**
+ * Construct an AppenderSkeleton.
+ *
+ * @deprecated Provided for compatibility, migrate to
AppenderSkeleton(boolean)
+ * to indicate whether appender is ready upon construction.
+ *
+ */
+ protected AppenderSkeleton() {
+ active = true;
+ }
+
+
+/**
+ * Construct an AppenderSkeleton.
+ *
+ * @param isActive true if appender is ready for use upon construction.
+ */
+ protected AppenderSkeleton(final boolean isActive) {
+ active = isActive;
+ }
+
/**
- * Calls the [EMAIL PROTECTED] #activate} method.
+ * Called to configure appender for use after configuration.
*
- * @deprecated Please call the activate() method instead.
*/
public void activateOptions() {
- activate();
+ this.active = true;
}
/**
- * Default implementation called by sub-classes.
+ * Synonym for activateOptions.
+ * @deprecated TODO: this weird signature is an attempt to flush
+ * out the remaining uses of activate since mixing activate and
+ * activateOptions can lead to very bad things.
*/
- public void activate() {
- this.active = true;
+ public final void activate() throws org.xml.sax.SAXException {
+ activateOptions();
}
/**
1.47 +1 -1
logging-log4j/src/java/org/apache/log4j/AsyncAppender.java
Index: AsyncAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/AsyncAppender.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- AsyncAppender.java 25 Feb 2005 13:44:36 -0000 1.46
+++ AsyncAppender.java 8 Mar 2005 22:32:56 -0000 1.47
@@ -66,12 +66,12 @@
private boolean interruptedWarningMessage = false;
public AsyncAppender() {
+ super(true);
// Note: The dispatcher code assumes that the aai is set once and
// for all.
aai = new AppenderAttachableImpl();
dispatcher = new Dispatcher(bf, this);
dispatcher.start();
- super.activate();
}
public void addAppender(Appender newAppender) {
1.23 +4 -4
logging-log4j/src/java/org/apache/log4j/ConsoleAppender.java
Index: ConsoleAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/ConsoleAppender.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ConsoleAppender.java 18 Feb 2005 17:23:44 -0000 1.22
+++ ConsoleAppender.java 8 Mar 2005 22:32:56 -0000 1.23
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@
public ConsoleAppender(Layout layout, String targetStr) {
this.layout = layout;
setTarget(targetStr);
- activate();
+ activateOptions();
}
/**
@@ -77,13 +77,13 @@
getLogger().warn("Using previously set target, System.out by default.");
}
- public void activate() {
+ public void activateOptions() {
if (target.equals(SYSTEM_OUT)) {
setWriter(createWriter(System.out));
} else {
setWriter(createWriter(System.err));
}
- super.activate();
+ super.activateOptions();
}
/**
1.52 +6 -6 logging-log4j/src/java/org/apache/log4j/FileAppender.java
Index: FileAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/FileAppender.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- FileAppender.java 18 Feb 2005 19:55:55 -0000 1.51
+++ FileAppender.java 8 Mar 2005 22:32:56 -0000 1.52
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -80,7 +80,7 @@
int bufferSize) throws IOException {
this.layout = layout;
this.setFile(filename, append, bufferedIO, bufferSize);
- activate();
+ activateOptions();
}
/**
@@ -96,7 +96,7 @@
throws IOException {
this.layout = layout;
this.setFile(filename, append, false, bufferSize);
- activate();
+ activateOptions();
}
/**
@@ -107,7 +107,7 @@
<p>The file will be appended to. */
public FileAppender(Layout layout, String filename) throws IOException {
this(layout, filename, true);
- activate();
+ activateOptions();
}
/**
@@ -144,7 +144,7 @@
<b>Append</b> properties.
@since 0.8.1 */
- public void activate() {
+ public void activateOptions() {
int errors = 0;
if (fileName != null) {
try {
@@ -160,7 +160,7 @@
getLogger().warn("Are you using FileAppender instead of
ConsoleAppender?");
}
if(errors == 0) {
- super.activate();
+ super.activateOptions();
}
}
1.34 +5 -3
logging-log4j/src/java/org/apache/log4j/WriterAppender.java
Index: WriterAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/WriterAppender.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- WriterAppender.java 25 Feb 2005 13:44:36 -0000 1.33
+++ WriterAppender.java 8 Mar 2005 22:32:56 -0000 1.34
@@ -67,6 +67,7 @@
* The default constructor does nothing.
* */
public WriterAppender() {
+ super(false);
}
/**
@@ -91,9 +92,10 @@
* future log4j versions
* */
public WriterAppender(Layout layout, Writer writer) {
+ super(false);
this.layout = layout;
this.setWriter(writer);
- this.activate();
+ this.activateOptions();
}
/**
@@ -125,7 +127,7 @@
* Checks that requires parameters are set and if everything is in order,
* activates this appender.
*/
- public void activate() {
+ public void activateOptions() {
int errors = 0;
if (this.layout == null) {
getLogger().error(
@@ -140,7 +142,7 @@
// only error free appenders should be activated
if(errors == 0) {
- super.activate();
+ super.activateOptions();
}
}
1.11 +1 -1
logging-log4j/src/java/org/apache/log4j/config/ConfiguratorBase.java
Index: ConfiguratorBase.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/config/ConfiguratorBase.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ConfiguratorBase.java 24 Feb 2005 16:31:24 -0000 1.10
+++ ConfiguratorBase.java 8 Mar 2005 22:32:56 -0000 1.11
@@ -108,7 +108,7 @@
appender.setLayout(
new PatternLayout("LOG4J-INTERNAL: %d %level [%t] %c#%M:%L)- %m%n"));
appender.setName(Constants.TEMP_CONSOLE_APPENDER_NAME);
- appender.activate();
+ appender.activateOptions();
ll.addAppender(appender);
}
1.21 +3 -2
logging-log4j/src/java/org/apache/log4j/db/DBAppender.java
Index: DBAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/db/DBAppender.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DBAppender.java 25 Feb 2005 13:44:36 -0000 1.20
+++ DBAppender.java 8 Mar 2005 22:32:57 -0000 1.21
@@ -143,9 +143,10 @@
boolean locationInfo = false;
public DBAppender() {
+ super(false);
}
- public void activate() {
+ public void activateOptions() {
getLogger().debug("DBAppender.activateOptions called");
if (connectionSource == null) {
@@ -162,7 +163,7 @@
}
// all nice and dandy on the eastern front
- super.activate();
+ super.activateOptions();
}
/**
1.4 +2 -2
logging-log4j/src/java/org/apache/log4j/multiplex/AppenderFactoryUtils.java
Index: AppenderFactoryUtils.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/multiplex/AppenderFactoryUtils.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AppenderFactoryUtils.java 18 Feb 2005 17:23:44 -0000 1.3
+++ AppenderFactoryUtils.java 8 Mar 2005 22:32:57 -0000 1.4
@@ -38,7 +38,7 @@
tbrp.activateOptions();
RollingFileAppender rfa = new
RollingFileAppender();
rfa.setRollingPolicy(tbrp);
- rfa.activate();
+ rfa.activateOptions();
return rfa;
}
@@ -67,7 +67,7 @@
FileAppender fileAppender = new
FileAppender(layout,
MessageFormat.format(pattern,
new
Object[] { value }));
- fileAppender.activate();
+ fileAppender.activateOptions();
return fileAppender;
} catch (Exception ex) {
//throw new RuntimeException(ex);
1.5 +4 -1
logging-log4j/src/java/org/apache/log4j/multiplex/MultiplexAppender.java
Index: MultiplexAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/multiplex/MultiplexAppender.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MultiplexAppender.java 25 Feb 2005 13:44:37 -0000 1.4
+++ MultiplexAppender.java 8 Mar 2005 22:32:57 -0000 1.5
@@ -16,12 +16,15 @@
private MultiplexSelector selector;
+ public MultiplexAppender() {
+ super(true);
+ }
/*
* (non-Javadoc)
*
* @see org.apache.log4j.spi.OptionHandler#activateOptions()
*/
- public void activate() {
+ public void activateOptions() {
// check that we have a selector of something at this point
1.23 +3 -2
logging-log4j/src/java/org/apache/log4j/net/JMSAppender.java
Index: JMSAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/JMSAppender.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- JMSAppender.java 25 Feb 2005 13:44:36 -0000 1.22
+++ JMSAppender.java 8 Mar 2005 22:32:57 -0000 1.23
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -120,6 +120,7 @@
int successiveFailureCount = 0;
public JMSAppender() {
+ super(false);
}
/**
@@ -165,7 +166,7 @@
/**
* Options are activated and become effective only after calling
* this method.*/
- public void activate() {
+ public void activateOptions() {
TopicConnectionFactory topicConnectionFactory;
try {
1.14 +3 -2
logging-log4j/src/java/org/apache/log4j/net/MulticastAppender.java
Index: MulticastAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/MulticastAppender.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- MulticastAppender.java 25 Feb 2005 13:44:37 -0000 1.13
+++ MulticastAppender.java 8 Mar 2005 22:32:57 -0000 1.14
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -71,12 +71,13 @@
private String encoding;
public MulticastAppender() {
+ super(false);
}
/**
Open the multicast sender for the <b>RemoteHost</b> and <b>Port</b>.
*/
- public void activate() {
+ public void activateOptions() {
try {
hostname = InetAddress.getLocalHost().getHostName();
} catch (UnknownHostException uhe) {
1.50 +5 -4
logging-log4j/src/java/org/apache/log4j/net/SMTPAppender.java
Index: SMTPAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/SMTPAppender.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- SMTPAppender.java 25 Feb 2005 13:44:36 -0000 1.49
+++ SMTPAppender.java 8 Mar 2005 22:32:57 -0000 1.50
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -99,14 +99,15 @@
/**
Use <code>evaluator</code> passed as parameter as the [EMAIL PROTECTED]
TriggeringEventEvaluator} for this SMTPAppender. */
- public SMTPAppender(TriggeringEventEvaluator evaluator) {
+ public SMTPAppender(final TriggeringEventEvaluator evaluator) {
+ super(false);
this.evaluator = evaluator;
}
/**
Activate the specified options, such as the smtp host, the
recipient, from, etc. */
- public void activate() {
+ public void activateOptions() {
int errorCount = 0;
Properties props = new Properties(System.getProperties());
@@ -151,7 +152,7 @@
}
if(errorCount == 0) {
- super.activate();
+ super.activateOptions();
}
}
1.30 +8 -5
logging-log4j/src/java/org/apache/log4j/net/SocketAppender.java
Index: SocketAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/SocketAppender.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- SocketAppender.java 25 Feb 2005 13:44:36 -0000 1.29
+++ SocketAppender.java 8 Mar 2005 22:32:57 -0000 1.30
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -123,32 +123,35 @@
String application;
public SocketAppender() {
+ super(false);
}
/**
Connects to remote server at <code>address</code> and
<code>port</code>.
*/
public SocketAppender(InetAddress address, int port) {
+ super(false);
this.address = address;
this.remoteHost = address.getHostName();
this.port = port;
- activate();
+ activateOptions();
}
/**
Connects to remote server at <code>host</code> and
<code>port</code>.
*/
public SocketAppender(String host, int port) {
+ super(false);
this.port = port;
this.address = getAddressByName(host);
this.remoteHost = host;
- activate();
+ activateOptions();
}
/**
Connect to the specified <b>RemoteHost</b> and <b>Port</b>.
*/
- public void activate() {
+ public void activateOptions() {
try {
hostname = InetAddress.getLocalHost().getHostName();
} catch (UnknownHostException uhe) {
@@ -167,7 +170,7 @@
throw new IllegalStateException(err);
}
// all is dandy on the eastern front.
- super.activate();
+ super.activateOptions();
}
/**
1.17 +5 -2
logging-log4j/src/java/org/apache/log4j/net/SocketHubAppender.java
Index: SocketHubAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/SocketHubAppender.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- SocketHubAppender.java 25 Feb 2005 13:44:36 -0000 1.16
+++ SocketHubAppender.java 8 Mar 2005 22:32:57 -0000 1.17
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -118,19 +118,22 @@
private CyclicBuffer buffer = null;
public SocketHubAppender() {
+ super(false);
}
/**
Connects to remote server at <code>address</code> and
<code>port</code>. */
public SocketHubAppender(int _port) {
+ super(false);
port = _port;
- startServer();
+ activateOptions();
}
/**
Set up the socket server on the specified port. */
public void activateOptions() {
startServer();
+ super.activateOptions();
}
/**
1.23 +3 -2
logging-log4j/src/java/org/apache/log4j/net/SyslogAppender.java
Index: SyslogAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/SyslogAppender.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- SyslogAppender.java 25 Feb 2005 13:44:37 -0000 1.22
+++ SyslogAppender.java 8 Mar 2005 22:32:57 -0000 1.23
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -70,6 +70,7 @@
Layout layout;
public SyslogAppender() {
+ super(false);
}
/**
@@ -156,7 +157,7 @@
/**
* This method returns immediately as options are activated when they are
set.
* */
- public void activate() {
+ public void activateOptions() {
if (facilityStr == null) {
String errMsg =
"The Facility option must be set for SyslogAppender named [" + name
1.17 +10 -3
logging-log4j/src/java/org/apache/log4j/net/TelnetAppender.java
Index: TelnetAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/TelnetAppender.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TelnetAppender.java 25 Feb 2005 13:44:36 -0000 1.16
+++ TelnetAppender.java 8 Mar 2005 22:32:57 -0000 1.17
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -58,6 +58,13 @@
private SocketHandler sh;
private int port = 23;
+ /**
+ * Creates a TelnetAppender.
+ */
+ public TelnetAppender() {
+ super(false);
+ }
+
/**
This appender requires a layout to format the text to the
attached client(s). */
@@ -67,7 +74,7 @@
/** all of the options have been set, create the socket handler and
wait for connections. */
- public void activate() {
+ public void activateOptions() {
try {
sh = new SocketHandler(port);
sh.start();
@@ -206,7 +213,7 @@
/**
* Determines if socket hander has any active connections.
- * @returns true if any active connections.
+ * @return true if any active connections.
*/
public boolean hasConnections() {
return connections.size() > 0;
1.15 +8 -5
logging-log4j/src/java/org/apache/log4j/net/UDPAppender.java
Index: UDPAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/UDPAppender.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- UDPAppender.java 25 Feb 2005 13:44:36 -0000 1.14
+++ UDPAppender.java 8 Mar 2005 22:32:57 -0000 1.15
@@ -73,32 +73,35 @@
boolean inError = false;
public UDPAppender() {
+ super(false);
}
/**
Sends UDP packets to the <code>address</code> and <code>port</code>.
*/
- public UDPAppender(InetAddress address, int port) {
+ public UDPAppender(final InetAddress address, final int port) {
+ super(false);
this.address = address;
this.remoteHost = address.getHostName();
this.port = port;
- activate();
+ activateOptions();
}
/**
Sends UDP packets to the <code>address</code> and <code>port</code>.
*/
- public UDPAppender(String host, int port) {
+ public UDPAppender(final String host, final int port) {
+ super(false);
this.port = port;
this.address = getAddressByName(host);
this.remoteHost = host;
- activate();
+ activateOptions();
}
/**
Open the UDP sender for the <b>RemoteHost</b> and <b>Port</b>.
*/
- public void activate() {
+ public void activateOptions() {
try {
hostname = InetAddress.getLocalHost().getHostName();
} catch (UnknownHostException uhe) {
1.24 +2 -3
logging-log4j/src/java/org/apache/log4j/rolling/RollingFileAppender.java
Index: RollingFileAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/rolling/RollingFileAppender.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- RollingFileAppender.java 18 Feb 2005 17:23:44 -0000 1.23
+++ RollingFileAppender.java 8 Mar 2005 22:32:57 -0000 1.24
@@ -78,10 +78,9 @@
* FileAppender#FileAppender parents constructor}.
* */
public RollingFileAppender() {
- super();
}
- public void activate() {
+ public void activateOptions() {
if (triggeringPolicy == null) {
getLogger().warn("Please set a TriggeringPolicy for the
RollingFileAppender named '{}'", getName());
return;
@@ -95,7 +94,7 @@
// the activeFile variable is used by the
triggeringPolicy.isTriggeringEvent method
activeFile = new File(afn);
- super.activate();
+ super.activateOptions();
} else {
getLogger().warn("Please set a rolling policy");
}
1.10 +8 -1
logging-log4j/src/java/org/apache/log4j/varia/ListAppender.java
Index: ListAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/varia/ListAppender.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ListAppender.java 25 Feb 2005 13:44:36 -0000 1.9
+++ ListAppender.java 8 Mar 2005 22:32:57 -0000 1.10
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -40,6 +40,13 @@
private List list = new ArrayList();
/**
+ * Constructs a list appender.
+ */
+ public ListAppender() {
+ super(true);
+ }
+
+ /**
* Returns a writeable, BUT cloned List of all the LoggingEvents that are
contained
* in the internal model. You are free to modify this list without
* worry of synchronization, but note that any modifications to the
returned list
1.6 +7 -1
logging-log4j/src/java/org/apache/log4j/varia/ListModelAppender.java
Index: ListModelAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/varia/ListModelAppender.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ListModelAppender.java 25 Feb 2005 13:44:36 -0000 1.5
+++ ListModelAppender.java 8 Mar 2005 22:32:57 -0000 1.6
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -34,6 +34,12 @@
private final DefaultListModel model = new DefaultListModel();
/**
+ * Constructs a ListModelAppender.
+ */
+ public ListModelAppender() {
+ super(true);
+ }
+ /**
* Returns a reference to the ListModel that contains all the LoggingEvents
* that have been appended to this class.
*
1.9 +14 -10
logging-log4j/src/java/org/apache/log4j/varia/NullAppender.java
Index: NullAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/varia/NullAppender.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NullAppender.java 25 Feb 2005 13:44:36 -0000 1.8
+++ NullAppender.java 8 Mar 2005 22:32:57 -0000 1.9
@@ -1,9 +1,18 @@
/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
+ * Copyright 1999,2005 The Apache Software Foundation.
*
- * This software is published under the terms of the Apache Software
- * License version 1.1, a copy of which has been included with this
- * distribution in the LICENSE.txt file. */
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.log4j.varia;
@@ -21,12 +30,7 @@
private static NullAppender instance = new NullAppender();
public NullAppender() {
- }
-
- /**
- * There are no options to acticate.
- * */
- public void activateOptions() {
+ super(true);
}
/**
1.7 +11 -10
logging-log4j/tests/src/java/org/apache/log4j/AbstractAppenderTest.java
Index: AbstractAppenderTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/AbstractAppenderTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractAppenderTest.java 25 Feb 2005 13:45:22 -0000 1.6
+++ AbstractAppenderTest.java 8 Mar 2005 22:32:57 -0000 1.7
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -35,18 +35,19 @@
*/
abstract public class AbstractAppenderTest extends TestCase {
- abstract protected Appender getAppender();
- abstract protected Appender getConfiguredAppender();
-
+ abstract protected AppenderSkeleton getAppender();
+ abstract protected AppenderSkeleton getConfiguredAppender();
+
+
public class DummyLayout extends Layout {
public void format(Writer output, LoggingEvent event) {}
public void activateOptions() {}
- }
-
+ }
+
public void testNewAppender() {
// new appenders whould be inactive
- Appender appender = getAppender();
- assertFalse(appender.isActive());
+ AppenderSkeleton appender = getAppender();
+ assertFalse( appender.isActive());
assertFalse(appender.isClosed());
appender.close();
@@ -54,8 +55,8 @@
}
public void testConfiguredAppender() {
- Appender appender = getConfiguredAppender();
- appender.activate();
+ AppenderSkeleton appender = getConfiguredAppender();
+ appender.activateOptions();
assertTrue(appender.isActive());
assertFalse(appender.isClosed());
1.8 +1 -1
logging-log4j/tests/src/java/org/apache/log4j/AsyncAppenderTestCase.java
Index: AsyncAppenderTestCase.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/AsyncAppenderTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AsyncAppenderTestCase.java 18 Feb 2005 17:23:44 -0000 1.7
+++ AsyncAppenderTestCase.java 8 Mar 2005 22:32:57 -0000 1.8
@@ -42,7 +42,7 @@
vectorAppender = new VectorAppender();
vectorAppender.setDelay(DELAY);
asyncAppender.addAppender(vectorAppender);
- asyncAppender.activate();
+ asyncAppender.activateOptions();
root.addAppender(asyncAppender);
}
1.5 +3 -3
logging-log4j/tests/src/java/org/apache/log4j/ConsoleAppenderTest.java
Index: ConsoleAppenderTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/ConsoleAppenderTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ConsoleAppenderTest.java 25 Feb 2005 13:45:22 -0000 1.4
+++ ConsoleAppenderTest.java 8 Mar 2005 22:32:57 -0000 1.5
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,11 +25,11 @@
*
*/
public class ConsoleAppenderTest extends AbstractAppenderTest {
- protected Appender getAppender() {
+ protected AppenderSkeleton getAppender() {
return new ConsoleAppender();
}
- protected Appender getConfiguredAppender() {
+ protected AppenderSkeleton getConfiguredAppender() {
ConsoleAppender ca = new ConsoleAppender();
// set a bogus layout
1.5 +3 -3
logging-log4j/tests/src/java/org/apache/log4j/FileAppenderTest.java
Index: FileAppenderTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/FileAppenderTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FileAppenderTest.java 25 Feb 2005 13:45:22 -0000 1.4
+++ FileAppenderTest.java 8 Mar 2005 22:32:57 -0000 1.5
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,11 +24,11 @@
* @author <a href="http://www.qos.ch/log4j/";>Ceki Gülcü</a>
*/
public class FileAppenderTest extends AbstractAppenderTest {
- protected Appender getAppender() {
+ protected AppenderSkeleton getAppender() {
return new FileAppender();
}
- protected Appender getConfiguredAppender() {
+ protected AppenderSkeleton getConfiguredAppender() {
FileAppender wa = new FileAppender();
wa.setFile("output/temp");
wa.setLayout(new DummyLayout());
1.2 +9 -8
logging-log4j/tests/src/java/org/apache/log4j/LoggerTest.java
Index: LoggerTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/LoggerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LoggerTest.java 18 Feb 2005 17:23:44 -0000 1.1
+++ LoggerTest.java 8 Mar 2005 22:32:57 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -108,7 +108,7 @@
Logger a = Logger.getLogger("a");
Logger ab = Logger.getLogger("a.b");
CountingAppender ca = new CountingAppender();
- ca.activate();
+ ca.activateOptions();
a.addAppender(ca);
assertEquals(ca.counter, 0);
@@ -133,9 +133,9 @@
Logger x = Logger.getLogger("x");
CountingAppender ca1 = new CountingAppender();
- ca1.activate();
+ ca1.activateOptions();
CountingAppender ca2 = new CountingAppender();
- ca2.activate();
+ ca2.activateOptions();
a.addAppender(ca1);
abc.addAppender(ca2);
@@ -167,11 +167,11 @@
Logger x = Logger.getLogger("x");
CountingAppender caRoot = new CountingAppender();
- caRoot.activate();
+ caRoot.activateOptions();
CountingAppender caA = new CountingAppender();
- caA.activate();
+ caA.activateOptions();
CountingAppender caABC = new CountingAppender();
- caABC.activate();
+ caABC.activateOptions();
root.addAppender(caRoot);
a.addAppender(caA);
@@ -201,7 +201,7 @@
public void testDisable1() {
CountingAppender caRoot = new CountingAppender();
- caRoot.activate();
+ caRoot.activateOptions();
Logger root = Logger.getRootLogger();
root.addAppender(caRoot);
@@ -371,6 +371,7 @@
int counter;
CountingAppender() {
+ super(true);
counter = 0;
}
1.9 +2 -8
logging-log4j/tests/src/java/org/apache/log4j/VectorAppender.java
Index: VectorAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/VectorAppender.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- VectorAppender.java 25 Feb 2005 13:45:22 -0000 1.8
+++ VectorAppender.java 8 Mar 2005 22:32:57 -0000 1.9
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,16 +29,10 @@
long delay = 0;
public VectorAppender() {
+ super(true);
vector = new Vector();
- super.activate();
}
- /**
- * Defers to super.activate() method.
- */
- public void activate() {
- super.activate();
- }
/**
This method is called by the [EMAIL PROTECTED]
AppenderSkeleton#doAppend}
1.5 +2 -2
logging-log4j/tests/src/java/org/apache/log4j/WriterAppenderTest.java
Index: WriterAppenderTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/WriterAppenderTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WriterAppenderTest.java 25 Feb 2005 13:45:22 -0000 1.4
+++ WriterAppenderTest.java 8 Mar 2005 22:32:57 -0000 1.5
@@ -26,11 +26,11 @@
* @author <a href="http://www.qos.ch/log4j/";>Ceki Gülcü</a>
*/
public class WriterAppenderTest extends AbstractAppenderTest {
- protected Appender getAppender() {
+ protected AppenderSkeleton getAppender() {
return new WriterAppender();
}
- protected Appender getConfiguredAppender() {
+ protected AppenderSkeleton getConfiguredAppender() {
WriterAppender wa = new WriterAppender();
// set a bogus writer
1.5 +2 -2
logging-log4j/tests/src/java/org/apache/log4j/html/Loop.java
Index: Loop.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/html/Loop.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Loop.java 18 Feb 2005 17:23:43 -0000 1.4
+++ Loop.java 8 Mar 2005 22:32:57 -0000 1.5
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@
appender.setFile("toto.html");
appender.setAppend(false);
appender.setLayout(htmlLayout);
- appender.activate();
+ appender.activateOptions();
Logger root = Logger.getRootLogger();
root.addAppender(appender);
1.3 +1 -1
logging-log4j/tests/src/java/org/apache/log4j/multiplex/MultiplexAppenderTest.java
Index: MultiplexAppenderTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/multiplex/MultiplexAppenderTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MultiplexAppenderTest.java 18 Feb 2005 17:23:43 -0000 1.2
+++ MultiplexAppenderTest.java 8 Mar 2005 22:32:57 -0000 1.3
@@ -37,7 +37,7 @@
appender = new MultiplexAppender();
try {
- appender.activate();
+ appender.activateOptions();
fail("Should have thrown an IllegalStateException
because it should not be configured correctly");
} catch (Exception e) {
// expected
1.2 +4 -4
logging-log4j/tests/src/java/org/apache/log4j/net/SMTPAppenderTest.java
Index: SMTPAppenderTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/net/SMTPAppenderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SMTPAppenderTest.java 18 Feb 2005 20:46:58 -0000 1.1
+++ SMTPAppenderTest.java 8 Mar 2005 22:32:57 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
package org.apache.log4j.net;
import org.apache.log4j.AbstractAppenderTest;
-import org.apache.log4j.Appender;
+import org.apache.log4j.AppenderSkeleton;
/**
@@ -28,11 +28,11 @@
*
*/
public class SMTPAppenderTest extends AbstractAppenderTest {
- protected Appender getAppender() {
+ protected AppenderSkeleton getAppender() {
return new SMTPAppender();
}
- public Appender getConfiguredAppender() {
+ public AppenderSkeleton getConfiguredAppender() {
SMTPAppender ca = new SMTPAppender();
// set a bogus layout
1.7 +1 -1
logging-log4j/tests/src/java/org/apache/log4j/performance/Loop.java
Index: Loop.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/performance/Loop.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Loop.java 18 Feb 2005 17:23:43 -0000 1.6
+++ Loop.java 8 Mar 2005 22:32:58 -0000 1.7
@@ -40,7 +40,7 @@
ConsoleAppender a = new ConsoleAppender();
a.setLayout(new PatternLayout("%d %level %c - %m%n"));
a.setName("console");
- a.activate();
+ a.activateOptions();
j.addAppender(a);
if (args.length == 2) {
1.5 +2 -0
logging-log4j/tests/src/java/org/apache/log4j/performance/NullAppender.java
Index: NullAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/performance/NullAppender.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NullAppender.java 25 Feb 2005 13:45:22 -0000 1.4
+++ NullAppender.java 8 Mar 2005 22:32:58 -0000 1.5
@@ -35,9 +35,11 @@
public String t;
public NullAppender() {
+ super(true);
}
public NullAppender(Layout layout) {
+ super(true);
this.layout = layout;
}
1.3 +1 -1
logging-log4j/tests/src/java/org/apache/log4j/rolling/FilterBasedRollingTest.java
Index: FilterBasedRollingTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/rolling/FilterBasedRollingTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FilterBasedRollingTest.java 18 Feb 2005 17:23:43 -0000 1.2
+++ FilterBasedRollingTest.java 8 Mar 2005 22:32:58 -0000 1.3
@@ -86,7 +86,7 @@
rfa.setRollingPolicy(swrp);
rfa.setTriggeringPolicy(fbtp);
- rfa.activate();
+ rfa.activateOptions();
Logger.getRootLogger().addAppender(rfa);
common("output/filterBased-test2");
1.2 +1 -1
logging-log4j/tests/src/java/org/apache/log4j/rolling/ObsoleteDailyRollingFileAppenderTest.java
Index: ObsoleteDailyRollingFileAppenderTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/rolling/ObsoleteDailyRollingFileAppenderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ObsoleteDailyRollingFileAppenderTest.java 8 Mar 2005 20:21:18 -0000
1.1
+++ ObsoleteDailyRollingFileAppenderTest.java 8 Mar 2005 22:32:58 -0000
1.2
@@ -27,7 +27,6 @@
* Tests the emulation of org.apache.log4j.DailyRollingFileAppender
*
* @author Curt Arnold
- * @deprecated Class under test is deprecated.
*
*/
public class ObsoleteDailyRollingFileAppenderTest extends TestCase {
@@ -64,6 +63,7 @@
/**
* Test basic rolling functionality.
+ * @deprecated Class under test is deprecated.
*/
public void test2() throws Exception {
PatternLayout layout = new PatternLayout("%m%n");
1.2 +1 -1
logging-log4j/tests/src/java/org/apache/log4j/rolling/ObsoleteRollingFileAppenderTest.java
Index: ObsoleteRollingFileAppenderTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/rolling/ObsoleteRollingFileAppenderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ObsoleteRollingFileAppenderTest.java 8 Mar 2005 20:21:18 -0000
1.1
+++ ObsoleteRollingFileAppenderTest.java 8 Mar 2005 22:32:58 -0000
1.2
@@ -27,7 +27,6 @@
* Tests the emulation of org.apache.log4j.RollingFileAppender
*
* @author Curt Arnold
- * @deprecated Class under test is deprecated.
*
*/
public class ObsoleteRollingFileAppenderTest extends TestCase {
@@ -68,6 +67,7 @@
/**
* Test basic rolling functionality.
+ * @deprecated Class under test is deprecated.
*/
public void test2() throws Exception {
PatternLayout layout = new PatternLayout("%m\n");
1.3 +1 -1
logging-log4j/tests/src/java/org/apache/log4j/rolling/RenamingTest.java
Index: RenamingTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/rolling/RenamingTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RenamingTest.java 18 Feb 2005 17:23:43 -0000 1.2
+++ RenamingTest.java 8 Mar 2005 22:32:58 -0000 1.3
@@ -72,7 +72,7 @@
tbrp.setActiveFileName("output/test.log");
tbrp.activateOptions();
rfa.setRollingPolicy(tbrp);
- rfa.activate();
+ rfa.activateOptions();
Calendar cal = Calendar.getInstance();
1.11 +2 -2
logging-log4j/tests/src/java/org/apache/log4j/rolling/SizeBasedRollingTest.java
Index: SizeBasedRollingTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/rolling/SizeBasedRollingTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SizeBasedRollingTest.java 8 Mar 2005 20:21:18 -0000 1.10
+++ SizeBasedRollingTest.java 8 Mar 2005 22:32:58 -0000 1.11
@@ -100,7 +100,7 @@
rfa.setRollingPolicy(swrp);
rfa.setTriggeringPolicy(sbtp);
- rfa.activate();
+ rfa.activateOptions();
root.addAppender(rfa);
// Write exactly 10 bytes with each log
@@ -148,7 +148,7 @@
fwrp.activateOptions();
rfa.setRollingPolicy(fwrp);
rfa.setTriggeringPolicy(sbtp);
- rfa.activate();
+ rfa.activateOptions();
root.addAppender(rfa);
// Write exactly 10 bytes with each log
1.18 +8 -8
logging-log4j/tests/src/java/org/apache/log4j/rolling/TimeBasedRollingTest.java
Index: TimeBasedRollingTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/rolling/TimeBasedRollingTest.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TimeBasedRollingTest.java 8 Mar 2005 20:21:18 -0000 1.17
+++ TimeBasedRollingTest.java 8 Mar 2005 22:32:58 -0000 1.18
@@ -84,7 +84,7 @@
tbrp.setFileNamePattern("output/test1-%d{" + datePattern + "}");
tbrp.activateOptions();
rfa.setRollingPolicy(tbrp);
- rfa.activate();
+ rfa.activateOptions();
logger.addAppender(rfa);
SimpleDateFormat sdf = new SimpleDateFormat(datePattern);
@@ -129,7 +129,7 @@
tbrp1.setFileNamePattern("output/test2-%d{" + datePattern + "}");
tbrp1.activateOptions();
rfa1.setRollingPolicy(tbrp1);
- rfa1.activate();
+ rfa1.activateOptions();
logger.addAppender(rfa1);
SimpleDateFormat sdf = new SimpleDateFormat(datePattern);
@@ -162,7 +162,7 @@
tbrp2.setFileNamePattern("output/test2-%d{" + datePattern + "}");
tbrp2.activateOptions();
rfa2.setRollingPolicy(tbrp2);
- rfa2.activate();
+ rfa2.activateOptions();
logger.addAppender(rfa2);
for (int i = 3; i <= 4; i++) {
@@ -189,7 +189,7 @@
tbrp.setFileNamePattern("output/test3-%d{" + datePattern + "}.gz");
tbrp.activateOptions();
rfa.setRollingPolicy(tbrp);
- rfa.activate();
+ rfa.activateOptions();
logger.addAppender(rfa);
SimpleDateFormat sdf = new SimpleDateFormat(datePattern);
@@ -239,7 +239,7 @@
tbrp1.setFileNamePattern("output/test4-%d{" + datePattern + "}");
tbrp1.activateOptions();
rfa1.setRollingPolicy(tbrp1);
- rfa1.activate();
+ rfa1.activateOptions();
logger.addAppender(rfa1);
SimpleDateFormat sdf = new SimpleDateFormat(datePattern);
@@ -274,7 +274,7 @@
tbrp2.setActiveFileName("output/test4.log");
tbrp2.activateOptions();
rfa2.setRollingPolicy(tbrp2);
- rfa2.activate();
+ rfa2.activateOptions();
logger.addAppender(rfa2);
for (int i = 3; i <= 4; i++) {
@@ -302,7 +302,7 @@
tbrp.setActiveFileName("output/test5.log");
tbrp.activateOptions();
rfa.setRollingPolicy(tbrp);
- rfa.activate();
+ rfa.activateOptions();
logger.addAppender(rfa);
SimpleDateFormat sdf = new SimpleDateFormat(datePattern);
@@ -346,7 +346,7 @@
tbrp.setActiveFileName("output/test6.log");
tbrp.activateOptions();
rfa.setRollingPolicy(tbrp);
- rfa.activate();
+ rfa.activateOptions();
logger.addAppender(rfa);
SimpleDateFormat sdf = new SimpleDateFormat(datePattern);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
