Attachment #22315 for bug #45481

View | Details | Raw Unified | Return to bug 45481
Collapse All | Expand All

Lines 17-24 Link Here

(-)src/main/java/org/apache/log4j/Appender.java (-1 / +1 lines)
17		17
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
		20	import org.apache.log4j.spi.ErrorHandler;
20	import org.apache.log4j.spi.Filter;	21	import org.apache.log4j.spi.Filter;
21	import org.apache.log4j.spi.ErrorHandler;
22	import org.apache.log4j.spi.LoggingEvent;	22	import org.apache.log4j.spi.LoggingEvent;
23		23
24	/**	24	/**





package org.apache.log4j;

import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.helpers.OnlyOnceErrorHandler;
import org.apache.log4j.spi.ErrorHandler;
import org.apache.log4j.spi.Filter;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.OptionHandler;
import org.apache.log4j.helpers.LogLog;


/** 





package org.apache.log4j;

import org.apache.log4j.spi.AppenderAttachable;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.LoggerRepository;
import org.apache.log4j.spi.HierarchyEventListener;
import org.apache.log4j.helpers.NullEnumeration;
import org.apache.log4j.helpers.AppenderAttachableImpl;

import java.util.Enumeration;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
import java.util.Vector;

import org.apache.log4j.helpers.AppenderAttachableImpl;
import org.apache.log4j.helpers.NullEnumeration;
import org.apache.log4j.spi.AppenderAttachable;
import org.apache.log4j.spi.HierarchyEventListener;
import org.apache.log4j.spi.LoggerRepository;
import org.apache.log4j.spi.LoggingEvent;


/**
  * <font color="#AA2222"><b>This class has been deprecated and
  * replaced by the {@link Logger} <em>subclass</em></b></font>. It

Lines 19-24 Link Here

(-)src/main/java/org/apache/log4j/ConsoleAppender.java (+1 lines)
19		19
20	import java.io.IOException;	20	import java.io.IOException;
21	import java.io.OutputStream;	21	import java.io.OutputStream;
		22
22	import org.apache.log4j.helpers.LogLog;	23	import org.apache.log4j.helpers.LogLog;
23		24
24	/**	25	/**





package org.apache.log4j;

import java.io.File;
import java.io.IOException;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.Locale;
import java.util.TimeZone;
import java.util.Locale;

import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.spi.LoggingEvent;

Lines 17-32 Link Here

(-)src/main/java/org/apache/log4j/FileAppender.java (-6 / +6 lines)
17		17
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
		20	import java.io.BufferedWriter;
		21	import java.io.File;
		22	import java.io.FileNotFoundException;
		23	import java.io.FileOutputStream;
20	import java.io.IOException;	24	import java.io.IOException;
21	import java.io.Writer;	25	import java.io.Writer;
22	import java.io.FileOutputStream;
23	import java.io.BufferedWriter;
24	import java.io.FileNotFoundException;
25	import java.io.File;
26		26
		27	import org.apache.log4j.helpers.LogLog;
		28	import org.apache.log4j.helpers.QuietWriter;
27	import org.apache.log4j.spi.ErrorCode;	29	import org.apache.log4j.spi.ErrorCode;
28	import org.apache.log4j.helpers.QuietWriter;
29	import org.apache.log4j.helpers.LogLog;
30		30
31	// Contibutors: Jens Uwe Pipka <jens.pipka@gmx.de>	31	// Contibutors: Jens Uwe Pipka <jens.pipka@gmx.de>
32	// Ben Sandee	32	// Ben Sandee

Lines 17-25 Link Here

(-)src/main/java/org/apache/log4j/HTMLLayout.java (-2 / +2 lines)
17		17
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
		20	import org.apache.log4j.helpers.Transform;
		21	import org.apache.log4j.spi.LocationInfo;
20	import org.apache.log4j.spi.LoggingEvent;	22	import org.apache.log4j.spi.LoggingEvent;
21	import org.apache.log4j.spi.LocationInfo;
22	import org.apache.log4j.helpers.Transform;
23		23
24	/**	24	/**
25	* This layout outputs events in a HTML table.	25	* This layout outputs events in a HTML table.




package org.apache.log4j;


import java.util.Hashtable;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Vector;

import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.or.ObjectRenderer;
import org.apache.log4j.or.RendererMap;
import org.apache.log4j.spi.HierarchyEventListener;
import org.apache.log4j.spi.LoggerFactory;
import org.apache.log4j.spi.LoggerRepository;
import org.apache.log4j.spi.RendererSupport;
import org.apache.log4j.Appender;
import org.apache.log4j.or.RendererMap;
import org.apache.log4j.or.ObjectRenderer;
import org.apache.log4j.helpers.LogLog;

/**
   This class is specialized in retrieving loggers by name and also

Lines 17-24 Link Here

(-)src/main/java/org/apache/log4j/Layout.java (-1 / +1 lines)
17		17
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
		20	import org.apache.log4j.spi.LoggingEvent;
20	import org.apache.log4j.spi.OptionHandler;	21	import org.apache.log4j.spi.OptionHandler;
21	import org.apache.log4j.spi.LoggingEvent;
22		22
23	/**	23	/**
24	Extend this abstract class to create your own log layout format.	24	Extend this abstract class to create your own log layout format.





package org.apache.log4j;

import java.net.MalformedURLException;
import java.net.URL;
import java.util.Enumeration;

import org.apache.log4j.helpers.Loader;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.spi.DefaultRepositorySelector;
import org.apache.log4j.spi.LoggerFactory;
import org.apache.log4j.spi.LoggerRepository;
import org.apache.log4j.spi.NOPLoggerRepository;
import org.apache.log4j.spi.RepositorySelector;
import org.apache.log4j.spi.DefaultRepositorySelector;
import org.apache.log4j.spi.RootLogger;
import org.apache.log4j.spi.NOPLoggerRepository;
import org.apache.log4j.helpers.Loader;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.helpers.LogLog;

import java.net.URL;
import java.net.MalformedURLException;


import java.util.Enumeration;

/**
 * Use the <code>LogManager</code> class to retreive {@link Logger}
 * instances or to operate on the current {@link

Lines 18-24 Link Here

(-)src/main/java/org/apache/log4j/Logger.java (-1 lines)
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
20	import org.apache.log4j.spi.LoggerFactory;	20	import org.apache.log4j.spi.LoggerFactory;
21	import org.apache.log4j.Level;
22		21
23		22
24	/**	23	/**

Lines 18-23 Link Here

(-)src/main/java/org/apache/log4j/MDC.java (+1 lines)
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
20	import java.util.Hashtable;	20	import java.util.Hashtable;
		21
21	import org.apache.log4j.helpers.Loader;	22	import org.apache.log4j.helpers.Loader;
22	import org.apache.log4j.helpers.ThreadLocalMap;	23	import org.apache.log4j.helpers.ThreadLocalMap;
23		24

Lines 20-28 Link Here

(-)src/main/java/org/apache/log4j/NDC.java (-1 / +1 lines)
20		20
21	package org.apache.log4j;	21	package org.apache.log4j;
22		22
		23	import java.util.Enumeration;
23	import java.util.Hashtable;	24	import java.util.Hashtable;
24	import java.util.Stack;	25	import java.util.Stack;
25	import java.util.Enumeration;
26	import java.util.Vector;	26	import java.util.Vector;
27		27
28	import org.apache.log4j.helpers.LogLog;	28	import org.apache.log4j.helpers.LogLog;

Lines 17-26 Link Here

(-)src/main/java/org/apache/log4j/PatternLayout.java (-3 / +2 lines)
17		17
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
20	import org.apache.log4j.Layout;
21	import org.apache.log4j.spi.LoggingEvent;
22	import org.apache.log4j.helpers.PatternParser;
23	import org.apache.log4j.helpers.PatternConverter;	20	import org.apache.log4j.helpers.PatternConverter;
		21	import org.apache.log4j.helpers.PatternParser;
		22	import org.apache.log4j.spi.LoggingEvent;
24		23
25		24
26	// Contributors: Nelson Minar <nelson@monkey.org>	25	// Contributors: Nelson Minar <nelson@monkey.org>





package org.apache.log4j;

import java.io.FileInputStream;
import java.io.InputStream;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Properties;
import java.util.StringTokenizer;

import org.apache.log4j.config.PropertySetter;
import org.apache.log4j.helpers.FileWatchdog;
import org.apache.log4j.helpers.LogLog;

import org.apache.log4j.spi.OptionHandler;
import org.apache.log4j.spi.RendererSupport;

import java.io.FileInputStream;
import java.io.InputStream;
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
   <b>{@link #doConfigure(String, LoggerRepository)}</b> for the

Lines 19-30 Link Here

(-)src/main/java/org/apache/log4j/RollingFileAppender.java (-3 / +4 lines)
19		19
20	package org.apache.log4j;	20	package org.apache.log4j;
21		21
		22	import java.io.File;
22	import java.io.IOException;	23	import java.io.IOException;
23	import java.io.Writer;	24	import java.io.Writer;
24	import java.io.File;	25
		26	import org.apache.log4j.helpers.CountingQuietWriter;
		27	import org.apache.log4j.helpers.LogLog;
25	import org.apache.log4j.helpers.OptionConverter;	28	import org.apache.log4j.helpers.OptionConverter;
26	import org.apache.log4j.helpers.LogLog;
27	import org.apache.log4j.helpers.CountingQuietWriter;
28	import org.apache.log4j.spi.LoggingEvent;	29	import org.apache.log4j.spi.LoggingEvent;
29		30
30	/**	31	/**




package org.apache.log4j;

import java.io.IOException;
import java.io.Writer;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;

import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.helpers.QuietWriter;
import org.apache.log4j.spi.ErrorHandler;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.helpers.QuietWriter;
import org.apache.log4j.helpers.LogLog;

// Contibutors: Jens Uwe Pipka <jens.pipka@gmx.de>
//              Ben Sandee

Lines 19-24 Link Here

(-)src/main/java/org/apache/log4j/chainsaw/DetailPanel.java (+2 lines)
19	import java.awt.BorderLayout;	19	import java.awt.BorderLayout;
20	import java.text.MessageFormat;	20	import java.text.MessageFormat;
21	import java.util.Date;	21	import java.util.Date;
		22
22	import javax.swing.BorderFactory;	23	import javax.swing.BorderFactory;
23	import javax.swing.JEditorPane;	24	import javax.swing.JEditorPane;
24	import javax.swing.JPanel;	25	import javax.swing.JPanel;
Lines 27-32 Link Here
27	import javax.swing.ListSelectionModel;	28	import javax.swing.ListSelectionModel;
28	import javax.swing.event.ListSelectionEvent;	29	import javax.swing.event.ListSelectionEvent;
29	import javax.swing.event.ListSelectionListener;	30	import javax.swing.event.ListSelectionListener;
		31
30	import org.apache.log4j.Logger;	32	import org.apache.log4j.Logger;
31		33
32	/**	34	/**

Lines 17-23 Link Here

(-)src/main/java/org/apache/log4j/chainsaw/ExitAction.java (+2 lines)
17	package org.apache.log4j.chainsaw;	17	package org.apache.log4j.chainsaw;
18		18
19	import java.awt.event.ActionEvent;	19	import java.awt.event.ActionEvent;
		20
20	import javax.swing.AbstractAction;	21	import javax.swing.AbstractAction;
		22
21	import org.apache.log4j.Logger;	23	import org.apache.log4j.Logger;
22		24
23	/**	25	/**




import java.io.File;
import java.io.IOException;
import java.io.StringReader;

import javax.swing.AbstractAction;
import javax.swing.JFileChooser;
import javax.swing.JFrame;
import javax.swing.JOptionPane;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;

import org.apache.log4j.Logger;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;

Lines 22-27 Link Here

(-)src/main/java/org/apache/log4j/chainsaw/LoggingReceiver.java (+1 lines)
22	import java.net.ServerSocket;	22	import java.net.ServerSocket;
23	import java.net.Socket;	23	import java.net.Socket;
24	import java.net.SocketException;	24	import java.net.SocketException;
		25
25	import org.apache.log4j.Logger;	26	import org.apache.log4j.Logger;
26	import org.apache.log4j.spi.LoggingEvent;	27	import org.apache.log4j.spi.LoggingEvent;
27		28

Lines 22-27 Link Here

(-)src/main/java/org/apache/log4j/chainsaw/Main.java (+2 lines)
22	import java.awt.event.WindowEvent;	22	import java.awt.event.WindowEvent;
23	import java.io.IOException;	23	import java.io.IOException;
24	import java.util.Properties;	24	import java.util.Properties;
		25
25	import javax.swing.BorderFactory;	26	import javax.swing.BorderFactory;
26	import javax.swing.JFrame;	27	import javax.swing.JFrame;
27	import javax.swing.JMenu;	28	import javax.swing.JMenu;
Lines 33-38 Link Here
33	import javax.swing.JSplitPane;	34	import javax.swing.JSplitPane;
34	import javax.swing.JTable;	35	import javax.swing.JTable;
35	import javax.swing.ListSelectionModel;	36	import javax.swing.ListSelectionModel;
		37
36	import org.apache.log4j.Logger;	38	import org.apache.log4j.Logger;
37	import org.apache.log4j.PropertyConfigurator;	39	import org.apache.log4j.PropertyConfigurator;
38		40

Lines 24-32 Link Here

(-)src/main/java/org/apache/log4j/chainsaw/MyTableModel.java (-1 / +3 lines)
24	import java.util.List;	24	import java.util.List;
25	import java.util.SortedSet;	25	import java.util.SortedSet;
26	import java.util.TreeSet;	26	import java.util.TreeSet;
		27
27	import javax.swing.table.AbstractTableModel;	28	import javax.swing.table.AbstractTableModel;
		29
		30	import org.apache.log4j.Logger;
28	import org.apache.log4j.Priority;	31	import org.apache.log4j.Priority;
29	import org.apache.log4j.Logger;
30		32
31	/**	33	/**
32	* Represents a list of <code>EventDetails</code> objects that are sorted on	34	* Represents a list of <code>EventDetails</code> objects that are sorted on

Lines 17-22 Link Here

(-)src/main/java/org/apache/log4j/chainsaw/XMLFileHandler.java (+1 lines)
17	package org.apache.log4j.chainsaw;	17	package org.apache.log4j.chainsaw;
18		18
19	import java.util.StringTokenizer;	19	import java.util.StringTokenizer;
		20
20	import org.apache.log4j.Level;	21	import org.apache.log4j.Level;
21	import org.xml.sax.Attributes;	22	import org.xml.sax.Attributes;
22	import org.xml.sax.SAXException;	23	import org.xml.sax.SAXException;

Lines 17-24 Link Here

(-)src/main/java/org/apache/log4j/config/PropertyGetter.java (-2 / +6 lines)
17		17
18	package org.apache.log4j.config;	18	package org.apache.log4j.config;
19		19
20	import java.beans.*;	20	import java.beans.BeanInfo;
21	import java.lang.reflect.*;	21	import java.beans.IntrospectionException;
		22	import java.beans.Introspector;
		23	import java.beans.PropertyDescriptor;
		24	import java.lang.reflect.Method;
		25
22	import org.apache.log4j.Priority;	26	import org.apache.log4j.Priority;
23	import org.apache.log4j.helpers.LogLog;	27	import org.apache.log4j.helpers.LogLog;
24		28





package org.apache.log4j.config;

import java.io.PrintWriter;
import java.util.Enumeration;
import java.util.Hashtable;

import org.apache.log4j.Appender;
import org.apache.log4j.Category;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;

import java.io.PrintWriter;
import java.util.Enumeration;
import java.util.Hashtable;

/**
   Prints the configuration of the log4j default hierarchy
   (which needs to be auto-initialized) as a propoperties file

Lines 19-31 Link Here

(-)src/main/java/org/apache/log4j/config/PropertySetter.java (-5 / +9 lines)
19		19
20	package org.apache.log4j.config;	20	package org.apache.log4j.config;
21		21
		22	import java.beans.BeanInfo;
		23	import java.beans.IntrospectionException;
22	import java.beans.Introspector;	24	import java.beans.Introspector;
23	import java.beans.PropertyDescriptor;	25	import java.beans.PropertyDescriptor;
24	import java.beans.BeanInfo;	26	import java.lang.reflect.Method;
25	import java.beans.IntrospectionException;	27	import java.util.Enumeration;
26	import java.lang.reflect.*;	28	import java.util.Properties;
27	import java.util.*;	29
28	import org.apache.log4j.*;	30	import org.apache.log4j.Appender;
		31	import org.apache.log4j.Level;
		32	import org.apache.log4j.Priority;
29	import org.apache.log4j.helpers.LogLog;	33	import org.apache.log4j.helpers.LogLog;
30	import org.apache.log4j.helpers.OptionConverter;	34	import org.apache.log4j.helpers.OptionConverter;
31	import org.apache.log4j.spi.OptionHandler;	35	import org.apache.log4j.spi.OptionHandler;





package org.apache.log4j.helpers;

import java.text.DateFormat;
import java.text.FieldPosition;
import java.text.ParsePosition;
import java.util.Calendar;
import java.util.Date;
import java.util.Calendar;
import java.util.TimeZone;
import java.text.FieldPosition;
import java.text.ParsePosition;
import java.text.DateFormat;


/**





package org.apache.log4j.helpers;

import java.util.Enumeration;
import java.util.Vector;

import org.apache.log4j.Appender;
import org.apache.log4j.spi.AppenderAttachable;
import org.apache.log4j.spi.LoggingEvent;

import org.apache.log4j.Appender;
import java.util.Vector;
import java.util.Enumeration;

/**
   A straightforward implementation of the {@link AppenderAttachable}
   interface.





package org.apache.log4j.helpers;

import java.io.IOException;
import java.io.Writer;
import java.io.IOException;

import org.apache.log4j.spi.ErrorCode;
import org.apache.log4j.spi.ErrorHandler;
import org.apache.log4j.spi.ErrorCode;

/**
   Counts the number of bytes written.





package org.apache.log4j.helpers;

import org.apache.log4j.Layout;
import org.apache.log4j.helpers.RelativeTimeDateFormat;
import org.apache.log4j.helpers.AbsoluteTimeDateFormat;
import org.apache.log4j.helpers.DateTimeDateFormat;
import org.apache.log4j.helpers.ISO8601DateFormat;
import org.apache.log4j.spi.LoggingEvent;
import java.text.DateFormat;
import java.text.FieldPosition;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.TimeZone;
import java.text.FieldPosition;

import org.apache.log4j.Layout;
import org.apache.log4j.spi.LoggingEvent;


/**
   This abstract layout takes care of all the date related options and
   formatting work.

Lines 17-28 Link Here

(-)src/main/java/org/apache/log4j/helpers/DateTimeDateFormat.java (-4 / +4 lines)
17		17
18	package org.apache.log4j.helpers;	18	package org.apache.log4j.helpers;
19		19
		20	import java.text.DateFormatSymbols;
		21	import java.text.FieldPosition;
		22	import java.text.ParsePosition;
20	import java.util.Calendar;	23	import java.util.Calendar;
		24	import java.util.Date;
21	import java.util.TimeZone;	25	import java.util.TimeZone;
22	import java.util.Date;
23	import java.text.FieldPosition;
24	import java.text.ParsePosition;
25	import java.text.DateFormatSymbols;
26		26
27	/**	27	/**
28	Formats a {@link Date} in the format "dd MMM yyyy HH:mm:ss,SSS" for example,	28	Formats a {@link Date} in the format "dd MMM yyyy HH:mm:ss,SSS" for example,

Lines 17-27 Link Here

(-)src/main/java/org/apache/log4j/helpers/ISO8601DateFormat.java (-3 / +3 lines)
17		17
18	package org.apache.log4j.helpers;	18	package org.apache.log4j.helpers;
19		19
		20	import java.text.FieldPosition;
		21	import java.text.ParsePosition;
20	import java.util.Calendar;	22	import java.util.Calendar;
		23	import java.util.Date;
21	import java.util.TimeZone;	24	import java.util.TimeZone;
22	import java.util.Date;
23	import java.text.FieldPosition;
24	import java.text.ParsePosition;
25		25
26	// Contributors: Arndt Schoenewald <arndt@ibm23093i821.mc.schoenewald.de>	26	// Contributors: Arndt Schoenewald <arndt@ibm23093i821.mc.schoenewald.de>
27		27

Lines 17-26 Link Here

(-)src/main/java/org/apache/log4j/helpers/Loader.java (-3 / +2 lines)
17		17
18	package org.apache.log4j.helpers;	18	package org.apache.log4j.helpers;
19		19
20	import java.net.URL;
21	import java.lang.IllegalAccessException;
22	import java.lang.reflect.Method;
23	import java.lang.reflect.InvocationTargetException;	20	import java.lang.reflect.InvocationTargetException;
		21	import java.lang.reflect.Method;
		22	import java.net.URL;
24		23
25		24
26	/**	25	/**

Lines 17-26 Link Here

(-)src/main/java/org/apache/log4j/helpers/OnlyOnceErrorHandler.java (-4 / +4 lines)
17		17
18	package org.apache.log4j.helpers;	18	package org.apache.log4j.helpers;
19		19
20	import org.apache.log4j.spi.ErrorHandler;	20	import org.apache.log4j.Appender;
21	import org.apache.log4j.spi.LoggingEvent;	21	import org.apache.log4j.Logger;
22	import org.apache.log4j.Logger;	22	import org.apache.log4j.spi.ErrorHandler;
23	import org.apache.log4j.Appender;	23	import org.apache.log4j.spi.LoggingEvent;
24		24
25	/**	25	/**
26		26





package org.apache.log4j.helpers;

import java.net.URL;
import java.util.Properties;

import org.apache.log4j.Level;
import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.spi.Configurator;
import org.apache.log4j.spi.LoggerRepository;
import org.apache.log4j.PropertyConfigurator;

// Contributors:   Avy Sharell (sharell@online.fr)
//                 Matthieu Verbert (mve@zurich.ibm.com)




 */
package org.apache.log4j.helpers;

import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.helpers.AbsoluteTimeDateFormat;
import org.apache.log4j.Layout;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.LocationInfo;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;

import org.apache.log4j.Layout;
import org.apache.log4j.spi.LocationInfo;
import org.apache.log4j.spi.LoggingEvent;

// Contributors:   Nelson Minar <(nelson@monkey.org>
//                 Igor E. Poteryaev <jah@mail.ru>
//                 Reinhard Deschler <reinhard.deschler@web.de>





package org.apache.log4j.helpers;

import java.io.Writer;
import java.io.FilterWriter;
import java.io.IOException;
import java.io.Writer;

import org.apache.log4j.spi.ErrorCode;
import org.apache.log4j.spi.ErrorHandler;
import org.apache.log4j.spi.ErrorCode;


/**

Lines 17-26 Link Here

(-)src/main/java/org/apache/log4j/helpers/RelativeTimeDateFormat.java (-2 / +2 lines)
17		17
18	package org.apache.log4j.helpers;	18	package org.apache.log4j.helpers;
19		19
20	import java.util.Date;	20	import java.text.DateFormat;
21	import java.text.FieldPosition;	21	import java.text.FieldPosition;
22	import java.text.ParsePosition;	22	import java.text.ParsePosition;
23	import java.text.DateFormat;	23	import java.util.Date;
24		24
25	/**	25	/**
26	Formats a {@link Date} by printing the number of milliseconds	26	Formats a {@link Date} by printing the number of milliseconds

Lines 20-25 Link Here

(-)src/main/java/org/apache/log4j/helpers/SyslogQuietWriter.java (+1 lines)
20		20
21		21
22	import java.io.Writer;	22	import java.io.Writer;
		23
23	import org.apache.log4j.spi.ErrorHandler;	24	import org.apache.log4j.spi.ErrorHandler;
24		25
25	/**	26	/**




package org.apache.log4j.helpers;


import java.io.IOException;
import java.io.Writer;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
import java.net.InetAddress;
import java.net.MalformedURLException;
import java.net.UnknownHostException;
import java.net.SocketException;
import java.io.IOException;
import java.net.URL;
import java.net.UnknownHostException;

/**
   SyslogWriter is a wrapper around the java.net.DatagramSocket class




 */
package org.apache.log4j.jdbc;

import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.Iterator;

import org.apache.log4j.PatternLayout;
import org.apache.log4j.spi.ErrorCode;
import org.apache.log4j.spi.LoggingEvent;
import java.sql.SQLException;


/**





//import java.lang.reflect.Constructor;
import java.util.Iterator;

import javax.management.Attribute;
import javax.management.AttributeList;
import javax.management.DynamicMBean;
import javax.management.AttributeList;
import javax.management.Attribute;
import javax.management.RuntimeOperationsException;
import javax.management.MBeanRegistration;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.RuntimeOperationsException;

import org.apache.log4j.Logger;


Lines 17-50 Link Here

(-)src/main/java/org/apache/log4j/jmx/AppenderDynamicMBean.java (-20 / +23 lines)
17		17
18	package org.apache.log4j.jmx;	18	package org.apache.log4j.jmx;
19		19
		20	import java.beans.BeanInfo;
		21	import java.beans.IntrospectionException;
		22	import java.beans.Introspector;
		23	import java.beans.PropertyDescriptor;
20	import java.lang.reflect.Constructor;	24	import java.lang.reflect.Constructor;
21	import org.apache.log4j.*;	25	import java.lang.reflect.Method;
22	import org.apache.log4j.helpers.OptionConverter;	26	import java.util.Hashtable;
23	import org.apache.log4j.spi.OptionHandler;	27	import java.util.Vector;
24		28
25	import java.util.Vector;	29	import javax.management.Attribute;
26	import java.util.Hashtable;	30	import javax.management.AttributeNotFoundException;
27	import java.lang.reflect.Method;	31	import javax.management.InvalidAttributeValueException;
28	import javax.management.MBeanAttributeInfo;	32	import javax.management.MBeanAttributeInfo;
29	import javax.management.MBeanConstructorInfo;	33	import javax.management.MBeanConstructorInfo;
		34	import javax.management.MBeanException;
		35	import javax.management.MBeanInfo;
30	import javax.management.MBeanNotificationInfo;	36	import javax.management.MBeanNotificationInfo;
		37	import javax.management.MBeanOperationInfo;
		38	import javax.management.MBeanParameterInfo;
		39	import javax.management.MBeanServer;
31	import javax.management.ObjectName;	40	import javax.management.ObjectName;
32	import javax.management.MBeanInfo;	41	import javax.management.ReflectionException;
33	import javax.management.Attribute;
34	import javax.management.MBeanServer;
35
36	import javax.management.MBeanException;
37	import javax.management.AttributeNotFoundException;
38	import javax.management.RuntimeOperationsException;	42	import javax.management.RuntimeOperationsException;
39	import javax.management.ReflectionException;
40	import javax.management.InvalidAttributeValueException;
41	import javax.management.MBeanOperationInfo;
42	import javax.management.MBeanParameterInfo;
43		43
44	import java.beans.Introspector;	44	import org.apache.log4j.Appender;
45	import java.beans.BeanInfo;	45	import org.apache.log4j.Layout;
46	import java.beans.PropertyDescriptor;	46	import org.apache.log4j.Level;
47	import java.beans.IntrospectionException;	47	import org.apache.log4j.Logger;
		48	import org.apache.log4j.Priority;
		49	import org.apache.log4j.helpers.OptionConverter;
		50	import org.apache.log4j.spi.OptionHandler;
48		51
49	public class AppenderDynamicMBean extends AbstractDynamicMBean {	52	public class AppenderDynamicMBean extends AbstractDynamicMBean {
50		53






import java.lang.reflect.Constructor;
import java.util.Vector;

import javax.management.Attribute;
import javax.management.AttributeNotFoundException;
import javax.management.InvalidAttributeValueException;
import javax.management.ListenerNotFoundException;
import java.util.Vector;
import javax.management.MBeanAttributeInfo;
import javax.management.MBeanConstructorInfo;
import javax.management.MBeanException;
import javax.management.MBeanInfo;
import javax.management.MBeanNotificationInfo;
import javax.management.MBeanOperationInfo;
import javax.management.MBeanParameterInfo;
import javax.management.Notification;
import javax.management.NotificationBroadcaster;
import javax.management.MBeanInfo;
import javax.management.Attribute;

import javax.management.MBeanException;
import javax.management.AttributeNotFoundException;
import javax.management.RuntimeOperationsException;
import javax.management.ReflectionException;
import javax.management.InvalidAttributeValueException;
import javax.management.NotificationBroadcasterSupport;
import javax.management.NotificationBroadcaster;
import javax.management.Notification;
import javax.management.NotificationListener;
import javax.management.NotificationFilter;
import javax.management.NotificationFilterSupport;
import javax.management.NotificationListener;
import javax.management.ObjectName;
import javax.management.ReflectionException;
import javax.management.RuntimeOperationsException;

import org.apache.log4j.Appender;
import org.apache.log4j.Category;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.spi.HierarchyEventListener;
import org.apache.log4j.spi.LoggerRepository;

public class HierarchyDynamicMBean extends AbstractDynamicMBean
                                   implements HierarchyEventListener,
                                              NotificationBroadcaster {





package org.apache.log4j.jmx;

import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Constructor;
import org.apache.log4j.Logger;
import org.apache.log4j.Level;
import org.apache.log4j.Layout;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.spi.OptionHandler;

import java.util.Vector;
import java.util.Hashtable;
import java.lang.reflect.Method;
import java.util.Hashtable;
import java.util.Vector;
import javax.management.MBeanNotificationInfo;
import javax.management.MBeanInfo;
import javax.management.Attribute;

import javax.management.Attribute;
import javax.management.AttributeNotFoundException;
import javax.management.RuntimeOperationsException;
import javax.management.ReflectionException;
import javax.management.InvalidAttributeValueException;
import javax.management.MBeanAttributeInfo;
import javax.management.MBeanConstructorInfo;
import javax.management.MBeanException;
import javax.management.MBeanInfo;
import javax.management.MBeanNotificationInfo;
import javax.management.MBeanOperationInfo;
import javax.management.MBeanParameterInfo;
import javax.management.ReflectionException;
import javax.management.RuntimeOperationsException;

import org.apache.log4j.Layout;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.spi.OptionHandler;

public class LayoutDynamicMBean extends AbstractDynamicMBean {


Lines 18-48 Link Here

(-)src/main/java/org/apache/log4j/jmx/LoggerDynamicMBean.java (-15 / +14 lines)
18	package org.apache.log4j.jmx;	18	package org.apache.log4j.jmx;
19		19
20	import java.lang.reflect.Constructor;	20	import java.lang.reflect.Constructor;
21	import org.apache.log4j.Logger;
22	import org.apache.log4j.Level;
23	import org.apache.log4j.Appender;
24	import org.apache.log4j.helpers.OptionConverter;
25
26	import java.util.Vector;
27	import java.util.Enumeration;	21	import java.util.Enumeration;
		22	import java.util.Vector;
28		23
		24	import javax.management.Attribute;
		25	import javax.management.AttributeNotFoundException;
		26	import javax.management.InvalidAttributeValueException;
29	import javax.management.MBeanAttributeInfo;	27	import javax.management.MBeanAttributeInfo;
30	import javax.management.MBeanConstructorInfo;	28	import javax.management.MBeanConstructorInfo;
		29	import javax.management.MBeanException;
		30	import javax.management.MBeanInfo;
31	import javax.management.MBeanNotificationInfo;	31	import javax.management.MBeanNotificationInfo;
32	import javax.management.MBeanOperationInfo;	32	import javax.management.MBeanOperationInfo;
33	import javax.management.MBeanParameterInfo;	33	import javax.management.MBeanParameterInfo;
		34	import javax.management.Notification;
		35	import javax.management.NotificationListener;
34	import javax.management.ObjectName;	36	import javax.management.ObjectName;
35	import javax.management.MBeanInfo;
36	import javax.management.Attribute;
37
38	import javax.management.MBeanException;
39	import javax.management.AttributeNotFoundException;
40	import javax.management.RuntimeOperationsException;
41	import javax.management.ReflectionException;	37	import javax.management.ReflectionException;
42	import javax.management.InvalidAttributeValueException;	38	import javax.management.RuntimeOperationsException;
43	import javax.management.NotificationListener;
44	import javax.management.Notification;
45		39
		40	import org.apache.log4j.Appender;
		41	import org.apache.log4j.Level;
		42	import org.apache.log4j.Logger;
		43	import org.apache.log4j.helpers.OptionConverter;
		44
46	public class LoggerDynamicMBean extends AbstractDynamicMBean	45	public class LoggerDynamicMBean extends AbstractDynamicMBean
47	implements NotificationListener {	46	implements NotificationListener {
48		47





package org.apache.log4j.lf5;

import java.io.IOException;
import java.net.URL;

import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.spi.Configurator;
import org.apache.log4j.spi.LoggerRepository;

import java.io.IOException;
import java.net.URL;

/**
 * The <code>DefaultLF5Configurator</code> provides a default
 * configuration for the <code>LF5Appender</code>.





package org.apache.log4j.lf5;

import java.awt.Toolkit;

import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.lf5.viewer.LogBrokerMonitor;
import org.apache.log4j.spi.LocationInfo;
import org.apache.log4j.spi.LoggingEvent;

import java.awt.*;

/**
 * <code>LF5Appender</code> logs events to a swing based logging
 * console. The swing console supports turning categories on and off,

Lines 16-24 Link Here

(-)src/main/java/org/apache/log4j/lf5/LogLevel.java (-2 / +5 lines)
16	*/	16	*/
17	package org.apache.log4j.lf5;	17	package org.apache.log4j.lf5;
18		18
19	import java.awt.*;	19	import java.awt.Color;
20	import java.util.*;	20	import java.util.Arrays;
		21	import java.util.HashMap;
		22	import java.util.Iterator;
21	import java.util.List;	23	import java.util.List;
		24	import java.util.Map;
22		25
23	/**	26	/**
24	* The LogLevel class defines a set of standard logging levels.	27	* The LogLevel class defines a set of standard logging levels.

Lines 16-27 Link Here

(-)src/main/java/org/apache/log4j/lf5/util/AdapterLogRecord.java (-3 / +3 lines)
16	*/	16	*/
17	package org.apache.log4j.lf5.util;	17	package org.apache.log4j.lf5.util;
18		18
		19	import java.io.PrintWriter;
		20	import java.io.StringWriter;
		21
19	import org.apache.log4j.lf5.LogLevel;	22	import org.apache.log4j.lf5.LogLevel;
20	import org.apache.log4j.lf5.LogRecord;	23	import org.apache.log4j.lf5.LogRecord;
21		24
22	import java.io.PrintWriter;
23	import java.io.StringWriter;
24
25	/**	25	/**
26	* <p>A LogRecord to be used with the LogMonitorAdapter</p>	26	* <p>A LogRecord to be used with the LogMonitorAdapter</p>
27	*	27	*




 */
package org.apache.log4j.lf5.util;

import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;

import javax.swing.SwingUtilities;

import org.apache.log4j.lf5.Log4JLogRecord;
import org.apache.log4j.lf5.LogLevel;
import org.apache.log4j.lf5.LogLevelFormatException;

import org.apache.log4j.lf5.viewer.LogFactor5ErrorDialog;
import org.apache.log4j.lf5.viewer.LogFactor5LoadingDialog;

import javax.swing.*;
import java.io.*;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;

/**
 * Provides utility methods for input and output streams.
 *




 */
package org.apache.log4j.lf5.util;

import java.awt.Toolkit;
import java.util.Arrays;
import java.util.List;

import org.apache.log4j.lf5.LogLevel;
import org.apache.log4j.lf5.LogRecord;
import org.apache.log4j.lf5.viewer.LogBrokerMonitor;

import java.awt.*;
import java.util.Arrays;
import java.util.List;

/**
 * <p>LogMonitorAdapter facilitates the usage of the LogMonitor</p>
 *




 */
package org.apache.log4j.lf5.viewer;

import org.apache.log4j.lf5.LogRecord;
import org.apache.log4j.lf5.LogRecordFilter;
import org.apache.log4j.lf5.PassingLogRecordFilter;

import javax.swing.table.AbstractTableModel;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;

import javax.swing.table.AbstractTableModel;

import org.apache.log4j.lf5.LogRecord;
import org.apache.log4j.lf5.LogRecordFilter;
import org.apache.log4j.lf5.PassingLogRecordFilter;


/**
 * A TableModel for LogRecords which includes filtering support.
 *

Lines 16-24 Link Here

(-)src/main/java/org/apache/log4j/lf5/viewer/LF5SwingUtils.java (-2 / +7 lines)
16	*/	16	*/
17	package org.apache.log4j.lf5.viewer;	17	package org.apache.log4j.lf5.viewer;
18		18
19	import javax.swing.*;	19	import java.awt.Adjustable;
		20
		21	import javax.swing.JComponent;
		22	import javax.swing.JScrollPane;
		23	import javax.swing.JTable;
		24	import javax.swing.ListSelectionModel;
		25	import javax.swing.SwingUtilities;
20	import javax.swing.table.TableModel;	26	import javax.swing.table.TableModel;
21	import java.awt.*;
22		27
23	/**	28	/**
24	* Provides methods to accomplish common yet non-trivial tasks	29	* Provides methods to accomplish common yet non-trivial tasks




 */
package org.apache.log4j.lf5.viewer;

import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.GraphicsEnvironment;
import java.awt.Toolkit;
import org.apache.log4j.lf5.viewer.configure.ConfigurationManager;
import org.apache.log4j.lf5.viewer.configure.MRUFileManager;

import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;

import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
import java.util.Vector;

import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JCheckBoxMenuItem;
import javax.swing.JColorChooser;
import javax.swing.JComboBox;
import javax.swing.JFileChooser;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
import javax.swing.JTextArea;
import javax.swing.JToolBar;
import javax.swing.KeyStroke;
import javax.swing.SwingUtilities;

import org.apache.log4j.lf5.LogLevel;
import org.apache.log4j.lf5.LogRecord;
import org.apache.log4j.lf5.LogRecordFilter;
import org.apache.log4j.lf5.util.DateFormatManager;
import org.apache.log4j.lf5.util.LogFileParser;
import org.apache.log4j.lf5.viewer.categoryexplorer.CategoryExplorerTree;
import org.apache.log4j.lf5.viewer.categoryexplorer.CategoryPath;
import org.apache.log4j.lf5.viewer.configure.ConfigurationManager;
import org.apache.log4j.lf5.viewer.configure.MRUFileManager;

/**
 * LogBrokerMonitor
 *.

Lines 16-24 Link Here

(-)src/main/java/org/apache/log4j/lf5/viewer/LogFactor5Dialog.java (-2 / +13 lines)
16	*/	16	*/
17	package org.apache.log4j.lf5.viewer;	17	package org.apache.log4j.lf5.viewer;
18		18
19	import javax.swing.*;	19	import java.awt.Component;
20	import java.awt.*;	20	import java.awt.Container;
		21	import java.awt.Dimension;
		22	import java.awt.Font;
		23	import java.awt.GridBagConstraints;
		24	import java.awt.GridBagLayout;
		25	import java.awt.Insets;
		26	import java.awt.Label;
		27	import java.awt.Toolkit;
		28	import java.awt.Window;
21		29
		30	import javax.swing.JDialog;
		31	import javax.swing.JFrame;
		32
22	/**	33	/**
23	* LogFactor5Dialog	34	* LogFactor5Dialog
24	*	35	*

Lines 16-26 Link Here

(-)src/main/java/org/apache/log4j/lf5/viewer/LogFactor5ErrorDialog.java (-2 / +7 lines)
16	*/	16	*/
17	package org.apache.log4j.lf5.viewer;	17	package org.apache.log4j.lf5.viewer;
18		18
19	import javax.swing.*;	19	import java.awt.BorderLayout;
20	import java.awt.*;	20	import java.awt.FlowLayout;
		21	import java.awt.GridBagLayout;
21	import java.awt.event.ActionEvent;	22	import java.awt.event.ActionEvent;
22	import java.awt.event.ActionListener;	23	import java.awt.event.ActionListener;
23		24
		25	import javax.swing.JButton;
		26	import javax.swing.JFrame;
		27	import javax.swing.JPanel;
		28
24	/**	29	/**
25	* LogFactor5ErrorDialog	30	* LogFactor5ErrorDialog
26	*	31	*




 */
package org.apache.log4j.lf5.viewer;

import java.awt.BorderLayout;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;

import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;

/**
 * LogFactor5InputDialog
 *

Lines 16-24 Link Here

(-)src/main/java/org/apache/log4j/lf5/viewer/LogFactor5LoadingDialog.java (-2 / +6 lines)
16	*/	16	*/
17	package org.apache.log4j.lf5.viewer;	17	package org.apache.log4j.lf5.viewer;
18		18
19	import javax.swing.*;	19	import java.awt.BorderLayout;
20	import java.awt.*;	20	import java.awt.FlowLayout;
		21	import java.awt.GridBagLayout;
21		22
		23	import javax.swing.JFrame;
		24	import javax.swing.JPanel;
		25
22	/**	26	/**
23	* LogFactor5LoadingDialog	27	* LogFactor5LoadingDialog
24	*	28	*

Lines 16-34 Link Here

(-)src/main/java/org/apache/log4j/lf5/viewer/LogTable.java (-7 / +12 lines)
16	*/	16	*/
17	package org.apache.log4j.lf5.viewer;	17	package org.apache.log4j.lf5.viewer;
18		18
19	import org.apache.log4j.lf5.util.DateFormatManager;	19	import java.awt.Font;
		20	import java.awt.FontMetrics;
		21	import java.awt.Graphics;
		22	import java.util.Enumeration;
		23	import java.util.Iterator;
		24	import java.util.List;
		25	import java.util.Vector;
20		26
21	import javax.swing.*;	27	import javax.swing.JTable;
		28	import javax.swing.JTextArea;
		29	import javax.swing.ListSelectionModel;
22	import javax.swing.event.ListSelectionEvent;	30	import javax.swing.event.ListSelectionEvent;
23	import javax.swing.event.ListSelectionListener;	31	import javax.swing.event.ListSelectionListener;
24	import javax.swing.table.TableColumn;	32	import javax.swing.table.TableColumn;
25	import javax.swing.table.TableColumnModel;	33	import javax.swing.table.TableColumnModel;
26	import java.awt.*;
27	import java.util.Enumeration;
28	import java.util.Iterator;
29	import java.util.List;
30	import java.util.Vector;
31		34
		35	import org.apache.log4j.lf5.util.DateFormatManager;
		36
32	/**	37	/**
33	* LogTable.	38	* LogTable.
34	*	39	*




 */
package org.apache.log4j.lf5.viewer;

import java.awt.Color;
import java.awt.Component;

import javax.swing.JTable;
import javax.swing.table.DefaultTableCellRenderer;

import org.apache.log4j.lf5.LogLevel;
import org.apache.log4j.lf5.LogRecord;

import javax.swing.*;
import javax.swing.table.DefaultTableCellRenderer;
import java.awt.*;

/**
 * LogTableRowRenderer
 *

Lines 16-22 Link Here

(-)src/main/java/org/apache/log4j/lf5/viewer/TrackingAdjustmentListener.java (-1 / +1 lines)
16	*/	16	*/
17	package org.apache.log4j.lf5.viewer;	17	package org.apache.log4j.lf5.viewer;
18		18
19	import java.awt.*;	19	import java.awt.Adjustable;
20	import java.awt.event.AdjustmentEvent;	20	import java.awt.event.AdjustmentEvent;
21	import java.awt.event.AdjustmentListener;	21	import java.awt.event.AdjustmentListener;
22		22




 */
package org.apache.log4j.lf5.viewer.categoryexplorer;

import java.awt.Component;
import java.awt.event.MouseEvent;
import java.util.EventObject;

import javax.swing.JTable;
import javax.swing.JTree;
import javax.swing.event.CellEditorListener;
import javax.swing.event.ChangeEvent;
import javax.swing.event.EventListenerList;
import javax.swing.table.TableCellEditor;
import javax.swing.tree.TreeCellEditor;
import java.awt.*;
import java.awt.event.MouseEvent;
import java.util.EventObject;

/**
 * CategoryAbstractCellEditor.  Base class to handle the some common

Lines 16-26 Link Here

(-)src/main/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryExplorerLogRecordFilter.java (-2 / +2 lines)
16	*/	16	*/
17	package org.apache.log4j.lf5.viewer.categoryexplorer;	17	package org.apache.log4j.lf5.viewer.categoryexplorer;
18		18
		19	import java.util.Enumeration;
		20
19	import org.apache.log4j.lf5.LogRecord;	21	import org.apache.log4j.lf5.LogRecord;
20	import org.apache.log4j.lf5.LogRecordFilter;	22	import org.apache.log4j.lf5.LogRecordFilter;
21		23
22	import java.util.Enumeration;
23
24	/**	24	/**
25	* An implementation of LogRecordFilter based on a CategoryExplorerModel	25	* An implementation of LogRecordFilter based on a CategoryExplorerModel
26	*	26	*




 */
package org.apache.log4j.lf5.viewer.categoryexplorer;

import java.awt.AWTEventMulticaster;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Enumeration;

import javax.swing.SwingUtilities;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Enumeration;

import org.apache.log4j.lf5.LogRecord;

/**
 * CategoryExplorerModel
 *

Lines 16-25 Link Here

(-)src/main/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryExplorerTree.java (-2 / +3 lines)
16	*/	16	*/
17	package org.apache.log4j.lf5.viewer.categoryexplorer;	17	package org.apache.log4j.lf5.viewer.categoryexplorer;
18		18
19	import javax.swing.*;	19	import java.awt.event.MouseEvent;
		20
		21	import javax.swing.JTree;
20	import javax.swing.event.TreeModelEvent;	22	import javax.swing.event.TreeModelEvent;
21	import javax.swing.tree.TreePath;	23	import javax.swing.tree.TreePath;
22	import java.awt.event.MouseEvent;
23		24
24	/**	25	/**
25	* CategoryExplorerTree	26	* CategoryExplorerTree




 */
package org.apache.log4j.lf5.viewer.categoryexplorer;

import java.awt.Dimension;
import java.awt.Rectangle;
import javax.swing.tree.TreePath;
import java.awt.*;
import java.awt.event.MouseEvent;
import java.util.EventObject;

import javax.swing.Icon;
import javax.swing.JTree;
import javax.swing.tree.DefaultTreeCellEditor;
import javax.swing.tree.TreePath;

/**
 * CategoryImmediateEditor
 *

Lines 16-24 Link Here

(-)src/main/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryNode.java (-1 / +2 lines)
16	*/	16	*/
17	package org.apache.log4j.lf5.viewer.categoryexplorer;	17	package org.apache.log4j.lf5.viewer.categoryexplorer;
18		18
		19	import java.util.Enumeration;
		20
19	import javax.swing.tree.DefaultMutableTreeNode;	21	import javax.swing.tree.DefaultMutableTreeNode;
20	import javax.swing.tree.TreeNode;	22	import javax.swing.tree.TreeNode;
21	import java.util.Enumeration;
22		23
23	/**	24	/**
24	* CategoryNode	25	* CategoryNode




 */
package org.apache.log4j.lf5.viewer.categoryexplorer;

import java.awt.Component;
import javax.swing.tree.TreePath;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;

import java.util.ArrayList;
import java.util.Enumeration;

import javax.swing.JCheckBox;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPopupMenu;
import javax.swing.JTree;
import javax.swing.tree.TreePath;

/**
 * CategoryNodeEditor
 *




 */
package org.apache.log4j.lf5.viewer.categoryexplorer;

import java.awt.Component;
import java.awt.*;

import javax.swing.JCheckBox;
import javax.swing.JTree;

/**
 * CategoryNodeEditorRenderer
 *




 */
package org.apache.log4j.lf5.viewer.categoryexplorer;

import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.net.URL;

import javax.swing.ImageIcon;
import javax.swing.JCheckBox;
import javax.swing.JPanel;
import javax.swing.JTree;
import javax.swing.UIManager;
import javax.swing.tree.DefaultTreeCellRenderer;

/**
 * CategoryNodeRenderer
 *




 */
package org.apache.log4j.lf5.viewer.configure;

import java.awt.Color;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

import javax.swing.JCheckBoxMenuItem;
import javax.swing.tree.TreePath;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;

import org.apache.log4j.lf5.LogLevel;
import org.apache.log4j.lf5.LogLevelFormatException;
import org.apache.log4j.lf5.viewer.LogBrokerMonitor;
import org.apache.log4j.lf5.viewer.LogTable;
import org.apache.log4j.lf5.viewer.LogTableColumn;
import org.apache.log4j.lf5.viewer.LogTableColumnFormatException;
import org.apache.log4j.lf5.viewer.categoryexplorer.CategoryExplorerModel;
import org.apache.log4j.lf5.viewer.categoryexplorer.CategoryExplorerTree;
import org.apache.log4j.lf5.viewer.categoryexplorer.CategoryNode;
import org.apache.log4j.lf5.viewer.categoryexplorer.CategoryPath;
import org.apache.log4j.lf5.viewer.LogTableColumn;
import org.apache.log4j.lf5.viewer.LogTableColumnFormatException;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;

import javax.swing.*;
import javax.swing.tree.TreePath;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import java.awt.*;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.*;
import java.util.List;

/**
 * <p>ConfigurationManager handles the storage and retrival of the state of
 * the CategoryExplorer

Lines 16-22 Link Here

(-)src/main/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java (-1 / +9 lines)
16	*/	16	*/
17	package org.apache.log4j.lf5.viewer.configure;	17	package org.apache.log4j.lf5.viewer.configure;
18		18
19	import java.io.*;	19	import java.io.BufferedInputStream;
		20	import java.io.File;
		21	import java.io.FileInputStream;
		22	import java.io.FileNotFoundException;
		23	import java.io.FileOutputStream;
		24	import java.io.IOException;
		25	import java.io.InputStream;
		26	import java.io.ObjectInputStream;
		27	import java.io.ObjectOutputStream;
20	import java.net.URL;	28	import java.net.URL;
21	import java.util.Iterator;	29	import java.util.Iterator;
22	import java.util.LinkedList;	30	import java.util.LinkedList;





package org.apache.log4j.net;

import java.util.Date;
import java.util.Properties;

import javax.mail.Authenticator;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Multipart;
import javax.mail.PasswordAuthentication;
import javax.mail.Session;
import javax.mail.Transport;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;

import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.Layout;
import org.apache.log4j.Level;
import org.apache.log4j.Layout;
import org.apache.log4j.xml.UnrecognizedElementHandler;
import org.apache.log4j.helpers.CyclicBuffer;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.spi.ErrorCode;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.OptionHandler;
import org.apache.log4j.spi.TriggeringEventEvaluator;
import org.apache.log4j.xml.UnrecognizedElementHandler;
import org.w3c.dom.Element;

import java.util.Properties;
import java.util.Date;

import javax.mail.Session;
import javax.mail.Authenticator;
import javax.mail.PasswordAuthentication;
import javax.mail.Transport;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import javax.mail.Multipart;
import javax.mail.internet.MimeMultipart;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.AddressException;

/**
   Send an e-mail when a specific logging event occurs, typically on
   errors or fatal errors.





package org.apache.log4j.net;

import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.net.Socket;

import org.apache.log4j.Logger;
import org.apache.log4j.spi.LoggerRepository;
import org.apache.log4j.spi.LoggingEvent;

import org.apache.log4j.*;
import org.apache.log4j.spi.*;

// Contributors:  Moses Hohman <mmhohman@rainbow.uchicago.edu>

/**

Lines 17-30 Link Here

(-)src/main/java/org/apache/log4j/net/SocketServer.java (-5 / +10 lines)
17		17
18	package org.apache.log4j.net;	18	package org.apache.log4j.net;
19		19
		20	import java.io.File;
		21	import java.net.InetAddress;
		22	import java.net.ServerSocket;
20	import java.net.Socket;	23	import java.net.Socket;
21	import java.net.ServerSocket;
22	import java.net.InetAddress;
23	import java.io.File;
24	import java.util.Hashtable;	24	import java.util.Hashtable;
25		25
26	import org.apache.log4j.*;	26	import org.apache.log4j.Hierarchy;
27	import org.apache.log4j.spi.*;	27	import org.apache.log4j.Level;
		28	import org.apache.log4j.LogManager;
		29	import org.apache.log4j.Logger;
		30	import org.apache.log4j.PropertyConfigurator;
		31	import org.apache.log4j.spi.LoggerRepository;
		32	import org.apache.log4j.spi.RootLogger;
28		33
29		34
30	/**	35	/**





package org.apache.log4j.net;

import java.net.InetAddress;
import java.net.UnknownHostException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;

import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.Layout;
import org.apache.log4j.helpers.SyslogQuietWriter;
import org.apache.log4j.helpers.SyslogWriter;
import org.apache.log4j.spi.LoggingEvent;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.net.InetAddress;
import java.net.UnknownHostException;

// Contributors: Yves Bossel <ybossel@opengets.cl>
//               Christopher Taylor <cstaylor@pacbell.net>






package org.apache.log4j.net;

import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.spi.LoggingEvent;

import java.io.IOException;
import java.io.PrintWriter;
import java.net.ServerSocket;

import java.util.Iterator;
import java.util.Vector;

import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.spi.LoggingEvent;

/**
  <p>The TelnetAppender is a log4j appender that specializes in
  writing to a read-only socket.  The output is provided in a

Lines 17-27 Link Here

(-)src/main/java/org/apache/log4j/or/RendererMap.java (-3 / +4 lines)
17		17
18	package org.apache.log4j.or;	18	package org.apache.log4j.or;
19		19
20	import org.apache.log4j.spi.RendererSupport;	20	import java.util.Hashtable;
		21
		22	import org.apache.log4j.helpers.Loader;
21	import org.apache.log4j.helpers.LogLog;	23	import org.apache.log4j.helpers.LogLog;
22	import org.apache.log4j.helpers.Loader;
23	import org.apache.log4j.helpers.OptionConverter;	24	import org.apache.log4j.helpers.OptionConverter;
24	import java.util.Hashtable;	25	import org.apache.log4j.spi.RendererSupport;
25		26
26	/**	27	/**
27	Map class objects to an {@link ObjectRenderer}.	28	Map class objects to an {@link ObjectRenderer}.

Lines 18-24 Link Here

(-)src/main/java/org/apache/log4j/or/sax/AttributesRenderer.java (-1 lines)
18	package org.apache.log4j.or.sax;	18	package org.apache.log4j.or.sax;
19		19
20	import org.apache.log4j.or.ObjectRenderer;	20	import org.apache.log4j.or.ObjectRenderer;
21
22	import org.xml.sax.Attributes;	21	import org.xml.sax.Attributes;
23		22
24	/**	23	/**

Lines 17-25 Link Here

(-)src/main/java/org/apache/log4j/spi/AppenderAttachable.java (-1 / +2 lines)
17		17
18	package org.apache.log4j.spi;	18	package org.apache.log4j.spi;
19		19
20	import org.apache.log4j.Appender;
21	import java.util.Enumeration;	20	import java.util.Enumeration;
22		21
		22	import org.apache.log4j.Appender;
		23
23	/**	24	/**
24	Interface for attaching appenders to objects.	25	Interface for attaching appenders to objects.
25		26

Lines 17-23 Link Here

(-)src/main/java/org/apache/log4j/spi/Configurator.java (-1 lines)
17		17
18	package org.apache.log4j.spi;	18	package org.apache.log4j.spi;
19		19
20	import org.apache.log4j.spi.LoggerRepository;
21	import java.net.URL;	20	import java.net.URL;
22		21
23	/**	22	/**

Lines 17-23 Link Here

(-)src/main/java/org/apache/log4j/spi/Filter.java (-1 lines)
17		17
18	package org.apache.log4j.spi;	18	package org.apache.log4j.spi;
19		19
20	import org.apache.log4j.spi.LoggingEvent;
21		20
22		21
23	/**	22	/**

Lines 17-23 Link Here

(-)src/main/java/org/apache/log4j/spi/HierarchyEventListener.java (-1 / +2 lines)
17		17
18	package org.apache.log4j.spi;	18	package org.apache.log4j.spi;
19		19
20	import org.apache.log4j.*;	20	import org.apache.log4j.Appender;
		21	import org.apache.log4j.Category;
21		22
22	/**	23	/**
23	Listen to events occuring within a {@link	24	Listen to events occuring within a {@link





package org.apache.log4j.spi;

import java.io.PrintWriter;
import java.io.StringWriter;

import org.apache.log4j.Layout;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.Layout;

/**
   The internal representation of caller location information.





package org.apache.log4j.spi;

import org.apache.log4j.*;
import java.util.Enumeration;

import org.apache.log4j.Appender;
import org.apache.log4j.Category;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;

/**
   A <code>LoggerRepository</code> is used to create and retrieve
   <code>Loggers</code>. The relation between loggers in a repository





package org.apache.log4j.spi;

import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.helpers.Loader;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Map;
import java.util.Set;
import java.util.Collections;
import java.util.Map;
import java.util.HashMap;

import org.apache.log4j.Category;
import org.apache.log4j.Level;
import org.apache.log4j.MDC;
import org.apache.log4j.NDC;
import org.apache.log4j.Priority;
import org.apache.log4j.helpers.Loader;
import org.apache.log4j.helpers.LogLog;

// Contributors:   Nelson Minar <nelson@monkey.org>
//                 Wolf Siberski
//                 Anders Kristensen <akristensen@dynamicsoft.com>




 */
package org.apache.log4j.spi;

import java.util.Enumeration;
import java.util.ResourceBundle;
import java.util.Vector;

import org.apache.log4j.Appender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.Priority;

import java.util.Enumeration;
import java.util.ResourceBundle;
import java.util.Vector;

/**
 * No-operation implementation of Logger used by NOPLoggerRepository.
 * @since 1.2.15




 */
package org.apache.log4j.spi;

import java.util.Enumeration;
import java.util.Vector;

import org.apache.log4j.Appender;
import org.apache.log4j.Category;
import org.apache.log4j.Level;
import org.apache.log4j.Category;
import org.apache.log4j.Logger;
import org.apache.log4j.Appender;

import java.util.Enumeration;
import java.util.Vector;

/**
 *  No-operation implementation of LoggerRepository which is used when
 *  LogManager.repositorySelector is erroneously nulled during class reloading.

Lines 17-24 Link Here

(-)src/main/java/org/apache/log4j/spi/RootCategory.java (-2 / +3 lines)
17		17
18	package org.apache.log4j.spi;	18	package org.apache.log4j.spi;
19		19
20	import org.apache.log4j.*;	20	import org.apache.log4j.Level;
21	import org.apache.log4j.helpers.LogLog;	21	import org.apache.log4j.Logger;
		22	import org.apache.log4j.helpers.LogLog;
22		23
23	// Contibutors: Mathias Bogaert	24	// Contibutors: Mathias Bogaert
24		25

Lines 17-23 Link Here

(-)src/main/java/org/apache/log4j/spi/RootLogger.java (-1 / +2 lines)
17		17
18	package org.apache.log4j.spi;	18	package org.apache.log4j.spi;
19		19
20	import org.apache.log4j.*;	20	import org.apache.log4j.Level;
		21	import org.apache.log4j.Logger;
21	import org.apache.log4j.helpers.LogLog;	22	import org.apache.log4j.helpers.LogLog;
22		23
23		24




 
package org.apache.log4j.varia;

import  org.apache.log4j.spi.ErrorHandler;
import  org.apache.log4j.spi.LoggingEvent;
import  org.apache.log4j.Appender;
import  org.apache.log4j.Logger;
import  org.apache.log4j.helpers.LogLog;
import java.util.Vector;

import org.apache.log4j.Appender;
import org.apache.log4j.Logger;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.spi.ErrorHandler;
import org.apache.log4j.spi.LoggingEvent;
 
/**
  *

Lines 18-26 Link Here

(-)src/main/java/org/apache/log4j/varia/LevelMatchFilter.java (-1 / +1 lines)
18	package org.apache.log4j.varia;	18	package org.apache.log4j.varia;
19		19
20	import org.apache.log4j.Level;	20	import org.apache.log4j.Level;
		21	import org.apache.log4j.helpers.OptionConverter;
21	import org.apache.log4j.spi.Filter;	22	import org.apache.log4j.spi.Filter;
22	import org.apache.log4j.spi.LoggingEvent;	23	import org.apache.log4j.spi.LoggingEvent;
23	import org.apache.log4j.helpers.OptionConverter;
24		24
25	/**	25	/**
26	This is a very simple filter based on level matching.	26	This is a very simple filter based on level matching.

Lines 17-26 Link Here

(-)src/main/java/org/apache/log4j/varia/ReloadingPropertyConfigurator.java (-2 / +3 lines)
17		17
18	package org.apache.log4j.varia;	18	package org.apache.log4j.varia;
19		19
		20	import java.net.URL;
		21
20	import org.apache.log4j.PropertyConfigurator;	22	import org.apache.log4j.PropertyConfigurator;
21	import org.apache.log4j.spi.Configurator;	23	import org.apache.log4j.spi.Configurator;
22	import java.net.URL;	24	import org.apache.log4j.spi.LoggerRepository;
23	import org.apache.log4j.spi.LoggerRepository;
24		25
25	public class ReloadingPropertyConfigurator implements Configurator {	26	public class ReloadingPropertyConfigurator implements Configurator {
26		27





package org.apache.log4j.varia;

import org.apache.log4j.Logger;
import org.apache.log4j.BasicConfigurator;

import java.io.IOException;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.net.Socket;

import org.apache.log4j.BasicConfigurator;
import org.apache.log4j.Logger;

/**
   A simple application to send roll over messages to a potentially
   remote {@link ExternallyRolledFileAppender}. 

Lines 17-25 Link Here

(-)src/main/java/org/apache/log4j/varia/StringMatchFilter.java (-1 / +1 lines)
17		17
18	package org.apache.log4j.varia;	18	package org.apache.log4j.varia;
19		19
		20	import org.apache.log4j.helpers.OptionConverter;
20	import org.apache.log4j.spi.Filter;	21	import org.apache.log4j.spi.Filter;
21	import org.apache.log4j.spi.LoggingEvent;	22	import org.apache.log4j.spi.LoggingEvent;
22	import org.apache.log4j.helpers.OptionConverter;
23		23
24	/**	24	/**
25	* This is a very simple filter based on string matching.	25	* This is a very simple filter based on string matching.





package org.apache.log4j.xml;

import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
import java.lang.reflect.Method;
import java.net.URL;
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.xml.sax.InputSource;
import org.xml.sax.SAXException;

import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.FactoryConfigurationError;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
import java.lang.reflect.Method;
import java.net.URL;
import java.util.Hashtable;
import java.util.Properties;

// Contributors:   Mark Womack
//                 Arun Katkere 






package org.apache.log4j.xml;

import java.io.ByteArrayInputStream;
import java.io.InputStream;

import org.apache.log4j.helpers.LogLog;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;

import java.io.InputStream;
import java.io.ByteArrayInputStream;

/**
 * An {@link EntityResolver} specifically designed to return
 * <code>log4j.dtd</code> which is embedded within the log4j jar

Lines 17-25 Link Here

(-)src/main/java/org/apache/log4j/xml/SAXErrorHandler.java (-1 / +1 lines)
17		17
18	package org.apache.log4j.xml;	18	package org.apache.log4j.xml;
19		19
		20	import org.apache.log4j.helpers.LogLog;
20	import org.xml.sax.ErrorHandler;	21	import org.xml.sax.ErrorHandler;
21	import org.xml.sax.SAXParseException;	22	import org.xml.sax.SAXParseException;
22	import org.apache.log4j.helpers.LogLog;
23		23
24	public class SAXErrorHandler implements ErrorHandler {	24	public class SAXErrorHandler implements ErrorHandler {
25		25

Lines 16-24 Link Here

(-)src/main/java/org/apache/log4j/xml/UnrecognizedElementHandler.java (-1 / +2 lines)
16	*/	16	*/
17	package org.apache.log4j.xml;	17	package org.apache.log4j.xml;
18		18
19	import org.w3c.dom.Element;
20	import java.util.Properties;	19	import java.util.Properties;
21		20
		21	import org.w3c.dom.Element;
		22
22	/**	23	/**
23	* When implemented by an object configured by DOMConfigurator,	24	* When implemented by an object configured by DOMConfigurator,
24	* the handle method will be called when an unrecognized child	25	* the handle method will be called when an unrecognized child





package org.apache.log4j.xml;

import java.util.Arrays;
import java.util.Set;

import org.apache.log4j.Layout;
import org.apache.log4j.helpers.Transform;
import org.apache.log4j.spi.LocationInfo;
import org.apache.log4j.spi.LoggingEvent;

import java.util.Set;
import java.util.Arrays;

/**
 * The output of the XMLLayout consists of a series of log4j:event
 * elements as defined in the <a





package org.apache.log4j;

import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.framework.Test;

import java.util.Vector;

import junit.framework.TestCase;

import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.varia.NullAppender;

/**
   A superficial but general test of log4j.

Lines 17-27 Link Here

(-)tests/src/java/org/apache/log4j/CategoryTest.java (-2 / +2 lines)
17		17
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
		20	import java.lang.reflect.Method;
		21
20	import junit.framework.TestCase;	22	import junit.framework.TestCase;
21		23
22	import java.lang.reflect.Method;
23		24
24
25	/**	25	/**
26	* Tests of Category.	26	* Tests of Category.
27	*	27	*

Lines 18-23 Link Here

(-)tests/src/java/org/apache/log4j/CoreTestSuite.java (+1 lines)
18		18
19	import junit.framework.Test;	19	import junit.framework.Test;
20	import junit.framework.TestSuite;	20	import junit.framework.TestSuite;
		21
21	import org.apache.log4j.spi.LoggingEventTest;	22	import org.apache.log4j.spi.LoggingEventTest;
22		23
23		24





package org.apache.log4j;

import junit.framework.TestCase;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.FileWriter;
import java.io.FileReader;
import java.io.FileInputStream;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;

import junit.framework.TestCase;

import org.apache.log4j.util.Compare;

/**





package org.apache.log4j;

import junit.framework.TestCase;

import java.io.File;

import java.lang.reflect.Method;

import junit.framework.TestCase;


/**
 *
 * FileAppender tests.





package org.apache.log4j;

import java.io.Reader;
import java.io.StringReader;
import java.util.Hashtable;

import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;

import org.apache.log4j.spi.LoggingEvent;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;

import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import java.io.Reader;
import java.io.StringReader;
import java.util.Hashtable;


/**
 * Test for HTMLLayout.
 *





package org.apache.log4j;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.framework.Test;

import org.apache.log4j.util.Compare;
import org.apache.log4j.util.*;
import org.apache.log4j.xml.XLevel;

/**

Lines 17-25 Link Here

(-)tests/src/java/org/apache/log4j/Last.java (-1 / +1 lines)
17		17
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
		20	import junit.framework.Test;
20	import junit.framework.TestCase;	21	import junit.framework.TestCase;
21	import junit.framework.TestSuite;	22	import junit.framework.TestSuite;
22	import junit.framework.Test;
23		23
24	public class Last extends TestCase {	24	public class Last extends TestCase {
25		25

Lines 17-26 Link Here

(-)tests/src/java/org/apache/log4j/LevelTest.java (-1 / +2 lines)
17		17
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
		20	import java.util.Locale;
		21
20	import junit.framework.TestCase;	22	import junit.framework.TestCase;
21		23
22	import org.apache.log4j.util.SerializationTestHelper;	24	import org.apache.log4j.util.SerializationTestHelper;
23	import java.util.Locale;
24		25
25		26
26	/**	27	/**





package org.apache.log4j;

import junit.framework.TestCase;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.RootLogger;
import org.apache.log4j.spi.LoggerRepository;
import org.apache.log4j.spi.HierarchyEventListener;

import java.util.Enumeration;
import java.util.Locale;
import java.util.ResourceBundle;
import java.util.Vector;

import junit.framework.TestCase;

import org.apache.log4j.spi.HierarchyEventListener;
import org.apache.log4j.spi.LoggerRepository;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.RootLogger;

/**
   Used for internal unit testing the Logger class.






package org.apache.log4j;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.framework.Test;

import org.apache.log4j.*;
import org.apache.log4j.helpers.AbsoluteTimeDateFormat;
import org.apache.log4j.util.AbsoluteDateAndTimeFilter;
import org.apache.log4j.util.Compare;
import org.apache.log4j.util.ControlFilter;
import org.apache.log4j.util.Filter;
import org.apache.log4j.util.JunitTestRunnerFilter;
import org.apache.log4j.util.LineNumberFilter;
import org.apache.log4j.util.SunReflectFilter;
import org.apache.log4j.util.Transformer;

/**
   A superficial but general test of log4j.





package org.apache.log4j;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.framework.Test;

import org.apache.log4j.util.AbsoluteDateAndTimeFilter;
import org.apache.log4j.util.AbsoluteTimeFilter;
import org.apache.log4j.MDC;
import org.apache.log4j.NDC;

import org.apache.log4j.util.LineNumberFilter;
import org.apache.log4j.util.Transformer;
import org.apache.log4j.util.Filter;
import org.apache.log4j.util.ControlFilter;
import org.apache.log4j.util.Compare;
import org.apache.log4j.util.ControlFilter;
import org.apache.log4j.util.Filter;
import org.apache.log4j.util.ISO8601Filter;
import org.apache.log4j.util.JunitTestRunnerFilter;
import org.apache.log4j.util.LineNumberFilter;
import org.apache.log4j.util.RelativeTimeFilter;
import org.apache.log4j.util.AbsoluteDateAndTimeFilter;
import org.apache.log4j.util.SunReflectFilter;
import org.apache.log4j.util.Transformer;

public class PatternLayoutTestCase extends TestCase {


Lines 17-27 Link Here

(-)tests/src/java/org/apache/log4j/PriorityTest.java (-2 / +2 lines)
17		17
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
		20	import java.util.Locale;
		21
20	import junit.framework.TestCase;	22	import junit.framework.TestCase;
21		23
22	import java.util.Locale;
23		24
24
25	/**	25	/**
26	* Tests of Priority.	26	* Tests of Priority.
27	*	27	*




 */
package org.apache.log4j;

import junit.framework.TestCase;

import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.net.URL;
import java.util.Properties;

import junit.framework.TestCase;

/**
 * Test property configurator.
 *





package org.apache.log4j;

import junit.framework.TestCase;

import java.io.File;
import java.io.FileWriter;
import java.io.IOException;

import junit.framework.TestCase;

/**
 *  Test of RollingFileAppender.
 *

Lines 18-25 Link Here

(-)tests/src/java/org/apache/log4j/StressCategory.java (-2 lines)
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
20		20
21	import org.apache.log4j.Level;
22	import org.apache.log4j.Logger;
23	import java.util.Random;	21	import java.util.Random;
24		22
25	/*	23	/*

Lines 18-28 Link Here

(-)tests/src/java/org/apache/log4j/VectorAppender.java (-4 / +1 lines)
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
20	import java.util.Vector;	20	import java.util.Vector;
21	import org.apache.log4j.Layout;	21
22	import org.apache.log4j.spi.LoggingEvent;	22	import org.apache.log4j.spi.LoggingEvent;
23	import org.apache.log4j.helpers.OptionConverter;
24	import org.apache.log4j.helpers.Transform;
25	import org.apache.log4j.helpers.LogLog;
26		23
27	/**	24	/**
28	An appender that appends logging events to a vector.	25	An appender that appends logging events to a vector.

Lines 17-28 Link Here

(-)tests/src/java/org/apache/log4j/VectorErrorHandler.java (-2 / +2 lines)
17		17
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
		20	import java.util.Vector;
		21
20	import org.apache.log4j.spi.ErrorHandler;	22	import org.apache.log4j.spi.ErrorHandler;
21	import org.apache.log4j.spi.LoggingEvent;	23	import org.apache.log4j.spi.LoggingEvent;
22		24
23	import java.util.Vector;
24		25
25
26	/**	26	/**
27	* Utility class used in testing to capture errors dispatched	27	* Utility class used in testing to capture errors dispatched
28	* by appenders.	28	* by appenders.

Lines 18-28 Link Here

(-)tests/src/java/org/apache/log4j/customLogger/XLogger.java (-4 / +4 lines)
18	package org.apache.log4j.customLogger;	18	package org.apache.log4j.customLogger;
19		19
20		20
21	import org.apache.log4j.*;	21	import org.apache.log4j.Level;
		22	import org.apache.log4j.LogManager;
		23	import org.apache.log4j.Logger;
		24	import org.apache.log4j.spi.LoggerFactory;
22	import org.apache.log4j.spi.OptionHandler;	25	import org.apache.log4j.spi.OptionHandler;
23	import org.apache.log4j.spi.LoggingEvent;
24	import org.apache.log4j.spi.LoggerFactory;
25	import org.apache.log4j.helpers.LogLog;
26	import org.apache.log4j.xml.XLevel;	26	import org.apache.log4j.xml.XLevel;
27		27
28	/**	28	/**





package org.apache.log4j.customLogger;

import junit.framework.Test;
import org.apache.log4j.Logger;
import org.apache.log4j.Level;

import org.apache.log4j.util.*;

import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.framework.Test;

import org.apache.log4j.Logger;
import org.apache.log4j.util.Compare;
import org.apache.log4j.util.Filter;
import org.apache.log4j.util.JunitTestRunnerFilter;
import org.apache.log4j.util.LineNumberFilter;
import org.apache.log4j.util.SunReflectFilter;
import org.apache.log4j.util.Transformer;
import org.apache.log4j.xml.DOMConfigurator;

/**
   Tests handling of custom loggers.
   





package org.apache.log4j.defaultInit;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.framework.Test;

import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;

import org.apache.log4j.*;

public class TestCase1 extends TestCase {

  public TestCase1(String name) {





package org.apache.log4j.defaultInit;

import java.util.Enumeration;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.framework.Test;

import org.apache.log4j.Appender;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;

import org.apache.log4j.*;

public class TestCase2 extends TestCase {

  public TestCase2(String name) {





package org.apache.log4j.defaultInit;

import java.util.Enumeration;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.framework.Test;

import org.apache.log4j.Appender;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;

import org.apache.log4j.*;

public class TestCase3 extends TestCase {

  public TestCase3(String name) {





package org.apache.log4j.defaultInit;

import java.util.Enumeration;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.framework.Test;

import org.apache.log4j.Appender;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;

import org.apache.log4j.*;

public class TestCase4 extends TestCase {

  public TestCase4(String name) {





package org.apache.log4j.helpers;

import junit.framework.Test;
import org.apache.log4j.Logger;
import org.apache.log4j.Level;

import org.apache.log4j.helpers.BoundedFIFO;

import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.framework.TestFailure;
import junit.framework.Test;

import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.spi.LoggingEvent;




/**
   Unit test the {@link BoundedFIFO}.
   @author Ceki G&uuml;lc&uuml;





package org.apache.log4j.helpers;

import junit.framework.Test;
import org.apache.log4j.Logger;
import org.apache.log4j.Level;
import org.apache.log4j.helpers.CyclicBuffer;

import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.framework.TestFailure;
import junit.framework.Test;

import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.spi.LoggingEvent;

/**
   Unit test the {@link CyclicBuffer}.






package org.apache.log4j.helpers;

import org.apache.log4j.Layout;
import org.apache.log4j.LayoutTest;
import org.apache.log4j.spi.LoggingEvent;

import java.text.DateFormat;
import java.text.SimpleDateFormat;

import java.util.TimeZone;
import java.util.Date;
import java.util.Calendar;
import java.util.TimeZone;

import org.apache.log4j.Layout;
import org.apache.log4j.LayoutTest;
import org.apache.log4j.spi.LoggingEvent;


/**
 * Tests for DateLayout.
 *





package org.apache.log4j.helpers;

import java.util.Properties;
import org.apache.log4j.Level;
import org.apache.log4j.xml.XLevel;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.framework.Test;
import java.util.Properties;

import org.apache.log4j.Level;
import org.apache.log4j.xml.XLevel;

/**
   Test variable substitution code.   
   @author Ceki G&uuml;lc&uuml;





package org.apache.log4j.helpers;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.framework.Test;

import org.apache.log4j.Logger;
import org.apache.log4j.Level;
import org.apache.log4j.Appender;
import org.apache.log4j.FileAppender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.apache.log4j.PatternLayout;
import org.apache.log4j.util.Compare;

/**

Lines 17-22 Link Here

(-)tests/src/java/org/apache/log4j/net/SMTPAppenderTest.java (+1 lines)
17	package org.apache.log4j.net;	17	package org.apache.log4j.net;
18		18
19	import junit.framework.TestCase;	19	import junit.framework.TestCase;
		20
20	import org.apache.log4j.LogManager;	21	import org.apache.log4j.LogManager;
21	import org.apache.log4j.Logger;	22	import org.apache.log4j.Logger;
22	import org.apache.log4j.spi.LoggingEvent;	23	import org.apache.log4j.spi.LoggingEvent;





package org.apache.log4j.net;

import java.net.Socket;
import java.net.ServerSocket;
import java.net.Socket;

import org.apache.log4j.Logger;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.net.SocketNode;
import org.apache.log4j.net.SocketServer;

/**
 * This SocketServer exits after certain number of connections from a





package org.apache.log4j.net;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.framework.Test;

import org.apache.log4j.AsyncAppender;
import org.apache.log4j.Level;
import org.apache.log4j.util.*;

import org.apache.log4j.xml.DOMConfigurator;
import org.apache.log4j.PropertyConfigurator;

import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.apache.log4j.NDC;
import org.apache.log4j.util.Compare;
import org.apache.log4j.util.ControlFilter;
import org.apache.log4j.util.Filter;
import org.apache.log4j.util.JunitTestRunnerFilter;
import org.apache.log4j.util.LineNumberFilter;
import org.apache.log4j.util.SunReflectFilter;
import org.apache.log4j.util.Transformer;
import org.apache.log4j.xml.XLevel;
import org.apache.log4j.Priority;
import java.io.IOException;
import java.util.Enumeration;

/**
   @author  Ceki G&uuml;lc&uuml;





package org.apache.log4j.net;

import java.net.DatagramPacket;
import java.net.DatagramSocket;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
import java.util.StringTokenizer;

import junit.framework.TestCase;

import org.apache.log4j.AsyncAppender;
import org.apache.log4j.HTMLLayout;
import org.apache.log4j.Layout;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
import org.apache.log4j.VectorErrorHandler;
import org.apache.log4j.HTMLLayout;

import java.util.StringTokenizer;
import java.net.DatagramSocket;
import java.net.DatagramPacket;
import java.text.SimpleDateFormat;
import java.util.Locale;
import java.util.Date;
import java.util.Calendar;


/**
 *    Tests for SyslogAppender
 *

Lines 21-31 Link Here

(-)tests/src/java/org/apache/log4j/net/TelnetAppenderTest.java (-2 / +2 lines)
21	import java.io.InputStream;	21	import java.io.InputStream;
22	import java.net.Socket;	22	import java.net.Socket;
23		23
		24	import junit.framework.TestCase;
		25
24	import org.apache.log4j.Logger;	26	import org.apache.log4j.Logger;
25	import org.apache.log4j.PatternLayout;	27	import org.apache.log4j.PatternLayout;
26		28
27	import junit.framework.TestCase;
28
29	public class TelnetAppenderTest extends TestCase {	29	public class TelnetAppenderTest extends TestCase {
30		30
31	int port = 54353;	31	int port = 54353;

Lines 17-26 Link Here

(-)tests/src/java/org/apache/log4j/nt/NTEventLogAppenderTest.java (-3 / +4 lines)
17		17
18	package org.apache.log4j.nt;	18	package org.apache.log4j.nt;
19	import junit.framework.TestCase;	19	import junit.framework.TestCase;
		20
		21	import org.apache.log4j.BasicConfigurator;
		22	import org.apache.log4j.Level;
		23	import org.apache.log4j.LogManager;
20	import org.apache.log4j.Logger;	24	import org.apache.log4j.Logger;
21	import org.apache.log4j.LogManager;
22	import org.apache.log4j.Level;
23	import org.apache.log4j.BasicConfigurator;
24		25
25		26
26	/**	27	/**





package org.apache.log4j.or;

import java.io.Serializable;
import org.apache.log4j.Category;
import org.apache.log4j.Priority;

import junit.framework.Test;
import org.apache.log4j.or.RendererMap;

import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.framework.TestFailure;
import junit.framework.Test;

import java.io.Serializable;


/**
   Unit test the {@link ObjectRenderer}.
   @author Ceki G&uuml;lc&uuml;





import junit.framework.TestCase;

import org.apache.log4j.Category;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.apache.log4j.NDC;
import org.apache.log4j.spi.LocationInfo;
import org.apache.log4j.util.SerializationTestHelper;
import org.apache.log4j.Priority;
import org.apache.log4j.util.SerializationTestHelper;


/**

Lines 16-26 Link Here

(-)tests/src/java/org/apache/log4j/spi/ThrowableInformationTest.java (-2 / +2 lines)
16	*/	16	*/
17	package org.apache.log4j.spi;	17	package org.apache.log4j.spi;
18		18
		19	import java.io.PrintWriter;
		20
19	import junit.framework.TestCase;	21	import junit.framework.TestCase;
20		22
21	import java.io.PrintWriter;
22		23
23
24	/**	24	/**
25	* Unit tests for ThrowableInformation.	25	* Unit tests for ThrowableInformation.
26	*/	26	*/

Lines 17-24 Link Here

(-)tests/src/java/org/apache/log4j/util/AbsoluteDateAndTimeFilter.java (-2 lines)
17		17
18	package org.apache.log4j.util;	18	package org.apache.log4j.util;
19		19
20	import java.io.*;
21
22	import org.apache.oro.text.perl.Perl5Util;	20	import org.apache.oro.text.perl.Perl5Util;
23		21
24	public class AbsoluteDateAndTimeFilter implements Filter {	22	public class AbsoluteDateAndTimeFilter implements Filter {

Lines 17-24 Link Here

(-)tests/src/java/org/apache/log4j/util/AbsoluteTimeFilter.java (-2 lines)
17		17
18	package org.apache.log4j.util;	18	package org.apache.log4j.util;
19		19
20	import java.io.*;
21
22	import org.apache.oro.text.perl.Perl5Util;	20	import org.apache.oro.text.perl.Perl5Util;
23		21
24	public class AbsoluteTimeFilter implements Filter {	22	public class AbsoluteTimeFilter implements Filter {





package org.apache.log4j.util;

import junit.framework.TestCase;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;

import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;

import junit.framework.TestCase;


/**
 * Utiities for serialization tests.
 *

Lines 18-24 Link Here

(-)tests/src/java/org/apache/log4j/util/Transformer.java (-1 lines)
18	package org.apache.log4j.util;	18	package org.apache.log4j.util;
19		19
20	import java.io.BufferedReader;	20	import java.io.BufferedReader;
21	import java.io.FileNotFoundException;
22	import java.io.FileOutputStream;	21	import java.io.FileOutputStream;
23	import java.io.FileReader;	22	import java.io.FileReader;
24	import java.io.IOException;	23	import java.io.IOException;




 */

package org.apache.log4j.varia;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.File;
import java.io.IOException;
import java.net.Socket;

import junit.framework.TestCase;

import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
import org.apache.log4j.RFATestCase;

import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.File;
import java.io.IOException;
import java.net.Socket;
import java.net.InetAddress;

/**
 *  Test of ExternallyRolledFileAppender.
 *




package org.apache.log4j.varia;

import junit.framework.TestCase;

import org.apache.log4j.Appender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.spi.ErrorHandler;
import org.apache.log4j.util.Compare;
import org.apache.log4j.util.ControlFilter;
import org.apache.log4j.util.Filter;
import org.apache.log4j.util.Transformer;
import org.apache.log4j.util.Compare;
import org.apache.log4j.util.JunitTestRunnerFilter;
import org.apache.log4j.util.LineNumberFilter;
import org.apache.log4j.util.Transformer;
import org.apache.log4j.xml.DOMConfigurator;

public class ErrorHandlerTestCase extends TestCase {





package org.apache.log4j.varia;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.framework.Test;

import org.apache.log4j.Logger;
import org.apache.log4j.Level;
import org.apache.log4j.Appender;
import org.apache.log4j.FileAppender;
import org.apache.log4j.Layout;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.SimpleLayout;
import org.apache.log4j.varia.LevelMatchFilter;
import org.apache.log4j.varia.DenyAllFilter;

import org.apache.log4j.util.Transformer;
import org.apache.log4j.util.Compare;
import org.apache.log4j.util.LineNumberFilter;
import org.apache.log4j.util.Transformer;

/**
   Test case for varia/LevelMatchFilter.java.

Lines 20-25 Link Here

(-)tests/src/java/org/apache/log4j/xml/CustomLevelTestCase.java (+1 lines)
20	import junit.framework.Test;	20	import junit.framework.Test;
21	import junit.framework.TestCase;	21	import junit.framework.TestCase;
22	import junit.framework.TestSuite;	22	import junit.framework.TestSuite;
		23
23	import org.apache.log4j.Logger;	24	import org.apache.log4j.Logger;
24	import org.apache.log4j.util.Compare;	25	import org.apache.log4j.util.Compare;
25		26

Lines 18-23 Link Here

(-)tests/src/java/org/apache/log4j/xml/DOMTestCase.java (+1 lines)
18	package org.apache.log4j.xml;	18	package org.apache.log4j.xml;
19		19
20	import junit.framework.TestCase;	20	import junit.framework.TestCase;
		21
21	import org.apache.log4j.Appender;	22	import org.apache.log4j.Appender;
22	import org.apache.log4j.FileAppender;	23	import org.apache.log4j.FileAppender;
23	import org.apache.log4j.Level;	24	import org.apache.log4j.Level;





package org.apache.log4j.xml;

import java.io.Reader;
import java.io.StringReader;
import java.util.Hashtable;

import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;

import org.apache.log4j.Layout;
import org.apache.log4j.LayoutTest;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.NDC;
import org.apache.log4j.MDC;
import org.apache.log4j.NDC;
import org.apache.log4j.spi.LoggingEvent;

import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;

import org.xml.sax.InputSource;

import java.io.Reader;
import java.io.StringReader;
import java.util.Hashtable;

import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;


/**
 * Test for XMLLayout.
 *

Return to bug 45481

Lines 31-49 Link Here

(-)src/main/java/org/apache/log4j/Category.java (-7 / +7 lines)
31		31
32	package org.apache.log4j;	32	package org.apache.log4j;
33		33
34	import org.apache.log4j.spi.AppenderAttachable;
35	import org.apache.log4j.spi.LoggingEvent;
36	import org.apache.log4j.spi.LoggerRepository;
37	import org.apache.log4j.spi.HierarchyEventListener;
38	import org.apache.log4j.helpers.NullEnumeration;
39	import org.apache.log4j.helpers.AppenderAttachableImpl;
40
41	import java.util.Enumeration;	34	import java.util.Enumeration;
42	import java.util.MissingResourceException;	35	import java.util.MissingResourceException;
43	import java.util.ResourceBundle;	36	import java.util.ResourceBundle;
44	import java.util.Vector;	37	import java.util.Vector;
45		38
		39	import org.apache.log4j.helpers.AppenderAttachableImpl;
		40	import org.apache.log4j.helpers.NullEnumeration;
		41	import org.apache.log4j.spi.AppenderAttachable;
		42	import org.apache.log4j.spi.HierarchyEventListener;
		43	import org.apache.log4j.spi.LoggerRepository;
		44	import org.apache.log4j.spi.LoggingEvent;
46		45
		46
47	/**	47	/**
48	* <font color="#AA2222"><b>This class has been deprecated and	48	* <font color="#AA2222"><b>This class has been deprecated and
49	* replaced by the {@link Logger} <em>subclass</em></b></font>. It	49	* replaced by the {@link Logger} <em>subclass</em></b></font>. It

Lines 19-32 Link Here

(-)src/main/java/org/apache/log4j/DailyRollingFileAppender.java (-3 / +3 lines)
19		19
20	package org.apache.log4j;	20	package org.apache.log4j;
21		21
		22	import java.io.File;
22	import java.io.IOException;	23	import java.io.IOException;
23	import java.io.File;
24	import java.text.SimpleDateFormat;	24	import java.text.SimpleDateFormat;
		25	import java.util.Calendar;
25	import java.util.Date;	26	import java.util.Date;
26	import java.util.GregorianCalendar;	27	import java.util.GregorianCalendar;
27	import java.util.Calendar;	28	import java.util.Locale;
28	import java.util.TimeZone;	29	import java.util.TimeZone;
29	import java.util.Locale;
30		30
31	import org.apache.log4j.helpers.LogLog;	31	import org.apache.log4j.helpers.LogLog;
32	import org.apache.log4j.spi.LoggingEvent;	32	import org.apache.log4j.spi.LoggingEvent;

Lines 28-45 Link Here

(-)src/main/java/org/apache/log4j/Hierarchy.java (-6 / +5 lines)
28	package org.apache.log4j;	28	package org.apache.log4j;
29		29
30		30
31	import java.util.Hashtable;
32	import java.util.Enumeration;	31	import java.util.Enumeration;
		32	import java.util.Hashtable;
33	import java.util.Vector;	33	import java.util.Vector;
34		34
35	import org.apache.log4j.spi.LoggerFactory;	35	import org.apache.log4j.helpers.LogLog;
		36	import org.apache.log4j.or.ObjectRenderer;
		37	import org.apache.log4j.or.RendererMap;
36	import org.apache.log4j.spi.HierarchyEventListener;	38	import org.apache.log4j.spi.HierarchyEventListener;
		39	import org.apache.log4j.spi.LoggerFactory;
37	import org.apache.log4j.spi.LoggerRepository;	40	import org.apache.log4j.spi.LoggerRepository;
38	import org.apache.log4j.spi.RendererSupport;	41	import org.apache.log4j.spi.RendererSupport;
39	import org.apache.log4j.Appender;
40	import org.apache.log4j.or.RendererMap;
41	import org.apache.log4j.or.ObjectRenderer;
42	import org.apache.log4j.helpers.LogLog;
43		42
44	/**	43	/**
45	This class is specialized in retrieving loggers by name and also	44	This class is specialized in retrieving loggers by name and also

Lines 17-38 Link Here

(-)src/main/java/org/apache/log4j/LogManager.java (-12 / +10 lines)
17		17
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
20	import org.apache.log4j.spi.LoggerRepository;	20	import java.net.MalformedURLException;
		21	import java.net.URL;
		22	import java.util.Enumeration;
		23
		24	import org.apache.log4j.helpers.Loader;
		25	import org.apache.log4j.helpers.LogLog;
		26	import org.apache.log4j.helpers.OptionConverter;
		27	import org.apache.log4j.spi.DefaultRepositorySelector;
21	import org.apache.log4j.spi.LoggerFactory;	28	import org.apache.log4j.spi.LoggerFactory;
		29	import org.apache.log4j.spi.LoggerRepository;
		30	import org.apache.log4j.spi.NOPLoggerRepository;
22	import org.apache.log4j.spi.RepositorySelector;	31	import org.apache.log4j.spi.RepositorySelector;
23	import org.apache.log4j.spi.DefaultRepositorySelector;
24	import org.apache.log4j.spi.RootLogger;	32	import org.apache.log4j.spi.RootLogger;
25	import org.apache.log4j.spi.NOPLoggerRepository;
26	import org.apache.log4j.helpers.Loader;
27	import org.apache.log4j.helpers.OptionConverter;
28	import org.apache.log4j.helpers.LogLog;
29		33
30	import java.net.URL;
31	import java.net.MalformedURLException;
32
33
34	import java.util.Enumeration;
35
36	/**	34	/**
37	* Use the <code>LogManager</code> class to retreive {@link Logger}	35	* Use the <code>LogManager</code> class to retreive {@link Logger}
38	* instances or to operate on the current {@link	36	* instances or to operate on the current {@link

Lines 22-27 Link Here

(-)src/main/java/org/apache/log4j/PropertyConfigurator.java (-7 / +7 lines)
22		22
23	package org.apache.log4j;	23	package org.apache.log4j;
24		24
		25	import java.io.FileInputStream;
		26	import java.io.InputStream;
		27	import java.util.Enumeration;
		28	import java.util.Hashtable;
		29	import java.util.Properties;
		30	import java.util.StringTokenizer;
		31
25	import org.apache.log4j.config.PropertySetter;	32	import org.apache.log4j.config.PropertySetter;
26	import org.apache.log4j.helpers.FileWatchdog;	33	import org.apache.log4j.helpers.FileWatchdog;
27	import org.apache.log4j.helpers.LogLog;	34	import org.apache.log4j.helpers.LogLog;
Lines 33-45 Link Here
33	import org.apache.log4j.spi.OptionHandler;	40	import org.apache.log4j.spi.OptionHandler;
34	import org.apache.log4j.spi.RendererSupport;	41	import org.apache.log4j.spi.RendererSupport;
35		42
36	import java.io.FileInputStream;
37	import java.io.InputStream;
38	import java.util.Enumeration;
39	import java.util.Hashtable;
40	import java.util.Properties;
41	import java.util.StringTokenizer;
42
43	/**	43	/**
44	Allows the configuration of log4j from an external file. See	44	Allows the configuration of log4j from an external file. See
45	<b>{@link #doConfigure(String, LoggerRepository)}</b> for the	45	<b>{@link #doConfigure(String, LoggerRepository)}</b> for the

Lines 18-31 Link Here

(-)src/main/java/org/apache/log4j/WriterAppender.java (-3 / +3 lines)
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
20	import java.io.IOException;	20	import java.io.IOException;
21	import java.io.Writer;
22	import java.io.OutputStream;	21	import java.io.OutputStream;
23	import java.io.OutputStreamWriter;	22	import java.io.OutputStreamWriter;
		23	import java.io.Writer;
24		24
		25	import org.apache.log4j.helpers.LogLog;
		26	import org.apache.log4j.helpers.QuietWriter;
25	import org.apache.log4j.spi.ErrorHandler;	27	import org.apache.log4j.spi.ErrorHandler;
26	import org.apache.log4j.spi.LoggingEvent;	28	import org.apache.log4j.spi.LoggingEvent;
27	import org.apache.log4j.helpers.QuietWriter;
28	import org.apache.log4j.helpers.LogLog;
29		29
30	// Contibutors: Jens Uwe Pipka <jens.pipka@gmx.de>	30	// Contibutors: Jens Uwe Pipka <jens.pipka@gmx.de>
31	// Ben Sandee	31	// Ben Sandee

Lines 16-31 Link Here

(-)src/main/java/org/apache/log4j/jdbc/JDBCAppender.java (-7 / +7 lines)
16	*/	16	*/
17	package org.apache.log4j.jdbc;	17	package org.apache.log4j.jdbc;
18		18
19	import org.apache.log4j.spi.*;	19	import java.sql.Connection;
20	import org.apache.log4j.PatternLayout;	20	import java.sql.DriverManager;
21		21	import java.sql.SQLException;
		22	import java.sql.Statement;
22	import java.util.ArrayList;	23	import java.util.ArrayList;
23	import java.util.Iterator;	24	import java.util.Iterator;
24		25
25	import java.sql.DriverManager;	26	import org.apache.log4j.PatternLayout;
26	import java.sql.Connection;	27	import org.apache.log4j.spi.ErrorCode;
27	import java.sql.Statement;	28	import org.apache.log4j.spi.LoggingEvent;
28	import java.sql.SQLException;
29		29
30		30
31	/**	31	/**

Lines 19-31 Link Here

(-)src/main/java/org/apache/log4j/jmx/AbstractDynamicMBean.java (-3 / +4 lines)
19		19
20	//import java.lang.reflect.Constructor;	20	//import java.lang.reflect.Constructor;
21	import java.util.Iterator;	21	import java.util.Iterator;
		22
		23	import javax.management.Attribute;
		24	import javax.management.AttributeList;
22	import javax.management.DynamicMBean;	25	import javax.management.DynamicMBean;
23	import javax.management.AttributeList;
24	import javax.management.Attribute;
25	import javax.management.RuntimeOperationsException;
26	import javax.management.MBeanRegistration;	26	import javax.management.MBeanRegistration;
27	import javax.management.MBeanServer;	27	import javax.management.MBeanServer;
28	import javax.management.ObjectName;	28	import javax.management.ObjectName;
		29	import javax.management.RuntimeOperationsException;
29		30
30	import org.apache.log4j.Logger;	31	import org.apache.log4j.Logger;
31		32

Lines 19-54 Link Here

(-)src/main/java/org/apache/log4j/jmx/HierarchyDynamicMBean.java (-20 / +22 lines)
19		19
20		20
21	import java.lang.reflect.Constructor;	21	import java.lang.reflect.Constructor;
22	import org.apache.log4j.*;	22	import java.util.Vector;
23		23
24	import org.apache.log4j.spi.HierarchyEventListener;	24	import javax.management.Attribute;
25	import org.apache.log4j.spi.LoggerRepository;	25	import javax.management.AttributeNotFoundException;
26	import org.apache.log4j.helpers.OptionConverter;	26	import javax.management.InvalidAttributeValueException;
27		27	import javax.management.ListenerNotFoundException;
28	import java.util.Vector;
29	import javax.management.MBeanAttributeInfo;	28	import javax.management.MBeanAttributeInfo;
30	import javax.management.MBeanConstructorInfo;	29	import javax.management.MBeanConstructorInfo;
		30	import javax.management.MBeanException;
		31	import javax.management.MBeanInfo;
31	import javax.management.MBeanNotificationInfo;	32	import javax.management.MBeanNotificationInfo;
32	import javax.management.MBeanOperationInfo;	33	import javax.management.MBeanOperationInfo;
33	import javax.management.MBeanParameterInfo;	34	import javax.management.MBeanParameterInfo;
34		35	import javax.management.Notification;
35	import javax.management.ObjectName;	36	import javax.management.NotificationBroadcaster;
36	import javax.management.MBeanInfo;
37	import javax.management.Attribute;
38
39	import javax.management.MBeanException;
40	import javax.management.AttributeNotFoundException;
41	import javax.management.RuntimeOperationsException;
42	import javax.management.ReflectionException;
43	import javax.management.InvalidAttributeValueException;
44	import javax.management.NotificationBroadcasterSupport;	37	import javax.management.NotificationBroadcasterSupport;
45	import javax.management.NotificationBroadcaster;
46	import javax.management.Notification;
47	import javax.management.NotificationListener;
48	import javax.management.NotificationFilter;	38	import javax.management.NotificationFilter;
49	import javax.management.NotificationFilterSupport;	39	import javax.management.NotificationFilterSupport;
50	import javax.management.ListenerNotFoundException;	40	import javax.management.NotificationListener;
		41	import javax.management.ObjectName;
		42	import javax.management.ReflectionException;
		43	import javax.management.RuntimeOperationsException;
51		44
		45	import org.apache.log4j.Appender;
		46	import org.apache.log4j.Category;
		47	import org.apache.log4j.Level;
		48	import org.apache.log4j.LogManager;
		49	import org.apache.log4j.Logger;
		50	import org.apache.log4j.helpers.OptionConverter;
		51	import org.apache.log4j.spi.HierarchyEventListener;
		52	import org.apache.log4j.spi.LoggerRepository;
		53
52	public class HierarchyDynamicMBean extends AbstractDynamicMBean	54	public class HierarchyDynamicMBean extends AbstractDynamicMBean
53	implements HierarchyEventListener,	55	implements HierarchyEventListener,
54	NotificationBroadcaster {	56	NotificationBroadcaster {

Lines 17-50 Link Here

(-)src/main/java/org/apache/log4j/jmx/LayoutDynamicMBean.java (-20 / +19 lines)
17		17
18	package org.apache.log4j.jmx;	18	package org.apache.log4j.jmx;
19		19
		20	import java.beans.BeanInfo;
		21	import java.beans.IntrospectionException;
		22	import java.beans.Introspector;
		23	import java.beans.PropertyDescriptor;
20	import java.lang.reflect.Constructor;	24	import java.lang.reflect.Constructor;
21	import org.apache.log4j.Logger;
22	import org.apache.log4j.Level;
23	import org.apache.log4j.Layout;
24	import org.apache.log4j.helpers.OptionConverter;
25	import org.apache.log4j.spi.OptionHandler;
26
27	import java.util.Vector;
28	import java.util.Hashtable;
29	import java.lang.reflect.Method;	25	import java.lang.reflect.Method;
30	import javax.management.MBeanAttributeInfo;	26	import java.util.Hashtable;
31	import javax.management.MBeanConstructorInfo;	27	import java.util.Vector;
32	import javax.management.MBeanNotificationInfo;
33	import javax.management.MBeanInfo;
34	import javax.management.Attribute;
35		28
36	import javax.management.MBeanException;	29	import javax.management.Attribute;
37	import javax.management.AttributeNotFoundException;	30	import javax.management.AttributeNotFoundException;
38	import javax.management.RuntimeOperationsException;
39	import javax.management.ReflectionException;
40	import javax.management.InvalidAttributeValueException;	31	import javax.management.InvalidAttributeValueException;
		32	import javax.management.MBeanAttributeInfo;
		33	import javax.management.MBeanConstructorInfo;
		34	import javax.management.MBeanException;
		35	import javax.management.MBeanInfo;
		36	import javax.management.MBeanNotificationInfo;
41	import javax.management.MBeanOperationInfo;	37	import javax.management.MBeanOperationInfo;
42	import javax.management.MBeanParameterInfo;	38	import javax.management.MBeanParameterInfo;
		39	import javax.management.ReflectionException;
		40	import javax.management.RuntimeOperationsException;
43		41
44	import java.beans.Introspector;	42	import org.apache.log4j.Layout;
45	import java.beans.BeanInfo;	43	import org.apache.log4j.Level;
46	import java.beans.PropertyDescriptor;	44	import org.apache.log4j.Logger;
47	import java.beans.IntrospectionException;	45	import org.apache.log4j.helpers.OptionConverter;
		46	import org.apache.log4j.spi.OptionHandler;
48		47
49	public class LayoutDynamicMBean extends AbstractDynamicMBean {	48	public class LayoutDynamicMBean extends AbstractDynamicMBean {
50		49

Lines 17-29 Link Here

(-)src/main/java/org/apache/log4j/lf5/DefaultLF5Configurator.java (-3 / +3 lines)
17		17
18	package org.apache.log4j.lf5;	18	package org.apache.log4j.lf5;
19		19
		20	import java.io.IOException;
		21	import java.net.URL;
		22
20	import org.apache.log4j.PropertyConfigurator;	23	import org.apache.log4j.PropertyConfigurator;
21	import org.apache.log4j.spi.Configurator;	24	import org.apache.log4j.spi.Configurator;
22	import org.apache.log4j.spi.LoggerRepository;	25	import org.apache.log4j.spi.LoggerRepository;
23		26
24	import java.io.IOException;
25	import java.net.URL;
26
27	/**	27	/**
28	* The <code>DefaultLF5Configurator</code> provides a default	28	* The <code>DefaultLF5Configurator</code> provides a default
29	* configuration for the <code>LF5Appender</code>.	29	* configuration for the <code>LF5Appender</code>.

Lines 17-30 Link Here

(-)src/main/java/org/apache/log4j/lf5/LF5Appender.java (-4 / +3 lines)
17		17
18	package org.apache.log4j.lf5;	18	package org.apache.log4j.lf5;
19		19
20	import org.apache.log4j.lf5.util.Resource;	20	import java.awt.Toolkit;
21	import org.apache.log4j.lf5.viewer.LogBrokerMonitor;	21
22	import org.apache.log4j.AppenderSkeleton;	22	import org.apache.log4j.AppenderSkeleton;
		23	import org.apache.log4j.lf5.viewer.LogBrokerMonitor;
23	import org.apache.log4j.spi.LocationInfo;	24	import org.apache.log4j.spi.LocationInfo;
24	import org.apache.log4j.spi.LoggingEvent;	25	import org.apache.log4j.spi.LoggingEvent;
25		26
26	import java.awt.*;
27
28	/**	27	/**
29	* <code>LF5Appender</code> logs events to a swing based logging	28	* <code>LF5Appender</code> logs events to a swing based logging
30	* console. The swing console supports turning categories on and off,	29	* console. The swing console supports turning categories on and off,

Lines 17-51 Link Here

(-)src/main/java/org/apache/log4j/net/SMTPAppender.java (-21 / +21 lines)
17		17
18	package org.apache.log4j.net;	18	package org.apache.log4j.net;
19		19
		20	import java.util.Date;
		21	import java.util.Properties;
		22
		23	import javax.mail.Authenticator;
		24	import javax.mail.Message;
		25	import javax.mail.MessagingException;
		26	import javax.mail.Multipart;
		27	import javax.mail.PasswordAuthentication;
		28	import javax.mail.Session;
		29	import javax.mail.Transport;
		30	import javax.mail.internet.AddressException;
		31	import javax.mail.internet.InternetAddress;
		32	import javax.mail.internet.MimeBodyPart;
		33	import javax.mail.internet.MimeMessage;
		34	import javax.mail.internet.MimeMultipart;
		35
20	import org.apache.log4j.AppenderSkeleton;	36	import org.apache.log4j.AppenderSkeleton;
		37	import org.apache.log4j.Layout;
21	import org.apache.log4j.Level;	38	import org.apache.log4j.Level;
22	import org.apache.log4j.Layout;
23	import org.apache.log4j.xml.UnrecognizedElementHandler;
24	import org.apache.log4j.helpers.CyclicBuffer;	39	import org.apache.log4j.helpers.CyclicBuffer;
		40	import org.apache.log4j.helpers.LogLog;
25	import org.apache.log4j.helpers.OptionConverter;	41	import org.apache.log4j.helpers.OptionConverter;
26	import org.apache.log4j.helpers.LogLog;	42	import org.apache.log4j.spi.ErrorCode;
27	import org.apache.log4j.spi.LoggingEvent;	43	import org.apache.log4j.spi.LoggingEvent;
28	import org.apache.log4j.spi.ErrorCode;	44	import org.apache.log4j.spi.OptionHandler;
29	import org.apache.log4j.spi.TriggeringEventEvaluator;	45	import org.apache.log4j.spi.TriggeringEventEvaluator;
30	import org.apache.log4j.spi.OptionHandler;	46	import org.apache.log4j.xml.UnrecognizedElementHandler;
31	import org.w3c.dom.Element;	47	import org.w3c.dom.Element;
32		48
33	import java.util.Properties;
34	import java.util.Date;
35
36	import javax.mail.Session;
37	import javax.mail.Authenticator;
38	import javax.mail.PasswordAuthentication;
39	import javax.mail.Transport;
40	import javax.mail.Message;
41	import javax.mail.MessagingException;
42	import javax.mail.internet.MimeMessage;
43	import javax.mail.Multipart;
44	import javax.mail.internet.MimeMultipart;
45	import javax.mail.internet.MimeBodyPart;
46	import javax.mail.internet.InternetAddress;
47	import javax.mail.internet.AddressException;
48
49	/**	49	/**
50	Send an e-mail when a specific logging event occurs, typically on	50	Send an e-mail when a specific logging event occurs, typically on
51	errors or fatal errors.	51	errors or fatal errors.

Lines 17-34 Link Here

(-)src/main/java/org/apache/log4j/net/SyslogAppender.java (-6 / +6 lines)
17		17
18	package org.apache.log4j.net;	18	package org.apache.log4j.net;
19		19
		20	import java.net.InetAddress;
		21	import java.net.UnknownHostException;
		22	import java.text.SimpleDateFormat;
		23	import java.util.Date;
		24	import java.util.Locale;
		25
20	import org.apache.log4j.AppenderSkeleton;	26	import org.apache.log4j.AppenderSkeleton;
21	import org.apache.log4j.Layout;	27	import org.apache.log4j.Layout;
22	import org.apache.log4j.helpers.SyslogQuietWriter;	28	import org.apache.log4j.helpers.SyslogQuietWriter;
23	import org.apache.log4j.helpers.SyslogWriter;	29	import org.apache.log4j.helpers.SyslogWriter;
24	import org.apache.log4j.spi.LoggingEvent;	30	import org.apache.log4j.spi.LoggingEvent;
25		31
26	import java.text.SimpleDateFormat;
27	import java.util.Date;
28	import java.util.Locale;
29	import java.net.InetAddress;
30	import java.net.UnknownHostException;
31
32	// Contributors: Yves Bossel <ybossel@opengets.cl>	32	// Contributors: Yves Bossel <ybossel@opengets.cl>
33	// Christopher Taylor <cstaylor@pacbell.net>	33	// Christopher Taylor <cstaylor@pacbell.net>
34		34

Lines 17-26 Link Here

(-)src/main/java/org/apache/log4j/net/TelnetAppender.java (-4 / +4 lines)
17		17
18	package org.apache.log4j.net;	18	package org.apache.log4j.net;
19		19
20	import org.apache.log4j.AppenderSkeleton;
21	import org.apache.log4j.helpers.LogLog;
22	import org.apache.log4j.spi.LoggingEvent;
23
24	import java.io.IOException;	20	import java.io.IOException;
25	import java.io.PrintWriter;	21	import java.io.PrintWriter;
26	import java.net.ServerSocket;	22	import java.net.ServerSocket;
Lines 29-34 Link Here
29	import java.util.Iterator;	25	import java.util.Iterator;
30	import java.util.Vector;	26	import java.util.Vector;
31		27
		28	import org.apache.log4j.AppenderSkeleton;
		29	import org.apache.log4j.helpers.LogLog;
		30	import org.apache.log4j.spi.LoggingEvent;
		31
32	/**	32	/**
33	<p>The TelnetAppender is a log4j appender that specializes in	33	<p>The TelnetAppender is a log4j appender that specializes in
34	writing to a read-only socket. The output is provided in a	34	writing to a read-only socket. The output is provided in a

Lines 19-28 Link Here

(-)src/main/java/org/apache/log4j/spi/LocationInfo.java (-2 / +3 lines)
19		19
20	package org.apache.log4j.spi;	20	package org.apache.log4j.spi;
21		21
		22	import java.io.PrintWriter;
22	import java.io.StringWriter;	23	import java.io.StringWriter;
23	import java.io.PrintWriter;	24
		25	import org.apache.log4j.Layout;
24	import org.apache.log4j.helpers.LogLog;	26	import org.apache.log4j.helpers.LogLog;
25	import org.apache.log4j.Layout;
26		27
27	/**	28	/**
28	The internal representation of caller location information.	29	The internal representation of caller location information.

Lines 16-30 Link Here

(-)src/main/java/org/apache/log4j/spi/NOPLogger.java (-4 / +4 lines)
16	*/	16	*/
17	package org.apache.log4j.spi;	17	package org.apache.log4j.spi;
18		18
		19	import java.util.Enumeration;
		20	import java.util.ResourceBundle;
		21	import java.util.Vector;
		22
19	import org.apache.log4j.Appender;	23	import org.apache.log4j.Appender;
20	import org.apache.log4j.Level;	24	import org.apache.log4j.Level;
21	import org.apache.log4j.Logger;	25	import org.apache.log4j.Logger;
22	import org.apache.log4j.Priority;	26	import org.apache.log4j.Priority;
23		27
24	import java.util.Enumeration;
25	import java.util.ResourceBundle;
26	import java.util.Vector;
27
28	/**	28	/**
29	* No-operation implementation of Logger used by NOPLoggerRepository.	29	* No-operation implementation of Logger used by NOPLoggerRepository.
30	* @since 1.2.15	30	* @since 1.2.15

Lines 17-22 Link Here

(-)src/main/java/org/apache/log4j/xml/DOMConfigurator.java (-12 / +13 lines)
17		17
18	package org.apache.log4j.xml;	18	package org.apache.log4j.xml;
19		19
		20	import java.io.File;
		21	import java.io.IOException;
		22	import java.io.InputStream;
		23	import java.io.Reader;
		24	import java.lang.reflect.Method;
		25	import java.net.URL;
		26	import java.util.Hashtable;
		27	import java.util.Properties;
		28
		29	import javax.xml.parsers.DocumentBuilder;
		30	import javax.xml.parsers.DocumentBuilderFactory;
		31	import javax.xml.parsers.FactoryConfigurationError;
		32
20	import org.apache.log4j.Appender;	33	import org.apache.log4j.Appender;
21	import org.apache.log4j.Layout;	34	import org.apache.log4j.Layout;
22	import org.apache.log4j.Level;	35	import org.apache.log4j.Level;
Lines 43-60 Link Here
43	import org.xml.sax.InputSource;	56	import org.xml.sax.InputSource;
44	import org.xml.sax.SAXException;	57	import org.xml.sax.SAXException;
45		58
46	import javax.xml.parsers.DocumentBuilder;
47	import javax.xml.parsers.DocumentBuilderFactory;
48	import javax.xml.parsers.FactoryConfigurationError;
49	import java.io.File;
50	import java.io.IOException;
51	import java.io.InputStream;
52	import java.io.Reader;
53	import java.lang.reflect.Method;
54	import java.net.URL;
55	import java.util.Hashtable;
56	import java.util.Properties;
57
58	// Contributors: Mark Womack	59	// Contributors: Mark Womack
59	// Arun Katkere	60	// Arun Katkere
60		61

Lines 17-29 Link Here

(-)src/main/java/org/apache/log4j/xml/Log4jEntityResolver.java (-3 / +3 lines)
17		17
18	package org.apache.log4j.xml;	18	package org.apache.log4j.xml;
19		19
		20	import java.io.ByteArrayInputStream;
		21	import java.io.InputStream;
		22
20	import org.apache.log4j.helpers.LogLog;	23	import org.apache.log4j.helpers.LogLog;
21	import org.xml.sax.EntityResolver;	24	import org.xml.sax.EntityResolver;
22	import org.xml.sax.InputSource;	25	import org.xml.sax.InputSource;
23		26
24	import java.io.InputStream;
25	import java.io.ByteArrayInputStream;
26
27	/**	27	/**
28	* An {@link EntityResolver} specifically designed to return	28	* An {@link EntityResolver} specifically designed to return
29	* <code>log4j.dtd</code> which is embedded within the log4j jar	29	* <code>log4j.dtd</code> which is embedded within the log4j jar

Lines 19-32 Link Here

(-)src/main/java/org/apache/log4j/xml/XMLLayout.java (-3 / +3 lines)
19		19
20	package org.apache.log4j.xml;	20	package org.apache.log4j.xml;
21		21
		22	import java.util.Arrays;
		23	import java.util.Set;
		24
22	import org.apache.log4j.Layout;	25	import org.apache.log4j.Layout;
23	import org.apache.log4j.helpers.Transform;	26	import org.apache.log4j.helpers.Transform;
24	import org.apache.log4j.spi.LocationInfo;	27	import org.apache.log4j.spi.LocationInfo;
25	import org.apache.log4j.spi.LoggingEvent;	28	import org.apache.log4j.spi.LoggingEvent;
26		29
27	import java.util.Set;
28	import java.util.Arrays;
29
30	/**	30	/**
31	* The output of the XMLLayout consists of a series of log4j:event	31	* The output of the XMLLayout consists of a series of log4j:event
32	* elements as defined in the <a	32	* elements as defined in the <a

Lines 17-31 Link Here

(-)tests/src/java/org/apache/log4j/AsyncAppenderTestCase.java (-6 / +2 lines)
17		17
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
20	import junit.framework.TestCase;
21	import junit.framework.TestSuite;
22	import junit.framework.Test;
23
24	import java.util.Vector;	20	import java.util.Vector;
25		21
26	import org.apache.log4j.*;	22	import junit.framework.TestCase;
		23
27	import org.apache.log4j.spi.LoggingEvent;	24	import org.apache.log4j.spi.LoggingEvent;
28	import org.apache.log4j.varia.NullAppender;
29		25
30	/**	26	/**
31	A superficial but general test of log4j.	27	A superficial but general test of log4j.

Lines 17-34 Link Here

(-)tests/src/java/org/apache/log4j/DRFATestCase.java (-5 / +4 lines)
17		17
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
20	import junit.framework.TestCase;
21
22	import java.io.File;	20	import java.io.File;
		21	import java.io.FileInputStream;
23	import java.io.FileOutputStream;	22	import java.io.FileOutputStream;
24	import java.io.IOException;	23	import java.io.IOException;
25	import java.io.FileWriter;
26	import java.io.FileReader;
27	import java.io.FileInputStream;
28	import java.text.SimpleDateFormat;	24	import java.text.SimpleDateFormat;
29	import java.util.Calendar;	25	import java.util.Calendar;
30	import java.util.Date;	26	import java.util.Date;
31	import java.util.TimeZone;	27	import java.util.TimeZone;
		28
		29	import junit.framework.TestCase;
		30
32	import org.apache.log4j.util.Compare;	31	import org.apache.log4j.util.Compare;
33		32
34	/**	33	/**

Lines 17-29 Link Here

(-)tests/src/java/org/apache/log4j/FileAppenderTest.java (-3 / +2 lines)
17		17
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
20	import junit.framework.TestCase;
21
22	import java.io.File;	20	import java.io.File;
23
24	import java.lang.reflect.Method;	21	import java.lang.reflect.Method;
25		22
		23	import junit.framework.TestCase;
26		24
		25
27	/**	26	/**
28	*	27	*
29	* FileAppender tests.	28	* FileAppender tests.

Lines 17-33 Link Here

(-)tests/src/java/org/apache/log4j/HTMLLayoutTest.java (-6 / +7 lines)
17		17
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
		20	import java.io.Reader;
		21	import java.io.StringReader;
		22	import java.util.Hashtable;
		23
		24	import javax.xml.parsers.DocumentBuilder;
		25	import javax.xml.parsers.DocumentBuilderFactory;
		26
20	import org.apache.log4j.spi.LoggingEvent;	27	import org.apache.log4j.spi.LoggingEvent;
21	import org.w3c.dom.Document;	28	import org.w3c.dom.Document;
22	import org.xml.sax.InputSource;	29	import org.xml.sax.InputSource;
23		30
24	import javax.xml.parsers.DocumentBuilder;
25	import javax.xml.parsers.DocumentBuilderFactory;
26	import java.io.Reader;
27	import java.io.StringReader;
28	import java.util.Hashtable;
29		31
30
31	/**	32	/**
32	* Test for HTMLLayout.	33	* Test for HTMLLayout.
33	*	34	*

Lines 17-28 Link Here

(-)tests/src/java/org/apache/log4j/HierarchyThresholdTestCase.java (-3 / +2 lines)
17		17
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
		20	import junit.framework.Test;
20	import junit.framework.TestCase;	21	import junit.framework.TestCase;
21	import junit.framework.TestSuite;	22	import junit.framework.TestSuite;
22	import junit.framework.Test;
23		23
24	import org.apache.log4j.*;	24	import org.apache.log4j.util.Compare;
25	import org.apache.log4j.util.*;
26	import org.apache.log4j.xml.XLevel;	25	import org.apache.log4j.xml.XLevel;
27		26
28	/**	27	/**

Lines 17-33 Link Here

(-)tests/src/java/org/apache/log4j/LoggerTestCase.java (-6 / +7 lines)
17		17
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
20	import junit.framework.TestCase;
21	import org.apache.log4j.spi.LoggingEvent;
22	import org.apache.log4j.spi.RootLogger;
23	import org.apache.log4j.spi.LoggerRepository;
24	import org.apache.log4j.spi.HierarchyEventListener;
25
26	import java.util.Enumeration;	20	import java.util.Enumeration;
27	import java.util.Locale;	21	import java.util.Locale;
28	import java.util.ResourceBundle;	22	import java.util.ResourceBundle;
29	import java.util.Vector;	23	import java.util.Vector;
30		24
		25	import junit.framework.TestCase;
		26
		27	import org.apache.log4j.spi.HierarchyEventListener;
		28	import org.apache.log4j.spi.LoggerRepository;
		29	import org.apache.log4j.spi.LoggingEvent;
		30	import org.apache.log4j.spi.RootLogger;
		31
31	/**	32	/**
32	Used for internal unit testing the Logger class.	33	Used for internal unit testing the Logger class.
33		34

Lines 17-29 Link Here

(-)tests/src/java/org/apache/log4j/MinimumTestCase.java (-3 / +9 lines)
17		17
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
		20	import junit.framework.Test;
20	import junit.framework.TestCase;	21	import junit.framework.TestCase;
21	import junit.framework.TestSuite;	22	import junit.framework.TestSuite;
22	import junit.framework.Test;
23		23
24	import org.apache.log4j.*;
25	import org.apache.log4j.helpers.AbsoluteTimeDateFormat;	24	import org.apache.log4j.helpers.AbsoluteTimeDateFormat;
26	import org.apache.log4j.util.*;	25	import org.apache.log4j.util.AbsoluteDateAndTimeFilter;
		26	import org.apache.log4j.util.Compare;
		27	import org.apache.log4j.util.ControlFilter;
		28	import org.apache.log4j.util.Filter;
		29	import org.apache.log4j.util.JunitTestRunnerFilter;
		30	import org.apache.log4j.util.LineNumberFilter;
		31	import org.apache.log4j.util.SunReflectFilter;
		32	import org.apache.log4j.util.Transformer;
27		33
28	/**	34	/**
29	A superficial but general test of log4j.	35	A superficial but general test of log4j.

Lines 17-42 Link Here

(-)tests/src/java/org/apache/log4j/PatternLayoutTestCase.java (-13 / +8 lines)
17		17
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
		20	import junit.framework.Test;
20	import junit.framework.TestCase;	21	import junit.framework.TestCase;
21	import junit.framework.TestSuite;	22	import junit.framework.TestSuite;
22	import junit.framework.Test;
23		23
24	import org.apache.log4j.Logger;	24	import org.apache.log4j.util.AbsoluteDateAndTimeFilter;
25	import org.apache.log4j.Level;	25	import org.apache.log4j.util.AbsoluteTimeFilter;
26	import org.apache.log4j.MDC;
27	import org.apache.log4j.NDC;
28
29	import org.apache.log4j.util.LineNumberFilter;
30	import org.apache.log4j.util.Transformer;
31	import org.apache.log4j.util.Filter;
32	import org.apache.log4j.util.ControlFilter;
33	import org.apache.log4j.util.Compare;	26	import org.apache.log4j.util.Compare;
		27	import org.apache.log4j.util.ControlFilter;
		28	import org.apache.log4j.util.Filter;
34	import org.apache.log4j.util.ISO8601Filter;	29	import org.apache.log4j.util.ISO8601Filter;
35	import org.apache.log4j.util.AbsoluteTimeFilter;	30	import org.apache.log4j.util.JunitTestRunnerFilter;
		31	import org.apache.log4j.util.LineNumberFilter;
36	import org.apache.log4j.util.RelativeTimeFilter;	32	import org.apache.log4j.util.RelativeTimeFilter;
37	import org.apache.log4j.util.AbsoluteDateAndTimeFilter;
38	import org.apache.log4j.util.SunReflectFilter;	33	import org.apache.log4j.util.SunReflectFilter;
39	import org.apache.log4j.util.JunitTestRunnerFilter;	34	import org.apache.log4j.util.Transformer;
40		35
41	public class PatternLayoutTestCase extends TestCase {	36	public class PatternLayoutTestCase extends TestCase {
42		37

Lines 16-29 Link Here

(-)tests/src/java/org/apache/log4j/PropertyConfiguratorTest.java (-2 / +2 lines)
16	*/	16	*/
17	package org.apache.log4j;	17	package org.apache.log4j;
18		18
19	import junit.framework.TestCase;
20
21	import java.io.File;	19	import java.io.File;
22	import java.io.FileWriter;	20	import java.io.FileWriter;
23	import java.io.IOException;	21	import java.io.IOException;
24	import java.net.URL;	22	import java.net.URL;
25	import java.util.Properties;	23	import java.util.Properties;
26		24
		25	import junit.framework.TestCase;
		26
27	/**	27	/**
28	* Test property configurator.	28	* Test property configurator.
29	*	29	*

Lines 17-28 Link Here

(-)tests/src/java/org/apache/log4j/RFATestCase.java (-2 / +2 lines)
17		17
18	package org.apache.log4j;	18	package org.apache.log4j;
19		19
20	import junit.framework.TestCase;
21
22	import java.io.File;	20	import java.io.File;
23	import java.io.FileWriter;	21	import java.io.FileWriter;
24	import java.io.IOException;	22	import java.io.IOException;
25		23
		24	import junit.framework.TestCase;
		25
26	/**	26	/**
27	* Test of RollingFileAppender.	27	* Test of RollingFileAppender.
28	*	28	*