ceki 2004/05/19 07:36:22
Modified: src/java/org/apache/log4j/test Hello.java DefaultInit.java
MDCStress.java SysoutConfigurator.java
AsyncAppenderTest.java DelayedLoop.java
MultipleAppenders.java
ConfigurationFileParsing.java Finalize.java
PatternTest.java StressAsyncAppender.java
DRFATest.java FQCNTest.java Shallow.java
examples/src/jmx T.java
src/java/org/apache/log4j/xml/examples XMLSample.java
src/java/org/apache/log4j/jmx Agent.java
src/java/org/apache/log4j/net/test Loop.java SMTPMin.java
SocketMin.java
tests/src/java/org/apache/log4j StressCategory.java
src/java/org/apache/log4j/config PropertyPrinter.java
src/java/org/apache/log4j/net SocketServer.java
src/java/org/apache/log4j/xml/test DOMTest.java
src/java/org/apache/log4j Category.java
Log:
- Category.getRoot marked as @deprecated.
- Category.getInstance marked as @deprecated.
- Ensuing changes
Revision Changes Path
1.3 +21 -14 logging-log4j/src/java/org/apache/log4j/test/Hello.java
Index: Hello.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/test/Hello.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Hello.java 14 Dec 2000 21:08:13 -0000 1.2
+++ Hello.java 19 May 2004 14:36:20 -0000 1.3
@@ -1,29 +1,36 @@
/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
+ * Copyright 1999,2004 The Apache Software Foundation.
*
- * This software is published under the terms of the Apache Software
- * License version 1.1, a copy of which has been included with this
- * distribution in the LICENSE.APL file. */
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
-package org.apache.log4j.test;
+package org.apache.log4j.test;
-import org.apache.log4j.Category;
import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.Logger;
+
/**
Very simple log4j usage example.
- @author Ceki Gülcü
+ @author Ceki Gülcü
*/
public class Hello {
+ static Logger logger = Logger.getLogger(Hello.class);
- static Category cat = Category.getInstance(Hello.class);
-
- public
- static
- void main(String argv[]) {
+ public static void main(String[] argv) {
BasicConfigurator.configure();
- cat.debug("Hello world.");
- cat.info("What a beatiful day.");
+ logger.debug("Hello world.");
+ logger.info("What a beatiful day.");
}
}
1.5 +2 -1 logging-log4j/src/java/org/apache/log4j/test/DefaultInit.java
Index: DefaultInit.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/test/DefaultInit.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultInit.java 24 Apr 2002 01:16:11 -0000 1.4
+++ DefaultInit.java 19 May 2004 14:36:20 -0000 1.5
@@ -2,10 +2,11 @@
package org.apache.log4j.test;
import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
public class DefaultInit {
- static Category cat = Category.getInstance(DefaultInit.class);
+ static Category cat = Logger.getLogger(DefaultInit.class);
public static void main( String[] argv) {
cat.debug("Hello world");
1.6 +3 -3 logging-log4j/src/java/org/apache/log4j/test/MDCStress.java
Index: MDCStress.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/test/MDCStress.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MDCStress.java 9 May 2004 18:37:56 -0000 1.5
+++ MDCStress.java 19 May 2004 14:36:20 -0000 1.6
@@ -8,9 +8,9 @@
public class MDCStress extends Thread {
- static Category root = Category.getRoot();
- static Category log = Category.getInstance(MDCStress.class);
-
+ final static Logger root = Logger.getRootLogger();
+ final static Logger log = Logger.getLogger(MDCStress.class);
+
static Random random = new Random(17);
static final int BRANCHING_FACTOR = 2;
1.7 +1 -1
logging-log4j/src/java/org/apache/log4j/test/SysoutConfigurator.java
Index: SysoutConfigurator.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/test/SysoutConfigurator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SysoutConfigurator.java 24 Apr 2002 01:16:11 -0000 1.6
+++ SysoutConfigurator.java 19 May 2004 14:36:20 -0000 1.7
@@ -12,7 +12,7 @@
public
void
doConfigure(java.net.URL url, LoggerRepository hierarchy) {
- Category.getRoot().addAppender(
+ Logger.getRootLogger().addAppender(
new ConsoleAppender(
new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
}
1.6 +4 -3
logging-log4j/src/java/org/apache/log4j/test/AsyncAppenderTest.java
Index: AsyncAppenderTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/test/AsyncAppenderTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AsyncAppenderTest.java 27 Feb 2004 16:47:35 -0000 1.5
+++ AsyncAppenderTest.java 19 May 2004 14:36:20 -0000 1.6
@@ -16,8 +16,8 @@
package org.apache.log4j.test;
-import org.apache.log4j.Category;
import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.apache.log4j.xml.DOMConfigurator;
@@ -27,7 +27,8 @@
* @author Ceki Gülcü
*/
public class AsyncAppenderTest {
- static Category cat = Category.getInstance(AsyncAppenderTest.class);
+ final static Logger logger = Logger.getLogger(AsyncAppenderTest.class);
+
static int delayBeforeClose;
public static void main(String[] argv) {
@@ -59,7 +60,7 @@
}
static void test() {
- Category root = Category.getRoot();
+ Logger root = Logger.getRootLogger();
for (int i = 0; i < 100; i++) {
root.debug("Message " + i);
1.5 +36 -30 logging-log4j/src/java/org/apache/log4j/test/DelayedLoop.java
Index: DelayedLoop.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/test/DelayedLoop.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DelayedLoop.java 5 May 2003 20:42:57 -0000 1.4
+++ DelayedLoop.java 19 May 2004 14:36:20 -0000 1.5
@@ -1,66 +1,72 @@
/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
+ * Copyright 1999,2004 The Apache Software Foundation.
*
- * This software is published under the terms of the Apache Software
- * License version 1.1, a copy of which has been included with this
- * distribution in the LICENSE.APL file. */
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
-package org.apache.log4j.test;
+package org.apache.log4j.test;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.xml.DOMConfigurator;
+
/**
This test program sits in a loop and logs things. Its logging is
configured by a configuration file. Changes to this configuration
file are monitored and when a change occurs, the config file is re-read.
-
+
@author Ceki Gülcü */
public class DelayedLoop {
-
- static Category cat = Category.getInstance(DelayedLoop.class);
+ static Logger cat = Logger.getLogger(DelayedLoop.class);
static int loopLength;
- public
- static
- void main(String argv[]) {
-
- if(argv.length == 1)
+ public static void main(String[] argv) {
+ if (argv.length == 1) {
init(argv[0]);
- else
+ } else {
usage("Wrong number of arguments.");
+ }
+
test();
}
-
- static
- void usage(String msg) {
+ static void usage(String msg) {
System.err.println(msg);
- System.err.println( "Usage: java " + DelayedLoop.class.getName() +
- "configFile");
+ System.err.println(
+ "Usage: java " + DelayedLoop.class.getName() + "configFile");
System.exit(1);
}
-
- static
- void init(String configFile) {
- if(configFile.endsWith("xml")) {
+ static void init(String configFile) {
+ if (configFile.endsWith("xml")) {
DOMConfigurator.configureAndWatch(configFile, 3000);
} else {
PropertyConfigurator.configureAndWatch(configFile, 3000);
}
}
- static
- void test() {
+ static void test() {
int i = 0;
- while(true) {
- cat.debug("MSG "+i++);
+
+ while (true) {
+ cat.debug("MSG " + i++);
+
try {
- Thread.sleep(1000);
- } catch(Exception e) {}
+ Thread.sleep(1000);
+ } catch (Exception e) {
+ }
}
}
}
1.3 +2 -2
logging-log4j/src/java/org/apache/log4j/test/MultipleAppenders.java
Index: MultipleAppenders.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/test/MultipleAppenders.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MultipleAppenders.java 14 Dec 2000 21:08:13 -0000 1.2
+++ MultipleAppenders.java 19 May 2004 14:36:20 -0000 1.3
@@ -1,8 +1,8 @@
package org.apache.log4j.test;
+import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
-import org.apache.log4j.Category;
import org.apache.log4j.Appender;
import java.util.Enumeration;
import java.util.Vector;
@@ -16,7 +16,7 @@
// A1 and A2 should be added to root by reading the config file
PropertyConfigurator.configure(argv[0]);
- Category root = Category.getRoot();
+ Logger root = Logger.getRootLogger();
Enumeration e1 = root.getAllAppenders();
Vector v = new Vector(1);
1.8 +2 -2
logging-log4j/src/java/org/apache/log4j/test/ConfigurationFileParsing.java
Index: ConfigurationFileParsing.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/test/ConfigurationFileParsing.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ConfigurationFileParsing.java 27 Feb 2004 16:47:35 -0000 1.7
+++ ConfigurationFileParsing.java 19 May 2004 14:36:20 -0000 1.8
@@ -16,8 +16,8 @@
package org.apache.log4j.test;
-import org.apache.log4j.Category;
import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.apache.log4j.NDC;
import org.apache.log4j.PropertyConfigurator;
@@ -28,7 +28,7 @@
NDC.push("testing");
PropertyConfigurator.configure(argv[0]);
- Category root = Category.getRoot();
+ Logger root = Logger.getRootLogger();
root.debug("Message 1");
root.debug("Message 2");
NDC.pop();
1.5 +2 -1 logging-log4j/src/java/org/apache/log4j/test/Finalize.java
Index: Finalize.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/test/Finalize.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Finalize.java 5 May 2003 20:42:58 -0000 1.4
+++ Finalize.java 19 May 2004 14:36:20 -0000 1.5
@@ -2,6 +2,7 @@
package org.apache.log4j.test;
+import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.Category;
import java.io.InputStreamReader;
@@ -42,7 +43,7 @@
int i = -1;
InputStreamReader in = new InputStreamReader(System.in);
- Category root = Category.getRoot();
+ Logger root = Logger.getRootLogger();;
System.out.println("Type 'q' to quit");
int j = 0;
1.7 +14 -14 logging-log4j/src/java/org/apache/log4j/test/PatternTest.java
Index: PatternTest.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/test/PatternTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PatternTest.java 9 May 2004 18:37:56 -0000 1.6
+++ PatternTest.java 19 May 2004 14:36:20 -0000 1.7
@@ -2,8 +2,8 @@
package org.apache.log4j.test;
import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
-import org.apache.log4j.Category;
import org.apache.log4j.Level;
/**
This class is a test of the PatternLayout class.
@@ -11,8 +11,8 @@
@author Ceki Gülcü
*/
public class PatternTest {
- static Category CAT = Category.getInstance(PatternTest.class);
-
+ final static Logger logger = Logger.getLogger(PatternTest.class);
+
public
static
@@ -41,37 +41,37 @@
static
void test() {
int i = -1;
- Category root = Category.getRoot();
+ Logger root = Logger.getRootLogger();
- CAT.debug("Message " + ++i);
+ logger.debug("Message " + ++i);
root.debug("Message " + i);
- CAT.info ("Message " + ++i);
+ logger.info ("Message " + ++i);
root.info("Message " + i);
- CAT.warn ("Message " + ++i);
+ logger.warn ("Message " + ++i);
root.warn("Message " + i);
- CAT.error("Message " + ++i);
+ logger.error("Message " + ++i);
root.error("Message " + i);
- CAT.log(Level.FATAL, "Message " + ++i);
+ logger.log(Level.FATAL, "Message " + ++i);
root.log(Level.FATAL, "Message " + i);
Exception e = new Exception("Just testing");
- CAT.debug("Message " + ++i, e);
+ logger.debug("Message " + ++i, e);
root.debug("Message " + i, e);
- CAT.info("Message " + ++i, e);
+ logger.info("Message " + ++i, e);
root.info("Message " + i, e);
- CAT.warn("Message " + ++i , e);
+ logger.warn("Message " + ++i , e);
root.warn("Message " + i , e);
- CAT.error("Message " + ++i, e);
+ logger.error("Message " + ++i, e);
root.error("Message " + i, e);
- CAT.log(Level.FATAL, "Message " + ++i, e);
+ logger.log(Level.FATAL, "Message " + ++i, e);
root.log(Level.FATAL, "Message " + i, e);
LogManager.shutdown();
1.6 +2 -2
logging-log4j/src/java/org/apache/log4j/test/StressAsyncAppender.java
Index: StressAsyncAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/test/StressAsyncAppender.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StressAsyncAppender.java 5 May 2003 20:42:58 -0000 1.5
+++ StressAsyncAppender.java 19 May 2004 14:36:20 -0000 1.6
@@ -4,7 +4,7 @@
package org.apache.log4j.test;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.apache.log4j.xml.DOMConfigurator;
@@ -16,7 +16,7 @@
*/
public class StressAsyncAppender extends Thread {
- static Category root = Category.getRoot();
+ static Logger root = Logger.getRootLogger();
static Random random = new Random(101);
1.5 +2 -2 logging-log4j/src/java/org/apache/log4j/test/DRFATest.java
Index: DRFATest.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/test/DRFATest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DRFATest.java 12 May 2004 15:39:03 -0000 1.4
+++ DRFATest.java 19 May 2004 14:36:20 -0000 1.5
@@ -7,8 +7,8 @@
package org.apache.log4j.test;
import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Category;
import org.apache.log4j.Layout;
+import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
import org.apache.log4j.DailyRollingFileAppender;
@@ -19,7 +19,7 @@
*/
public class DRFATest {
- static Category cat = Category.getInstance(DRFATest.class);
+ static Logger cat = Logger.getLogger(DRFATest.class);
static int limit;
1.8 +1 -1 logging-log4j/src/java/org/apache/log4j/test/FQCNTest.java
Index: FQCNTest.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/test/FQCNTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FQCNTest.java 9 May 2004 18:37:56 -0000 1.7
+++ FQCNTest.java 19 May 2004 14:36:20 -0000 1.8
@@ -42,7 +42,7 @@
Layout layout = new PatternLayout("%p %c (%C{2}#%M) - %m%n");
FileAppender appender = new FileAppender(layout, file, false);
appender.setLayout(layout);
- Category root = Category.getRoot();
+ Logger root = Logger.getRootLogger();;
root.addAppender(appender);
}
1.11 +3 -2 logging-log4j/src/java/org/apache/log4j/test/Shallow.java
Index: Shallow.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/test/Shallow.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Shallow.java 5 May 2003 20:42:58 -0000 1.10
+++ Shallow.java 19 May 2004 14:36:20 -0000 1.11
@@ -10,6 +10,7 @@
import org.apache.log4j.xml.DOMConfigurator;
import org.apache.log4j.Category;
import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.apache.log4j.NDC;
import org.apache.log4j.Level;
/**
@@ -19,7 +20,7 @@
*/
public class Shallow {
- static Category cat = Category.getInstance(Shallow.class);
+ static Category cat = Logger.getLogger(Shallow.class);
public
static
@@ -50,7 +51,7 @@
void test() {
int i = -1;
NDC.push("NDC");
- Category root = Category.getRoot();
+ Logger root = Logger.getRootLogger();
cat.debug("Message " + ++i);
root.debug("Message " + i);
1.2 +0 -2 logging-log4j/examples/src/jmx/T.java
Index: T.java
===================================================================
RCS file: /home/cvs/logging-log4j/examples/src/jmx/T.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- T.java 15 Dec 2003 21:49:02 -0000 1.1
+++ T.java 19 May 2004 14:36:21 -0000 1.2
@@ -1,7 +1,6 @@
package jmx;
import org.apache.log4j.jmx.Agent;
-import org.apache.log4j.Category;
import org.apache.log4j.BasicConfigurator;
import org.apache.log4j.*;
@@ -9,7 +8,6 @@
public static void main(String[] args) {
- Category cat = Category.getInstance(T.class);
Layout layout = new PatternLayout("%r %p [%t] %c - %m%n");
ConsoleAppender consoleAppender = new ConsoleAppender(layout);
1.6 +2 -1
logging-log4j/src/java/org/apache/log4j/xml/examples/XMLSample.java
Index: XMLSample.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/xml/examples/XMLSample.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLSample.java 5 May 2003 20:42:58 -0000 1.5
+++ XMLSample.java 19 May 2004 14:36:21 -0000 1.6
@@ -3,6 +3,7 @@
import org.apache.log4j.xml.DOMConfigurator;
import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
@@ -50,7 +51,7 @@
static
void sample() {
int i = -1;
- Category root = Category.getRoot();
+ Logger root = Logger.getRootLogger();
cat.debug("Message " + ++i);
cat.warn ("Message " + ++i);
cat.error("Message " + ++i);
1.3 +2 -2 logging-log4j/src/java/org/apache/log4j/jmx/Agent.java
Index: Agent.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/jmx/Agent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Agent.java 24 Apr 2002 01:16:13 -0000 1.2
+++ Agent.java 19 May 2004 14:36:21 -0000 1.3
@@ -6,12 +6,12 @@
import javax.management.MBeanServerFactory;
import com.sun.jdmk.comm.HtmlAdaptorServer;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
public class Agent {
- static Category log = Category.getInstance(Agent.class);
+ static Logger log = Logger.getLogger(Agent.class);
public Agent() {
}
1.5 +4 -4 logging-log4j/src/java/org/apache/log4j/net/test/Loop.java
Index: Loop.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/test/Loop.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Loop.java 20 May 2002 09:52:57 -0000 1.4
+++ Loop.java 19 May 2004 14:36:22 -0000 1.5
@@ -15,9 +15,9 @@
public static void main(String[] args) {
- Category root = Category.getRoot();
- Category cat = Category.getInstance(Loop.class.getName());
-
+ Logger root = Logger.getRootLogger();
+ final Logger logger = Logger.getLogger(Loop.class);
+
if(args.length != 2)
usage("Wrong number of arguments.");
@@ -41,7 +41,7 @@
while(true) {
NDC.push(""+ (i++));
- cat.debug("Debug message.");
+ logger.debug("Debug message.");
root.info("Info message.");
NDC.pop();
}
1.8 +8 -8 logging-log4j/src/java/org/apache/log4j/net/test/SMTPMin.java
Index: SMTPMin.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/test/SMTPMin.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SMTPMin.java 9 May 2004 18:37:57 -0000 1.7
+++ SMTPMin.java 19 May 2004 14:36:22 -0000 1.8
@@ -11,8 +11,8 @@
public class SMTPMin {
- static Category cat = Category.getInstance(SMTPMin.class);
-
+ final static Logger logger = Logger.getLogger(SMTPMin.class);
+
public
static
void main(String argv[]) {
@@ -42,12 +42,12 @@
static
void test() {
int i = 0;
- cat.debug( "Message " + i++);
- cat.debug("Message " + i++, new Exception("Just testing."));
- cat.info( "Message " + i++);
- cat.warn( "Message " + i++);
- cat.error( "Message " + i++);
- cat.log(Level.FATAL, "Message " + i++);
+ logger.debug( "Message " + i++);
+ logger.debug("Message " + i++, new Exception("Just testing."));
+ logger.info( "Message " + i++);
+ logger.warn( "Message " + i++);
+ logger.error( "Message " + i++);
+ logger.log(Level.FATAL, "Message " + i++);
LogManager.shutdown();
Thread.currentThread().getThreadGroup().list();
}
1.6 +3 -2 logging-log4j/src/java/org/apache/log4j/net/test/SocketMin.java
Index: SocketMin.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/test/SocketMin.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SocketMin.java 9 May 2004 18:37:57 -0000 1.5
+++ SocketMin.java 19 May 2004 14:36:22 -0000 1.6
@@ -10,6 +10,7 @@
import org.apache.log4j.Category;
import org.apache.log4j.BasicConfigurator;
import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
import org.apache.log4j.net.SocketAppender;
import org.apache.log4j.NDC;
import java.io.InputStreamReader;
@@ -46,7 +47,7 @@
static
void init(String host, String portStr) {
- Category root = Category.getRoot();
+ Logger root = Logger.getRootLogger();
BasicConfigurator.configure();
try {
int port = Integer.parseInt(portStr);
@@ -68,7 +69,7 @@
static
void loop() {
- Category root = Category.getRoot();
+ Logger root = Logger.getRootLogger();
InputStreamReader in = new InputStreamReader(System.in);
System.out.println("Type 'q' to quit");
int i;
1.2 +1 -1
logging-log4j/tests/src/java/org/apache/log4j/StressCategory.java
Index: StressCategory.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/StressCategory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StressCategory.java 25 Apr 2002 14:09:01 -0000 1.1
+++ StressCategory.java 19 May 2004 14:36:22 -0000 1.2
@@ -25,7 +25,7 @@
Level.ERROR,
Level.FATAL};
- static Level defaultLevel = Category.getRoot().getLevel();
+ static Level defaultLevel = Logger.getRootLogger().getLevel();
static int LENGTH;
static String[] names;
1.5 +1 -1
logging-log4j/src/java/org/apache/log4j/config/PropertyPrinter.java
Index: PropertyPrinter.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/config/PropertyPrinter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PropertyPrinter.java 5 May 2003 20:42:55 -0000 1.4
+++ PropertyPrinter.java 19 May 2004 14:36:22 -0000 1.5
@@ -99,7 +99,7 @@
}
appenderString += ", " + name;
}
- String catKey = (cat == Category.getRoot())
+ String catKey = (cat == Logger.getRootLogger())
? "log4j.rootCategory"
: "log4j.category." + cat.getName();
if (appenderString != "") {
1.13 +93 -73 logging-log4j/src/java/org/apache/log4j/net/SocketServer.java
Index: SocketServer.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/SocketServer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SocketServer.java 19 May 2004 13:15:42 -0000 1.12
+++ SocketServer.java 19 May 2004 14:36:22 -0000 1.13
@@ -1,21 +1,32 @@
/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
+ * Copyright 1999,2004 The Apache Software Foundation.
*
- * This software is published under the terms of the Apache Software
- * License version 1.1, a copy of which has been included with this
- * distribution in the LICENSE.txt file. */
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.log4j.net;
-import java.net.Socket;
-import java.net.ServerSocket;
-import java.net.InetAddress;
-import java.io.File;
-import java.util.Hashtable;
-
import org.apache.log4j.*;
import org.apache.log4j.spi.*;
+import java.io.File;
+
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+import java.util.Hashtable;
+
/**
A [EMAIL PROTECTED] SocketNode} based server that uses a different hierarchy
@@ -69,13 +80,10 @@
@author Ceki Gülcü
@since 1.0 */
-
-public class SocketServer {
-
+public class SocketServer {
static String GENERIC = "generic";
static String CONFIG_FILE_EXT = ".lcf";
-
- static Category cat = Category.getInstance(SocketServer.class);
+ static final Logger logger = Logger.getLogger(SocketServer.class);
static SocketServer server;
static int port;
@@ -84,114 +92,126 @@
LoggerRepository genericHierarchy;
File dir;
- public
- static
- void main(String argv[]) {
- if(argv.length == 3)
+ public SocketServer(File directory) {
+ this.dir = directory;
+ hierarchyMap = new Hashtable(11);
+ }
+
+ public static void main(String[] argv) {
+ if (argv.length == 3) {
init(argv[0], argv[1], argv[2]);
- else
+ } else {
usage("Wrong number of arguments.");
+ }
try {
- cat.info("Listening on port " + port);
+ logger.info("Listening on port " + port);
+
ServerSocket serverSocket = new ServerSocket(port);
- while(true) {
- cat.info("Waiting to accept a new client.");
- Socket socket = serverSocket.accept();
- InetAddress inetAddress = socket.getInetAddress();
- cat.info("Connected to client at " + inetAddress);
-
- LoggerRepository h = (LoggerRepository) server.hierarchyMap.get(inetAddress);
- if(h == null) {
- h = server.configureHierarchy(inetAddress);
- }
- cat.info("Starting new socket node.");
- new Thread(new SocketNode(socket, h)).start();
+ while (true) {
+ logger.info("Waiting to accept a new client.");
+
+ Socket socket = serverSocket.accept();
+ InetAddress inetAddress = socket.getInetAddress();
+ logger.info("Connected to client at " + inetAddress);
+
+ LoggerRepository h =
+ (LoggerRepository) server.hierarchyMap.get(inetAddress);
+
+ if (h == null) {
+ h = server.configureHierarchy(inetAddress);
+ }
+
+ logger.info("Starting new socket node.");
+ new Thread(new SocketNode(socket, h)).start();
}
- }
- catch(Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
}
}
-
- static
- void usage(String msg) {
+ static void usage(String msg) {
System.err.println(msg);
System.err.println(
- "Usage: java " +SocketServer.class.getName() + " port configFile directory");
+ "Usage: java " + SocketServer.class.getName()
+ + " port configFile directory");
System.exit(1);
}
- static
- void init(String portStr, String configFile, String dirStr) {
+ static void init(String portStr, String configFile, String dirStr) {
try {
port = Integer.parseInt(portStr);
- }
- catch(java.lang.NumberFormatException e) {
+ } catch (java.lang.NumberFormatException e) {
e.printStackTrace();
- usage("Could not interpret port number ["+ portStr +"].");
+ usage("Could not interpret port number [" + portStr + "].");
}
PropertyConfigurator.configure(configFile);
File dir = new File(dirStr);
- if(!dir.isDirectory()) {
- usage("["+dirStr+"] is not a directory.");
+
+ if (!dir.isDirectory()) {
+ usage("[" + dirStr + "] is not a directory.");
}
+
server = new SocketServer(dir);
}
- public
- SocketServer(File directory) {
- this.dir = directory;
- hierarchyMap = new Hashtable(11);
- }
-
// This method assumes that there is no hiearchy for inetAddress
// yet. It will configure one and return it.
LoggerRepository configureHierarchy(InetAddress inetAddress) {
- cat.info("Locating configuration file for "+inetAddress);
+ logger.info("Locating configuration file for " + inetAddress);
+
// We assume that the toSting method of InetAddress returns is in
// the format hostname/d1.d2.d3.d4 e.g. torino/192.168.1.1
String s = inetAddress.toString();
int i = s.indexOf("/");
- if(i == -1) {
- cat.warn("Could not parse the inetAddress ["+inetAddress+
- "]. Using default hierarchy.");
+
+ if (i == -1) {
+ logger.warn(
+ "Could not parse the inetAddress [" + inetAddress
+ + "]. Using default hierarchy.");
+
return genericHierarchy();
} else {
String key = s.substring(0, i);
- File configFile = new File(dir, key+CONFIG_FILE_EXT);
- if(configFile.exists()) {
- Hierarchy h = new Hierarchy(new RootLogger(Level.DEBUG));
- hierarchyMap.put(inetAddress, h);
+ File configFile = new File(dir, key + CONFIG_FILE_EXT);
+
+ if (configFile.exists()) {
+ Hierarchy h = new Hierarchy(new RootLogger(Level.DEBUG));
+ hierarchyMap.put(inetAddress, h);
- new PropertyConfigurator().doConfigure(configFile.getAbsolutePath(), h);
+ new PropertyConfigurator().doConfigure(
+ configFile.getAbsolutePath(), h);
- return h;
+ return h;
} else {
- cat.warn("Could not find config file ["+configFile+"].");
- return genericHierarchy();
+ logger.warn("Could not find config file [" + configFile + "].");
+
+ return genericHierarchy();
}
}
}
- LoggerRepository genericHierarchy() {
- if(genericHierarchy == null) {
- File f = new File(dir, GENERIC+CONFIG_FILE_EXT);
- if(f.exists()) {
- genericHierarchy = new Hierarchy(new RootLogger(Level.DEBUG));
- new PropertyConfigurator().doConfigure(f.getAbsolutePath(), genericHierarchy);
+ LoggerRepository genericHierarchy() {
+ if (genericHierarchy == null) {
+ File f = new File(dir, GENERIC + CONFIG_FILE_EXT);
+
+ if (f.exists()) {
+ genericHierarchy = new Hierarchy(new RootLogger(Level.DEBUG));
+ new PropertyConfigurator().doConfigure(
+ f.getAbsolutePath(), genericHierarchy);
} else {
- cat.warn("Could not find config file ["+f+
- "]. Will use the default hierarchy.");
- genericHierarchy = LogManager.getLoggerRepository();
+ logger.warn(
+ "Could not find config file [" + f
+ + "]. Will use the default hierarchy.");
+ genericHierarchy = LogManager.getLoggerRepository();
}
}
+
return genericHierarchy;
}
}
1.9 +3 -2 logging-log4j/src/java/org/apache/log4j/xml/test/DOMTest.java
Index: DOMTest.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/xml/test/DOMTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DOMTest.java 9 May 2004 18:37:57 -0000 1.8
+++ DOMTest.java 19 May 2004 14:36:22 -0000 1.9
@@ -19,6 +19,7 @@
import org.apache.log4j.Category;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.apache.log4j.xml.DOMConfigurator;
@@ -56,8 +57,8 @@
static void test() {
int i = -1;
- Category root = Category.getRoot();
-
+ Logger root = Logger.getRootLogger();
+
cat.debug("Message " + ++i);
root.debug("Message " + i);
1.83 +4 -4 logging-log4j/src/java/org/apache/log4j/Category.java
Index: Category.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/Category.java,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- Category.java 19 May 2004 13:15:42 -0000 1.82
+++ Category.java 19 May 2004 14:36:22 -0000 1.83
@@ -576,9 +576,8 @@
*
* @param clazz The name of <code>clazz</code> will be used as the name of
* the category to retrieve. See [EMAIL PROTECTED] #getInstance(String)}
for
- * more detailed information. <b>Deprecated</b> Please use [EMAIL
PROTECTED]
- * Logger#getLogger(Class)} instead.
- *
+ * more detailed information.
+ * @deprecated Please use [EMAIL PROTECTED] Logger#getLogger(Class)} instead.
* @since 1.0
*/
public static Category getInstance(Class clazz) {
@@ -633,7 +632,8 @@
* <p>
* Nevertheless, calling [EMAIL PROTECTED] #getInstance
Category.getInstance("root")}
* does not retrieve the root category but a category just under root named
- * "root". <b>Deprecated</b> Use [EMAIL PROTECTED] Logger#getRootLogger()}
instead.
+ * "root".
+ * @deprecated Use [EMAIL PROTECTED] Logger#getRootLogger()} instead.
* </p>
*/
public static final Category getRoot() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
