ceki 01/07/26 04:16:49
Modified: src/java/org/apache/log4j AsyncAppender.java
DailyRollingFileAppender.java Hierarchy.java
src/java/org/apache/log4j/nt NTEventLogAppender.java
src/java/org/apache/log4j/varia
ExternallyRolledFileAppender.java
src/java/org/apache/log4j/xml XMLLayout.java
Log:
- Removed deprecated methods in AsyncAppender,
ExternallyRolledFileAppender, NTEventLogAppender.
- Small doc changes in Hierarchy.
- Added missing / in XMLLayout docs.
Revision Changes Path
1.22 +0 -70 jakarta-log4j/src/java/org/apache/log4j/AsyncAppender.java
Index: AsyncAppender.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/AsyncAppender.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- AsyncAppender.java 2001/07/20 15:59:53 1.21
+++ AsyncAppender.java 2001/07/26 11:16:48 1.22
@@ -258,76 +258,6 @@
return bf.getMaxSize();
}
- /**
- Returns the option names for this component in addition in
- addition to the options of its super class {@link
- AppenderSkeleton}.
-
- @deprecated We now use JavaBeans introspection to configure
- components. Options strings are no longer needed.
- */
- public
- String[] getOptionStrings() {
- return OptionConverter.concatanateArrays(super.getOptionStrings(),
- new String[] {LOCATION_INFO_OPTION, BUFFER_SIZE_OPTION});
- }
-
- /**
- Set AsyncAppender specific options:
-
- <p>On top of the options of the super class {@link
- AppenderSkeleton}, the only recognized options are
- <b>BufferSize</b> and <b>LocationInfo</b>.
-
- <p> The <b>BufferSize</b> option takes a non-negative integer
- value. This integer value determines the maximum size of the
- bounded buffer. Increasing the size of the buffer is always
- safe. However, if an existing buffer holds unwritten elements,
- then <em>decreasing the buffer size will result in event
- loss.</em> Nevertheless, while script configuring the
- AsyncAppender, it is safe to set a buffer size smaller than the
- {@link #DEFAULT_BUFFER_SIZE default buffer size} because
- configurators guarantee that an appender cannot be used before
- being completely configured.
-
- <p>The <b>LocationInfo</b> option takes a boolean value. By
- default, it is set to false which means there will be no effort
- to extract the location information related to the event. As a
- result, the event that will be ultimately logged will likely to
- contain the wrong location information (if present in the log
- format).
-
- <p>Location information extraction is comparatively very slow and
- should be avoided unless performance is not a concern.
-
- @deprecated Use the setter method for the option directly instead
- of the generic <code>setOption</code> method.
- */
- public
- void setOption(String option, String value) {
- if(value == null) return;
- super.setOption(option, value);
-
- if (option.equals(LOCATION_INFO_OPTION))
- locationInfo = OptionConverter.toBoolean(value, locationInfo);
- else if (option.equals(BUFFER_SIZE_OPTION)) {
- int newSize = OptionConverter.toInt(value, DEFAULT_BUFFER_SIZE);
- bf.resize(newSize);
- }
- }
-
- /*
- public
- String getOption(String option) {
- if (option.equals(LOCATION_INFO_OPTION)) {
- return locationInfo ? "true" : "false";
- } else if (option.equals(BUFFER_SIZE_OPTION)) {
- return Integer.toString(bf.getMaxSize());
- } else {
- return super.getOption(option);
- }
- }
- */
}
// ------------------------------------------------------------------------------
// ------------------------------------------------------------------------------
1.16 +2 -5
jakarta-log4j/src/java/org/apache/log4j/DailyRollingFileAppender.java
Index: DailyRollingFileAppender.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/DailyRollingFileAppender.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DailyRollingFileAppender.java 2001/07/25 19:43:43 1.15
+++ DailyRollingFileAppender.java 2001/07/26 11:16:48 1.16
@@ -211,11 +211,8 @@
printPeriodicity(type);
rc.setType(type);
File file = new File(fileName);
- if(file.exists()) {
- scheduledFilename = fileName+sdf.format(new Date(file.lastModified()));
- } else {
- scheduledFilename = fileName+sdf.format(now);
- }
+ scheduledFilename = fileName+sdf.format(new Date(file.lastModified()));
+
} else {
LogLog.error("Either Filename or DatePattern options are not set for ["+
name+"].");
1.22 +1 -4 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Hierarchy.java 2001/07/25 19:43:44 1.21
+++ Hierarchy.java 2001/07/26 11:16:48 1.22
@@ -37,8 +37,7 @@
<p><em>The casual user should not have to deal with this class
directly.</em> In fact, up until version 0.9.0, this class had
- default package access. However, if you are in an environment where
- multiple applications run in the same VM, then read on.
+ default package access.
<p>The structure of the category hierarchy is maintained by the
{@link #getInstance} method. The hierarchy is such that children
@@ -51,8 +50,6 @@
to the provision node. Other descendants of the same ancestor add
themselves to the previously created provision node.
- <p>See the code below for further details.
-
@author Ceki Gülcü
*/
1.13 +0 -39
jakarta-log4j/src/java/org/apache/log4j/nt/NTEventLogAppender.java
Index: NTEventLogAppender.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/nt/NTEventLogAppender.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- NTEventLogAppender.java 2001/06/01 21:01:34 1.12
+++ NTEventLogAppender.java 2001/07/26 11:16:48 1.13
@@ -31,17 +31,6 @@
public class NTEventLogAppender extends AppenderSkeleton {
private int _handle = 0;
- /**
- The string constant used in naming the source of the event. The
- current value of this constant is <b>Source</b>.
-
- @deprecated Options are now handled using the JavaBeans paradigm.
- This constant is not longer needed and will be removed in the
- <em>near</em> term.
-
- */
- public static final String SOURCE_OPTION = "Source";
-
private String source = null;
private String server = null;
@@ -86,34 +75,6 @@
} catch (Exception e) {
e.printStackTrace();
_handle = 0;
- }
- }
-
- /**
- Returns the option names for this component.
-
- @deprecated We now use JavaBeans introspection to configure
- components. Options strings are no longer needed.
- **/
- public
- String[] getOptionStrings() {
- return OptionConverter.concatanateArrays(super.getOptionStrings(),
- new String[] {SOURCE_OPTION});
- }
-
- /**
- @deprecated Use the setter method for the option directly instead
- of the generic <code>setOption</code> method.
- */
- public
- void setOption(String key, String value) {
- if(value == null) return;
- super.setOption(key, value);
-
-
- if(key.equalsIgnoreCase(SOURCE_OPTION)) {
- // Set the source for the NT Evetns
- source = value.trim();
}
}
1.9 +0 -51
jakarta-log4j/src/java/org/apache/log4j/varia/ExternallyRolledFileAppender.java
Index: ExternallyRolledFileAppender.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/varia/ExternallyRolledFileAppender.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ExternallyRolledFileAppender.java 2001/05/21 18:31:46 1.8
+++ ExternallyRolledFileAppender.java 2001/07/26 11:16:49 1.9
@@ -40,19 +40,6 @@
public class ExternallyRolledFileAppender extends RollingFileAppender {
/**
- A string constant used in naming the option for setting the port
- for listening to external roll over messages. Current value of
- this string constant is <b>Port</b>.
-
- <p>All option keys are case sensitive.
-
- @deprecated Options are now handled using the JavaBeans paradigm.
- This constant is not longer needed and will be removed in the
- <em>near</em> term.
- */
- static final public String PORT_OPTION = "Port";
-
- /**
The string constant sent to initiate a roll over. Current value of
this string constant is <b>RollOver</b>.
*/
@@ -72,44 +59,6 @@
constructor. */
public
ExternallyRolledFileAppender() {
- }
-
- /**
- Returns the option names for this component, namely {@link
- #PORT_OPTION} in addition to the options of its super class {@link
- RollingFileAppender#getOptionStrings FileAppender}.
-
- @deprecated We now use JavaBeans introspection to configure
- components. Options strings are no longer needed.
- */
- public
- String[] getOptionStrings() {
-
- return OptionConverter.concatanateArrays(super.getOptionStrings(),
- new String[] {PORT_OPTION});
- }
-
- /**
- Set ExternallyRolledFileAppender specific options.
-
- In addition to {@link org.apache.log4j.FileAppender#setOption FileAppender
- options} and {@link RollingFileAppender#setOption RollingFileAppender
- options}, ExternallyRolledFileAppender recognizes the option
- <b>Port</b>.
-
- <p>The <b>Port</b> option is used for setting the port for
- listening to external roll over messages.
-
- @deprecated Use the setter method for the option directly instead
- of the generic <code>setOption</code> method.
- */
- public
- void setOption(String option, String value) {
- super.setOption(option, value);
- if(option.equalsIgnoreCase(PORT_OPTION)) {
- port = OptionConverter.toInt(value, port);
- LogLog.debug("Port option set to "+port);
- }
}
/**
1.13 +1 -1 jakarta-log4j/src/java/org/apache/log4j/xml/XMLLayout.java
Index: XMLLayout.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/XMLLayout.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XMLLayout.java 2001/04/03 16:37:41 1.12
+++ XMLLayout.java 2001/07/26 11:16:49 1.13
@@ -31,7 +31,7 @@
<!DOCTYPE log4j:eventSet SYSTEM "log4j.dtd" [<!ENTITY data SYSTEM
"abc">]>
- <log4j:eventSet xmlns:log4j="http://jakarta.apache.org/log4j">
+ <log4j:eventSet xmlns:log4j="http://jakarta.apache.org/log4j/">
&data;
</log4j:eventSet>
</pre>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
