Author: ceki
Date: Sun Aug 28 16:46:14 2005
New Revision: 225
Modified:
nlog4j/trunk/src/java/org/apache/log4j/helpers/Transform.java
nlog4j/trunk/src/java/org/apache/log4j/jdbc/JDBCAppender.java
nlog4j/trunk/src/java/org/apache/log4j/net/JMSSink.java
nlog4j/trunk/src/java/org/apache/log4j/net/SimpleSocketServer.java
nlog4j/trunk/src/java/org/apache/log4j/net/SocketAppender.java
nlog4j/trunk/src/java/org/apache/log4j/net/test/SyslogMin.java
nlog4j/trunk/src/java/org/apache/log4j/spi/RendererSupport.java
nlog4j/trunk/src/java/org/apache/log4j/test/Shallow.java
nlog4j/trunk/src/java/org/apache/log4j/varia/LevelRangeFilter.java
nlog4j/trunk/src/java/org/apache/log4j/varia/NullAppender.java
nlog4j/trunk/src/java/org/apache/log4j/xml/DOMConfigurator.java
nlog4j/trunk/src/java/org/apache/log4j/xml/Log4jEntityResolver.java
nlog4j/trunk/src/java/org/apache/log4j/xml/XMLLayout.java
nlog4j/trunk/src/java/org/apache/log4j/xml/examples/XMLSample.java
Log:
removed unused imports
Modified: nlog4j/trunk/src/java/org/apache/log4j/helpers/Transform.java
==============================================================================
--- nlog4j/trunk/src/java/org/apache/log4j/helpers/Transform.java
(original)
+++ nlog4j/trunk/src/java/org/apache/log4j/helpers/Transform.java Sun Aug
28 16:46:14 2005
@@ -7,8 +7,6 @@
package org.apache.log4j.helpers;
-import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.LocationInfo;
/**
Utility class for transforming strings.
Modified: nlog4j/trunk/src/java/org/apache/log4j/jdbc/JDBCAppender.java
==============================================================================
--- nlog4j/trunk/src/java/org/apache/log4j/jdbc/JDBCAppender.java
(original)
+++ nlog4j/trunk/src/java/org/apache/log4j/jdbc/JDBCAppender.java Sun Aug
28 16:46:14 2005
@@ -1,6 +1,5 @@
package org.apache.log4j.jdbc;
-import org.apache.log4j.*;
import org.apache.log4j.spi.*;
import org.apache.log4j.PatternLayout;
Modified: nlog4j/trunk/src/java/org/apache/log4j/net/JMSSink.java
==============================================================================
--- nlog4j/trunk/src/java/org/apache/log4j/net/JMSSink.java (original)
+++ nlog4j/trunk/src/java/org/apache/log4j/net/JMSSink.java Sun Aug 28
16:46:14 2005
@@ -9,9 +9,6 @@
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.PropertyConfigurator;
import org.apache.log4j.xml.DOMConfigurator;
@@ -58,9 +55,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: nlog4j/trunk/src/java/org/apache/log4j/net/SimpleSocketServer.java
==============================================================================
--- nlog4j/trunk/src/java/org/apache/log4j/net/SimpleSocketServer.java
(original)
+++ nlog4j/trunk/src/java/org/apache/log4j/net/SimpleSocketServer.java Sun Aug
28 16:46:14 2005
@@ -79,9 +79,9 @@
}
if(configFile.endsWith(".xml")) {
- new DOMConfigurator().configure(configFile);
+ DOMConfigurator.configure(configFile);
} else {
- new PropertyConfigurator().configure(configFile);
+ PropertyConfigurator.configure(configFile);
}
}
}
Modified: nlog4j/trunk/src/java/org/apache/log4j/net/SocketAppender.java
==============================================================================
--- nlog4j/trunk/src/java/org/apache/log4j/net/SocketAppender.java
(original)
+++ nlog4j/trunk/src/java/org/apache/log4j/net/SocketAppender.java Sun Aug
28 16:46:14 2005
@@ -10,15 +10,14 @@
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 java.net.InetAddress;
+import java.net.Socket;
+import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.AppenderSkeleton;
/**
Sends [EMAIL PROTECTED] LoggingEvent} objects to a remote a log server,
Modified: nlog4j/trunk/src/java/org/apache/log4j/net/test/SyslogMin.java
==============================================================================
--- nlog4j/trunk/src/java/org/apache/log4j/net/test/SyslogMin.java
(original)
+++ nlog4j/trunk/src/java/org/apache/log4j/net/test/SyslogMin.java Sun Aug
28 16:46:14 2005
@@ -8,10 +8,10 @@
package org.apache.log4j.net.test;
+import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
-import org.apache.log4j.Priority;
import org.apache.log4j.NDC;
+import org.apache.log4j.PropertyConfigurator;
public class SyslogMin {
@@ -54,7 +54,7 @@
CAT.info( "Message " + i++);
CAT.warn( "Message " + i++);
CAT.error( "Message " + i++);
- CAT.log(Priority.FATAL, "Message " + i++);
+ CAT.log(Level.FATAL, "Message " + i++);
CAT.debug("Message " + i++, new Exception("Just testing."));
}
}
Modified: nlog4j/trunk/src/java/org/apache/log4j/spi/RendererSupport.java
==============================================================================
--- nlog4j/trunk/src/java/org/apache/log4j/spi/RendererSupport.java
(original)
+++ nlog4j/trunk/src/java/org/apache/log4j/spi/RendererSupport.java Sun Aug
28 16:46:14 2005
@@ -2,9 +2,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: nlog4j/trunk/src/java/org/apache/log4j/test/Shallow.java
==============================================================================
--- nlog4j/trunk/src/java/org/apache/log4j/test/Shallow.java (original)
+++ nlog4j/trunk/src/java/org/apache/log4j/test/Shallow.java Sun Aug 28
16:46:14 2005
@@ -6,13 +6,12 @@
*/
// NOTICE: Some tests are sensitive to line numbers!
package org.apache.log4j.test;
-import org.apache.log4j.PropertyConfigurator;
-import org.apache.log4j.xml.DOMConfigurator;
-import org.apache.log4j.Logger;
-import org.apache.log4j.Logger;
+import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.apache.log4j.NDC;
-import org.apache.log4j.Level;
+import org.apache.log4j.PropertyConfigurator;
+import org.apache.log4j.xml.DOMConfigurator;
/**
This class is a shallow test of the various appenders and
layouts. It also tests their reading of the configuration file.
Modified: nlog4j/trunk/src/java/org/apache/log4j/varia/LevelRangeFilter.java
==============================================================================
--- nlog4j/trunk/src/java/org/apache/log4j/varia/LevelRangeFilter.java
(original)
+++ nlog4j/trunk/src/java/org/apache/log4j/varia/LevelRangeFilter.java Sun Aug
28 16:46:14 2005
@@ -10,8 +10,6 @@
import org.apache.log4j.Level;
import org.apache.log4j.spi.Filter;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.helpers.LogLog;
-import org.apache.log4j.helpers.OptionConverter;
/**
This is a very simple filter based on level matching, which can be
Modified: nlog4j/trunk/src/java/org/apache/log4j/varia/NullAppender.java
==============================================================================
--- nlog4j/trunk/src/java/org/apache/log4j/varia/NullAppender.java
(original)
+++ nlog4j/trunk/src/java/org/apache/log4j/varia/NullAppender.java Sun Aug
28 16:46:14 2005
@@ -7,12 +7,7 @@
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;
/**
Modified: nlog4j/trunk/src/java/org/apache/log4j/xml/DOMConfigurator.java
==============================================================================
--- nlog4j/trunk/src/java/org/apache/log4j/xml/DOMConfigurator.java
(original)
+++ nlog4j/trunk/src/java/org/apache/log4j/xml/DOMConfigurator.java Sun Aug
28 16:46:14 2005
@@ -7,28 +7,45 @@
package org.apache.log4j.xml;
-import java.util.*;
-
-import java.net.URL;
-
-import org.w3c.dom.*;
-import java.lang.reflect.Method;
-import org.apache.log4j.*;
-import org.apache.log4j.spi.*;
-import org.apache.log4j.or.RendererMap;
-import org.apache.log4j.helpers.*;
-import org.apache.log4j.config.PropertySetter;
-
-import org.xml.sax.InputSource;
import java.io.FileInputStream;
+import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
-import java.io.IOException;
+import java.lang.reflect.Method;
import java.net.URL;
-import javax.xml.parsers.DocumentBuilderFactory;
+import java.util.Hashtable;
+import java.util.Properties;
+
import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.FactoryConfigurationError;
+import org.apache.log4j.Appender;
+import org.apache.log4j.Layout;
+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;
+import org.apache.log4j.helpers.LogLog;
+import org.apache.log4j.helpers.OptionConverter;
+import org.apache.log4j.or.RendererMap;
+import org.apache.log4j.spi.AppenderAttachable;
+import org.apache.log4j.spi.Configurator;
+import org.apache.log4j.spi.ErrorHandler;
+import org.apache.log4j.spi.Filter;
+import org.apache.log4j.spi.LoggerFactory;
+import org.apache.log4j.spi.LoggerRepository;
+import org.apache.log4j.spi.RendererSupport;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+
// Contributors: Mark Womack
// Arun Katkere
Modified: nlog4j/trunk/src/java/org/apache/log4j/xml/Log4jEntityResolver.java
==============================================================================
--- nlog4j/trunk/src/java/org/apache/log4j/xml/Log4jEntityResolver.java
(original)
+++ nlog4j/trunk/src/java/org/apache/log4j/xml/Log4jEntityResolver.java Sun Aug
28 16:46:14 2005
@@ -8,15 +8,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;
-
/**
* An [EMAIL PROTECTED] EntityResolver} specifically designed to return
* <code>log4j.dtd</code> which is embedded within the log4j jar
Modified: nlog4j/trunk/src/java/org/apache/log4j/xml/XMLLayout.java
==============================================================================
--- nlog4j/trunk/src/java/org/apache/log4j/xml/XMLLayout.java (original)
+++ nlog4j/trunk/src/java/org/apache/log4j/xml/XMLLayout.java Sun Aug 28
16:46:14 2005
@@ -12,8 +12,6 @@
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;
/**
Modified: nlog4j/trunk/src/java/org/apache/log4j/xml/examples/XMLSample.java
==============================================================================
--- nlog4j/trunk/src/java/org/apache/log4j/xml/examples/XMLSample.java
(original)
+++ nlog4j/trunk/src/java/org/apache/log4j/xml/examples/XMLSample.java Sun Aug
28 16:46:14 2005
@@ -1,9 +1,8 @@
package org.apache.log4j.xml.examples;
-import org.apache.log4j.xml.DOMConfigurator;
import org.apache.log4j.Logger;
-import java.net.*;
+import org.apache.log4j.xml.DOMConfigurator;
/**
_______________________________________________
nlog4j-dev mailing list
[email protected]
http://slf4j.org/mailman/listinfo/nlog4j-dev
