Author: carnold
Date: Fri Apr 27 12:53:38 2007
New Revision: 533200
URL: http://svn.apache.org/viewvc?view=rev&rev=533200
Log:
Bug 42283: Eclipse compiler warning cleanup
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/AppenderSkeleton.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/DailyRollingFileAppender.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/HTMLLayout.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/PatternLayout.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/PropertyConfigurator.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/ProvisionNode.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/config/PropertySetterException.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/AbsoluteTimeDateFormat.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/DateTimeDateFormat.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/FileWatchdog.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/ISO8601DateFormat.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/PatternParser.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/RelativeTimeDateFormat.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/Transform.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/net/JMSSink.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/net/SocketAppender.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/net/SocketServer.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/nt/NTEventLogAppender.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/spi/LocationInfo.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/spi/RendererSupport.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/varia/ExternallyRolledFileAppender.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/varia/NullAppender.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/DOMConfigurator.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/Log4jEntityResolver.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/XMLLayout.java
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/AppenderSkeleton.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/AppenderSkeleton.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/AppenderSkeleton.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/AppenderSkeleton.java
Fri Apr 27 12:53:38 2007
@@ -103,7 +103,7 @@
if(headFilter == null) {
headFilter = tailFilter = newFilter;
} else {
- tailFilter.next = newFilter;
+ tailFilter.setNext(newFilter);
tailFilter = newFilter;
}
}
@@ -244,7 +244,7 @@
switch(f.decide(event)) {
case Filter.DENY: return;
case Filter.ACCEPT: break FILTER_LOOP;
- case Filter.NEUTRAL: f = f.next;
+ case Filter.NEUTRAL: f = f.getNext();
}
}
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/DailyRollingFileAppender.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/DailyRollingFileAppender.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/DailyRollingFileAppender.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/DailyRollingFileAppender.java
Fri Apr 27 12:53:38 2007
@@ -366,6 +366,7 @@
* start of the next interval.
* */
class RollingCalendar extends GregorianCalendar {
+ private static final long serialVersionUID = -3560331770601814177L;
int type = DailyRollingFileAppender.TOP_OF_TROUBLE;
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/HTMLLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/HTMLLayout.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/HTMLLayout.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/HTMLLayout.java
Fri Apr 27 12:53:38 2007
@@ -132,7 +132,7 @@
sbuf.append(Layout.LINE_SEP + "<tr>" + Layout.LINE_SEP);
sbuf.append("<td>");
- sbuf.append(event.timeStamp - event.getStartTime());
+ sbuf.append(event.timeStamp - LoggingEvent.getStartTime());
sbuf.append("</td>" + Layout.LINE_SEP);
sbuf.append("<td title=\"" + event.getThreadName() + " thread\">");
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/PatternLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/PatternLayout.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/PatternLayout.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/PatternLayout.java
Fri Apr 27 12:53:38 2007
@@ -417,8 +417,6 @@
private PatternConverter head;
- private String timezone;
-
/**
Constructs a PatternLayout using the DEFAULT_LAYOUT_PATTERN.
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/PropertyConfigurator.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/PropertyConfigurator.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/PropertyConfigurator.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/PropertyConfigurator.java
Fri Apr 27 12:53:38 2007
@@ -22,26 +22,23 @@
package org.apache.log4j;
-import org.apache.log4j.DefaultCategoryFactory;
import org.apache.log4j.config.PropertySetter;
-//import org.apache.log4j.config.PropertySetterException;
-import org.apache.log4j.spi.OptionHandler;
+import org.apache.log4j.helpers.FileWatchdog;
+import org.apache.log4j.helpers.LogLog;
+import org.apache.log4j.helpers.OptionConverter;
+import org.apache.log4j.or.RendererMap;
import org.apache.log4j.spi.Configurator;
import org.apache.log4j.spi.LoggerFactory;
import org.apache.log4j.spi.LoggerRepository;
+import org.apache.log4j.spi.OptionHandler;
import org.apache.log4j.spi.RendererSupport;
-import org.apache.log4j.or.RendererMap;
-import org.apache.log4j.helpers.LogLog;
-import org.apache.log4j.helpers.OptionConverter;
-import org.apache.log4j.helpers.FileWatchdog;
-import java.util.Enumeration;
-import java.util.Properties;
import java.io.FileInputStream;
-import java.io.IOException;
import java.io.InputStream;
-import java.util.StringTokenizer;
+import java.util.Enumeration;
import java.util.Hashtable;
+import java.util.Properties;
+import java.util.StringTokenizer;
/**
Allows the configuration of log4j from an external file. See
@@ -406,7 +403,7 @@
String value = properties.getProperty(LogLog.DEBUG_KEY);
if(value == null) {
- value = properties.getProperty(LogLog.CONFIG_DEBUG_KEY);
+ value = properties.getProperty("log4j.configDebug");
if(value != null)
LogLog.warn("[log4j.configDebug] is deprecated. Use [log4j.debug]
instead.");
}
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/ProvisionNode.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/ProvisionNode.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/ProvisionNode.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/ProvisionNode.java
Fri Apr 27 12:53:38 2007
@@ -20,7 +20,8 @@
import java.util.Vector;
class ProvisionNode extends Vector {
-
+ private static final long serialVersionUID = -4479121426311014469L;
+
ProvisionNode(Logger logger) {
super();
this.addElement(logger);
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/config/PropertySetterException.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/config/PropertySetterException.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/config/PropertySetterException.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/config/PropertySetterException.java
Fri Apr 27 12:53:38 2007
@@ -25,6 +25,7 @@
* @since 1.1
*/
public class PropertySetterException extends Exception {
+ private static final long serialVersionUID = -1352613734254235861L;
protected Throwable rootCause;
public
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/AbsoluteTimeDateFormat.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/AbsoluteTimeDateFormat.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/AbsoluteTimeDateFormat.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/AbsoluteTimeDateFormat.java
Fri Apr 27 12:53:38 2007
@@ -35,6 +35,7 @@
@since 0.7.5
*/
public class AbsoluteTimeDateFormat extends DateFormat {
+ private static final long serialVersionUID = -388856345976723342L;
/**
String constant used to specify [EMAIL PROTECTED]
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/DateTimeDateFormat.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/DateTimeDateFormat.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/DateTimeDateFormat.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/DateTimeDateFormat.java
Fri Apr 27 12:53:38 2007
@@ -32,6 +32,7 @@
@since 0.7.5
*/
public class DateTimeDateFormat extends AbsoluteTimeDateFormat {
+ private static final long serialVersionUID = 5547637772208514971L;
String[] shortMonths;
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/FileWatchdog.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/FileWatchdog.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/FileWatchdog.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/FileWatchdog.java
Fri Apr 27 12:53:38 2007
@@ -101,7 +101,7 @@
void run() {
while(!interrupted) {
try {
- Thread.currentThread().sleep(delay);
+ Thread.sleep(delay);
} catch(InterruptedException e) {
// no interruption expected
}
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/ISO8601DateFormat.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/ISO8601DateFormat.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/ISO8601DateFormat.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/ISO8601DateFormat.java
Fri Apr 27 12:53:38 2007
@@ -40,6 +40,7 @@
@since 0.7.5
*/
public class ISO8601DateFormat extends AbsoluteTimeDateFormat {
+ private static final long serialVersionUID = -759840745298755296L;
public
ISO8601DateFormat() {
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/PatternParser.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/PatternParser.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/PatternParser.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/PatternParser.java
Fri Apr 27 12:53:38 2007
@@ -49,7 +49,6 @@
private static final int LITERAL_STATE = 0;
private static final int CONVERTER_STATE = 1;
- private static final int MINUS_STATE = 2;
private static final int DOT_STATE = 3;
private static final int MIN_STATE = 4;
private static final int MAX_STATE = 5;
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/RelativeTimeDateFormat.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/RelativeTimeDateFormat.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/RelativeTimeDateFormat.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/RelativeTimeDateFormat.java
Fri Apr 27 12:53:38 2007
@@ -32,6 +32,8 @@
@since 0.7.5
*/
public class RelativeTimeDateFormat extends DateFormat {
+ private static final long serialVersionUID = 7055751607085611984L;
+
protected final long startTime;
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/Transform.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/Transform.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/Transform.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/helpers/Transform.java
Fri Apr 27 12:53:38 2007
@@ -17,9 +17,6 @@
package org.apache.log4j.helpers;
-import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.LocationInfo;
-
/**
Utility class for transforming strings.
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/net/JMSSink.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/net/JMSSink.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/net/JMSSink.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/net/JMSSink.java
Fri Apr 27 12:53:38 2007
@@ -17,35 +17,25 @@
package org.apache.log4j.net;
-import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.Logger;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.spi.RendererSupport;
-import org.apache.log4j.spi.LoggerRepository;
-import org.apache.log4j.or.jms.MessageRenderer;
import org.apache.log4j.PropertyConfigurator;
+import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.xml.DOMConfigurator;
-import org.apache.log4j.helpers.LogLog;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TopicConnection;
+import javax.jms.JMSException;
+import javax.jms.ObjectMessage;
+import javax.jms.Session;
import javax.jms.Topic;
+import javax.jms.TopicConnection;
import javax.jms.TopicConnectionFactory;
-import javax.jms.TopicSubscriber;
-import javax.jms.Session;
import javax.jms.TopicSession;
-import javax.jms.ObjectMessage;
-import javax.jms.JMSException;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
-import javax.naming.InitialContext;
+import javax.jms.TopicSubscriber;
import javax.naming.Context;
+import javax.naming.InitialContext;
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
-import java.util.Properties;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
/**
* A simple application that consumes logging events sent by a [EMAIL
PROTECTED]
@@ -72,9 +62,9 @@
String configFile = args[4];
if(configFile.endsWith(".xml")) {
- new DOMConfigurator().configure(configFile);
+ DOMConfigurator.configure(configFile);
} else {
- new PropertyConfigurator().configure(configFile);
+ PropertyConfigurator.configure(configFile);
}
new JMSSink(tcfBindingName, topicBindingName, username, password);
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/net/SocketAppender.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/net/SocketAppender.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/net/SocketAppender.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/net/SocketAppender.java
Fri Apr 27 12:53:38 2007
@@ -19,16 +19,15 @@
package org.apache.log4j.net;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.io.ObjectOutputStream;
-
+import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.spi.ErrorCode;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.AppenderSkeleton;
+
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
/**
Sends [EMAIL PROTECTED] LoggingEvent} objects to a remote a log server,
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/net/SocketServer.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/net/SocketServer.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/net/SocketServer.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/net/SocketServer.java
Fri Apr 27 12:53:38 2007
@@ -177,7 +177,7 @@
File configFile = new File(dir, key+CONFIG_FILE_EXT);
if(configFile.exists()) {
- Hierarchy h = new Hierarchy(new RootLogger((Level) Priority.DEBUG));
+ Hierarchy h = new Hierarchy(new RootLogger(Level.DEBUG));
hierarchyMap.put(inetAddress, h);
new PropertyConfigurator().doConfigure(configFile.getAbsolutePath(), h);
@@ -194,7 +194,7 @@
if(genericHierarchy == null) {
File f = new File(dir, GENERIC+CONFIG_FILE_EXT);
if(f.exists()) {
- genericHierarchy = new Hierarchy(new RootLogger((Level)
Priority.DEBUG));
+ genericHierarchy = new Hierarchy(new RootLogger(Level.DEBUG));
new PropertyConfigurator().doConfigure(f.getAbsolutePath(),
genericHierarchy);
} else {
cat.warn("Could not find config file ["+f+
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/nt/NTEventLogAppender.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/nt/NTEventLogAppender.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/nt/NTEventLogAppender.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/nt/NTEventLogAppender.java
Fri Apr 27 12:53:38 2007
@@ -17,12 +17,11 @@
package org.apache.log4j.nt;
-import org.apache.log4j.*;
-import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.Level;
+import org.apache.log4j.AppenderSkeleton;
+import org.apache.log4j.Layout;
+import org.apache.log4j.TTCCLayout;
import org.apache.log4j.helpers.LogLog;
-
-import java.io.*;
+import org.apache.log4j.spi.LoggingEvent;
/**
@@ -43,11 +42,6 @@
private String source = null;
private String server = null;
- private static final int FATAL = Level.FATAL.toInt();
- private static final int ERROR = Level.ERROR.toInt();
- private static final int WARN = Level.WARN.toInt();
- private static final int INFO = Level.INFO.toInt();
- private static final int DEBUG = Level.DEBUG.toInt();
public NTEventLogAppender() {
this(null, null, null);
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/spi/LocationInfo.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/spi/LocationInfo.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/spi/LocationInfo.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/spi/LocationInfo.java
Fri Apr 27 12:53:38 2007
@@ -77,8 +77,7 @@
static boolean inVisualAge = false;
static {
try {
- Class dummy = Class.forName("com.ibm.uvm.tools.DebugSupport");
- inVisualAge = true;
+ inVisualAge = Class.forName("com.ibm.uvm.tools.DebugSupport") != null;
LogLog.debug("Detected IBM VisualAge environment.");
} catch(Throwable e) {
// nothing to do
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/spi/RendererSupport.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/spi/RendererSupport.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/spi/RendererSupport.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/spi/RendererSupport.java
Fri Apr 27 12:53:38 2007
@@ -18,9 +18,8 @@
package org.apache.log4j.spi;
-import org.apache.log4j.*;
-import org.apache.log4j.or.RendererMap;
import org.apache.log4j.or.ObjectRenderer;
+import org.apache.log4j.or.RendererMap;
public interface RendererSupport {
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/varia/ExternallyRolledFileAppender.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/varia/ExternallyRolledFileAppender.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/varia/ExternallyRolledFileAppender.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/varia/ExternallyRolledFileAppender.java
Fri Apr 27 12:53:38 2007
@@ -17,12 +17,13 @@
package org.apache.log4j.varia;
-import java.io.*;
-import java.net.Socket;
-import java.net.ServerSocket;
-import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.RollingFileAppender;
import org.apache.log4j.helpers.LogLog;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.net.ServerSocket;
+import java.net.Socket;
/**
This appender listens on a socket on the port specified by the
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/varia/NullAppender.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/varia/NullAppender.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/varia/NullAppender.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/varia/NullAppender.java
Fri Apr 27 12:53:38 2007
@@ -17,13 +17,8 @@
package org.apache.log4j.varia;
-import org.apache.log4j.Appender;
-import org.apache.log4j.Layout;
-import org.apache.log4j.spi.OptionHandler;
-import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.ErrorHandler;
-import org.apache.log4j.spi.Filter;
import org.apache.log4j.AppenderSkeleton;
+import org.apache.log4j.spi.LoggingEvent;
/**
* A NullAppender merely exists, it never outputs a message to any
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/DOMConfigurator.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/DOMConfigurator.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/DOMConfigurator.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/DOMConfigurator.java
Fri Apr 27 12:53:38 2007
@@ -22,7 +22,6 @@
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.config.PropertySetter;
import org.apache.log4j.helpers.FileWatchdog;
import org.apache.log4j.helpers.Loader;
@@ -1013,7 +1012,7 @@
}
/**
- Call [EMAIL PROTECTED] PropertyConfigurator#configure(String)} with the
+ Call [EMAIL PROTECTED] DOMConfigurator#configure(String)} with the
<code>filename</code> to reconfigure log4j. */
public
void doOnChange() {
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/Log4jEntityResolver.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/Log4jEntityResolver.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/Log4jEntityResolver.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/Log4jEntityResolver.java
Fri Apr 27 12:53:38 2007
@@ -17,15 +17,11 @@
package org.apache.log4j.xml;
-import java.io.InputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
+import org.apache.log4j.helpers.LogLog;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
-import org.apache.log4j.helpers.LogLog;
+import java.io.InputStream;
/**
* An [EMAIL PROTECTED] EntityResolver} specifically designed to return
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/XMLLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/XMLLayout.java?view=diff&rev=533200&r1=533199&r2=533200
==============================================================================
---
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/XMLLayout.java
(original)
+++
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/XMLLayout.java
Fri Apr 27 12:53:38 2007
@@ -20,11 +20,9 @@
package org.apache.log4j.xml;
import org.apache.log4j.Layout;
-import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.LocationInfo;
-import org.apache.log4j.helpers.OptionConverter;
-import org.apache.log4j.helpers.DateLayout;
import org.apache.log4j.helpers.Transform;
+import org.apache.log4j.spi.LocationInfo;
+import org.apache.log4j.spi.LoggingEvent;
/**
* The output of the XMLLayout consists of a series of log4j:event
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
