You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ca...@apache.org on 2007/04/27 22:42:44 UTC
svn commit: r533215 - in /logging/log4j/branches/v1_2-branch: ./ examples/
examples/customLevel/ examples/lf5/UsingLogMonitorAdapter/
examples/lf5/UsingSocketAppenders/ examples/subclass/
src/java/org/apache/log4j/jdbc/ src/java/org/apache/log4j/lf5/vi...
Author: carnold
Date: Fri Apr 27 13:42:42 2007
New Revision: 533215
URL: http://svn.apache.org/viewvc?view=rev&rev=533215
Log:
Bug 42283: More Eclipse warning fixups
Modified:
logging/log4j/branches/v1_2-branch/build.xml
logging/log4j/branches/v1_2-branch/examples/MyPatternParser.java
logging/log4j/branches/v1_2-branch/examples/NumberCruncherClient.java
logging/log4j/branches/v1_2-branch/examples/NumberCruncherServer.java
logging/log4j/branches/v1_2-branch/examples/Sort.java
logging/log4j/branches/v1_2-branch/examples/customLevel/XLevel.java
logging/log4j/branches/v1_2-branch/examples/lf5/UsingLogMonitorAdapter/UsingLogMonitorAdapter.java
logging/log4j/branches/v1_2-branch/examples/lf5/UsingSocketAppenders/UsingSocketAppenders.java
logging/log4j/branches/v1_2-branch/examples/subclass/MyLogger.java
logging/log4j/branches/v1_2-branch/examples/subclass/MyLoggerTest.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/jdbc/JDBCAppender.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTable.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTableColumn.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTableColumnFormatException.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTableModel.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTableRowRenderer.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryExplorerModel.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryExplorerTree.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryNode.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryNodeEditorRenderer.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryNodeRenderer.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/net/SimpleSocketServer.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/performance/SystemTime.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/varia/LevelRangeFilter.java
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/examples/XMLSample.java
logging/log4j/branches/v1_2-branch/tests/build.xml
Modified: logging/log4j/branches/v1_2-branch/build.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/build.xml?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/build.xml (original)
+++ logging/log4j/branches/v1_2-branch/build.xml Fri Apr 27 13:42:42 2007
@@ -26,6 +26,13 @@
<!-- The build.properties file defines the parth to local jar files -->
<property file="build.properties"/>
+ <!-- if a Maven build has been attempted,
+ the Maven repository can provide all the dependencies. -->
+ <property name="m2_repo" location="${user.home}/.m2/repository"/>
+ <property name="javaee-api.jar" location="${m2_repo}/javaee/javaee-api/5/javaee-api-5.jar"/>
+ <property name="jmx-extra.jar" location="${m2_repo}/com/sun/jdmk/jmxtools/1.2.1/jmxtools-1.2.1.jar"/>
+
+
<!-- Read the system environment variables and stores them in properties, -->
<!-- prefixed with "env". -->
<property environment="env"/>
Modified: logging/log4j/branches/v1_2-branch/examples/MyPatternParser.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/examples/MyPatternParser.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/examples/MyPatternParser.java (original)
+++ logging/log4j/branches/v1_2-branch/examples/MyPatternParser.java Fri Apr 27 13:42:42 2007
@@ -17,7 +17,6 @@
package examples;
-import org.apache.log4j.*;
import org.apache.log4j.helpers.FormattingInfo;
import org.apache.log4j.helpers.PatternConverter;
import org.apache.log4j.helpers.PatternParser;
Modified: logging/log4j/branches/v1_2-branch/examples/NumberCruncherClient.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/examples/NumberCruncherClient.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/examples/NumberCruncherClient.java (original)
+++ logging/log4j/branches/v1_2-branch/examples/NumberCruncherClient.java Fri Apr 27 13:42:42 2007
@@ -17,11 +17,8 @@
package examples;
-import java.rmi.Remote;
-import java.rmi.server.UnicastRemoteObject;
import java.rmi.RemoteException;
import java.rmi.Naming;
-import java.util.Vector;
import java.io.*;
/**
Modified: logging/log4j/branches/v1_2-branch/examples/NumberCruncherServer.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/examples/NumberCruncherServer.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/examples/NumberCruncherServer.java (original)
+++ logging/log4j/branches/v1_2-branch/examples/NumberCruncherServer.java Fri Apr 27 13:42:42 2007
@@ -17,13 +17,11 @@
package examples;
-import java.rmi.Remote;
import java.rmi.server.UnicastRemoteObject;
import java.rmi.RemoteException;
import java.rmi.Naming;
import java.util.Vector;
-
import org.apache.log4j.Logger;
import org.apache.log4j.NDC;
import org.apache.log4j.PropertyConfigurator;
@@ -62,6 +60,7 @@
*/
public class NumberCruncherServer extends UnicastRemoteObject
implements NumberCruncher {
+ private static final long serialVersionUID = 2626753561969426769L;
static Logger logger = Logger.getLogger(NumberCruncherServer.class);
@@ -75,7 +74,7 @@
// The client's host is an important source of information.
try {
- NDC.push(this.getClientHost());
+ NDC.push(getClientHost());
}
catch(java.rmi.server.ServerNotActiveException e) {
// we are being called from same VM
@@ -149,7 +148,7 @@
public static
void delay(int millis) {
- try{Thread.currentThread().sleep(millis);}
+ try{Thread.sleep(millis);}
catch(InterruptedException e) {}
}
Modified: logging/log4j/branches/v1_2-branch/examples/Sort.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/examples/Sort.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/examples/Sort.java (original)
+++ logging/log4j/branches/v1_2-branch/examples/Sort.java Fri Apr 27 13:42:42 2007
@@ -19,7 +19,6 @@
import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
/**
Example code for log4j to viewed in conjunction with the {@link
Modified: logging/log4j/branches/v1_2-branch/examples/customLevel/XLevel.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/examples/customLevel/XLevel.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/examples/customLevel/XLevel.java (original)
+++ logging/log4j/branches/v1_2-branch/examples/customLevel/XLevel.java Fri Apr 27 13:42:42 2007
@@ -18,7 +18,6 @@
package examples.customLevel;
import org.apache.log4j.Level;
-import org.apache.log4j.Priority;
/**
@@ -27,6 +26,7 @@
*/
public class XLevel extends Level {
+ private static final long serialVersionUID = 2626753561969426769L;
static public final int TRACE_INT = Level.DEBUG_INT - 1;
static public final int LETHAL_INT = Level.FATAL_INT + 1;
Modified: logging/log4j/branches/v1_2-branch/examples/lf5/UsingLogMonitorAdapter/UsingLogMonitorAdapter.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/examples/lf5/UsingLogMonitorAdapter/UsingLogMonitorAdapter.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/examples/lf5/UsingLogMonitorAdapter/UsingLogMonitorAdapter.java (original)
+++ logging/log4j/branches/v1_2-branch/examples/lf5/UsingLogMonitorAdapter/UsingLogMonitorAdapter.java Fri Apr 27 13:42:42 2007
@@ -17,7 +17,6 @@
package examples.lf5.UsingLogMonitorAdapter;
import org.apache.log4j.lf5.LogLevel;
-import org.apache.log4j.lf5.util.AdapterLogRecord;
import org.apache.log4j.lf5.util.LogMonitorAdapter;
/**
Modified: logging/log4j/branches/v1_2-branch/examples/lf5/UsingSocketAppenders/UsingSocketAppenders.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/examples/lf5/UsingSocketAppenders/UsingSocketAppenders.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/examples/lf5/UsingSocketAppenders/UsingSocketAppenders.java (original)
+++ logging/log4j/branches/v1_2-branch/examples/lf5/UsingSocketAppenders/UsingSocketAppenders.java Fri Apr 27 13:42:42 2007
@@ -120,7 +120,7 @@
// closed. This is done to overcome some basic limitations with the
// way the SocketServer and SocketAppender classes manage sockets.
try {
- Thread.currentThread().sleep(5000);
+ Thread.sleep(5000);
} catch (InterruptedException ie) {
}
Modified: logging/log4j/branches/v1_2-branch/examples/subclass/MyLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/examples/subclass/MyLogger.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/examples/subclass/MyLogger.java (original)
+++ logging/log4j/branches/v1_2-branch/examples/subclass/MyLogger.java Fri Apr 27 13:42:42 2007
@@ -18,11 +18,7 @@
package examples.subclass;
import org.apache.log4j.*;
-import org.apache.log4j.spi.LoggerFactory;
-import org.apache.log4j.xml.DOMConfigurator;
import examples.customLevel.XLevel;
-import org.apache.log4j.PropertyConfigurator;
-import org.apache.log4j.helpers.LogLog;
/**
A simple example showing logger subclassing.
Modified: logging/log4j/branches/v1_2-branch/examples/subclass/MyLoggerTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/examples/subclass/MyLoggerTest.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/examples/subclass/MyLoggerTest.java (original)
+++ logging/log4j/branches/v1_2-branch/examples/subclass/MyLoggerTest.java Fri Apr 27 13:42:42 2007
@@ -18,9 +18,7 @@
package examples.subclass;
import org.apache.log4j.*;
-import org.apache.log4j.spi.LoggerFactory;
import org.apache.log4j.xml.DOMConfigurator;
-import examples.customLevel.XLevel;
import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.helpers.LogLog;
Modified: logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/jdbc/JDBCAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/jdbc/JDBCAppender.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/jdbc/JDBCAppender.java (original)
+++ logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/jdbc/JDBCAppender.java Fri Apr 27 13:42:42 2007
@@ -16,7 +16,6 @@
*/
package org.apache.log4j.jdbc;
-import org.apache.log4j.*;
import org.apache.log4j.spi.*;
import org.apache.log4j.PatternLayout;
Modified: logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTable.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTable.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTable.java (original)
+++ logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTable.java Fri Apr 27 13:42:42 2007
@@ -41,6 +41,7 @@
// Contributed by ThoughtWorks Inc.
public class LogTable extends JTable {
+ private static final long serialVersionUID = 4867085140195148458L;
//--------------------------------------------------------------------------
// Constants:
//--------------------------------------------------------------------------
Modified: logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTableColumn.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTableColumn.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTableColumn.java (original)
+++ logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTableColumn.java Fri Apr 27 13:42:42 2007
@@ -31,6 +31,7 @@
// Contributed by ThoughtWorks Inc.
public class LogTableColumn implements java.io.Serializable {
+ private static final long serialVersionUID = -4275827753626456547L;
// log4j table columns.
public final static LogTableColumn DATE = new LogTableColumn("Date");
Modified: logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTableColumnFormatException.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTableColumnFormatException.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTableColumnFormatException.java (original)
+++ logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTableColumnFormatException.java Fri Apr 27 13:42:42 2007
@@ -27,6 +27,7 @@
// Contributed by ThoughtWorks Inc.
public class LogTableColumnFormatException extends Exception {
+ private static final long serialVersionUID = 6529165785030431653L;
//--------------------------------------------------------------------------
// Constants:
Modified: logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTableModel.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTableModel.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTableModel.java (original)
+++ logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTableModel.java Fri Apr 27 13:42:42 2007
@@ -28,6 +28,7 @@
// Contributed by ThoughtWorks Inc.
public class LogTableModel extends DefaultTableModel {
+ private static final long serialVersionUID = 3593300685868700894L;
//--------------------------------------------------------------------------
// Constants:
//--------------------------------------------------------------------------
Modified: logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTableRowRenderer.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTableRowRenderer.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTableRowRenderer.java (original)
+++ logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/LogTableRowRenderer.java Fri Apr 27 13:42:42 2007
@@ -34,6 +34,7 @@
// Contributed by ThoughtWorks Inc.
public class LogTableRowRenderer extends DefaultTableCellRenderer {
+ private static final long serialVersionUID = -3951639953706443213L;
//--------------------------------------------------------------------------
// Constants:
//--------------------------------------------------------------------------
Modified: logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryExplorerModel.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryExplorerModel.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryExplorerModel.java (original)
+++ logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryExplorerModel.java Fri Apr 27 13:42:42 2007
@@ -39,6 +39,8 @@
// Contributed by ThoughtWorks Inc.
public class CategoryExplorerModel extends DefaultTreeModel {
+ private static final long serialVersionUID = -3413887384316015901L;
+
//--------------------------------------------------------------------------
// Constants:
//--------------------------------------------------------------------------
Modified: logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryExplorerTree.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryExplorerTree.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryExplorerTree.java (original)
+++ logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryExplorerTree.java Fri Apr 27 13:42:42 2007
@@ -33,6 +33,7 @@
// Contributed by ThoughtWorks Inc.
public class CategoryExplorerTree extends JTree {
+ private static final long serialVersionUID = 8066257446951323576L;
//--------------------------------------------------------------------------
// Constants:
//--------------------------------------------------------------------------
Modified: logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryNode.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryNode.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryNode.java (original)
+++ logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryNode.java Fri Apr 27 13:42:42 2007
@@ -30,6 +30,7 @@
// Contributed by ThoughtWorks Inc.
public class CategoryNode extends DefaultMutableTreeNode {
+ private static final long serialVersionUID = 5958994817693177319L;
//--------------------------------------------------------------------------
// Constants:
//--------------------------------------------------------------------------
Modified: logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryNodeEditorRenderer.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryNodeEditorRenderer.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryNodeEditorRenderer.java (original)
+++ logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryNodeEditorRenderer.java Fri Apr 27 13:42:42 2007
@@ -29,6 +29,8 @@
// Contributed by ThoughtWorks Inc.
public class CategoryNodeEditorRenderer extends CategoryNodeRenderer {
+ private static final long serialVersionUID = -6094804684259929574L;
+
//--------------------------------------------------------------------------
// Constants:
//--------------------------------------------------------------------------
Modified: logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryNodeRenderer.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryNodeRenderer.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryNodeRenderer.java (original)
+++ logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryNodeRenderer.java Fri Apr 27 13:42:42 2007
@@ -31,6 +31,8 @@
// Contributed by ThoughtWorks Inc.
public class CategoryNodeRenderer extends DefaultTreeCellRenderer {
+ private static final long serialVersionUID = -6046702673278595048L;
+
//--------------------------------------------------------------------------
// Constants:
//--------------------------------------------------------------------------
Modified: logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java (original)
+++ logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java Fri Apr 27 13:42:42 2007
@@ -66,7 +66,6 @@
private static final String FIRST_CATEGORY_NAME = "Categories";
private static final String LEVEL = "level";
private static final String COLORLEVEL = "colorlevel";
- private static final String COLOR = "color";
private static final String RED = "red";
private static final String GREEN = "green";
private static final String BLUE = "blue";
@@ -225,7 +224,7 @@
protected void processLogLevelColors(Document doc) {
NodeList nodeList = doc.getElementsByTagName(COLORLEVEL);
- Map logLevelColors = LogLevel.getLogLevelColorMap();
+ LogLevel.getLogLevelColorMap();
for (int i = 0; i < nodeList.getLength(); i++) {
Node n = nodeList.item(i);
Modified: logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/net/SimpleSocketServer.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/net/SimpleSocketServer.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/net/SimpleSocketServer.java (original)
+++ logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/net/SimpleSocketServer.java Fri Apr 27 13:42:42 2007
@@ -89,9 +89,9 @@
}
if(configFile.endsWith(".xml")) {
- new DOMConfigurator().configure(configFile);
+ DOMConfigurator.configure(configFile);
} else {
- new PropertyConfigurator().configure(configFile);
+ PropertyConfigurator.configure(configFile);
}
}
}
Modified: logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/performance/SystemTime.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/performance/SystemTime.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/performance/SystemTime.java (original)
+++ logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/performance/SystemTime.java Fri Apr 27 13:42:42 2007
@@ -46,9 +46,8 @@
static
double systemCurrentTimeLoop() {
long before = System.currentTimeMillis();
- long l;
for(int i = 0; i < RUN_LENGTH; i++) {
- l = System.currentTimeMillis();
+ System.currentTimeMillis();
}
return (System.currentTimeMillis() - before)*1000.0/RUN_LENGTH;
}
@@ -56,9 +55,8 @@
static
double currentThreadNameloop() {
long before = System.currentTimeMillis();
- String t;
for(int i = 0; i < RUN_LENGTH; i++) {
- t = Thread.currentThread().getName();
+ Thread.currentThread().getName();
}
return (System.currentTimeMillis() - before)*1000.0/RUN_LENGTH;
}
Modified: logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/varia/LevelRangeFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/varia/LevelRangeFilter.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/varia/LevelRangeFilter.java (original)
+++ logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/varia/LevelRangeFilter.java Fri Apr 27 13:42:42 2007
@@ -20,8 +20,6 @@
import org.apache.log4j.Level;
import org.apache.log4j.spi.Filter;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.helpers.LogLog;
-import org.apache.log4j.helpers.OptionConverter;
/**
This is a very simple filter based on level matching, which can be
Modified: logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/examples/XMLSample.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/examples/XMLSample.java?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/examples/XMLSample.java (original)
+++ logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/xml/examples/XMLSample.java Fri Apr 27 13:42:42 2007
@@ -19,7 +19,6 @@
import org.apache.log4j.xml.DOMConfigurator;
import org.apache.log4j.Logger;
-import java.net.*;
/**
@@ -67,7 +66,6 @@
static
void sample() {
int i = -1;
- Logger root = Logger.getRootLogger();
cat.debug("Message " + ++i);
cat.warn ("Message " + ++i);
cat.error("Message " + ++i);
Modified: logging/log4j/branches/v1_2-branch/tests/build.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/build.xml?view=diff&rev=533215&r1=533214&r2=533215
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/build.xml (original)
+++ logging/log4j/branches/v1_2-branch/tests/build.xml Fri Apr 27 13:42:42 2007
@@ -27,6 +27,15 @@
<property file="build.properties"/>
+ <!-- if a Maven build has been attempted,
+ the Maven repository can provide all the dependencies. -->
+ <property name="m2_repo" location="${user.home}/.m2/repository"/>
+ <property name="oro.version" value="2.0.8"/>
+ <property name="jakarta.oro.jar" location="${m2_repo}/oro/oro/${oro.version}/oro-${oro.version}.jar"/>
+ <property name="checkstyle.version" value="4.1"/>
+ <property name="checkstyle.jar" location="${m2_repo}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}.jar"/>
+
+
<!-- Read the system environment variables and stores them in properties, -->
<!-- prefixed with "env". -->
<property environment="env"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org