This class is used to map PrintStream/PrintWriter oriented logging onto * the log4j Categories. Examples include capturing System.out/System.err @@ -48,24 +48,24 @@ return new Boolean(value).booleanValue(); } - private Category category; - private Priority priority; + private Logger category; + private Level priority; private boolean issuedWarning; /** - * Redirect logging to the indicated category using Priority.INFO + * Redirect logging to the indicated category using Level.INFO */ - public CategoryStream(final Category category) + public CategoryStream(final Logger category) { - this(category, Priority.INFO, System.out); + this(category, Level.INFO, System.out); } /** * Redirect logging to the indicated category using the given * priority. The ps is simply passed to super but is not used. */ - public CategoryStream(final Category category, - final Priority priority, + public CategoryStream(final Logger category, + final Level priority, final PrintStream ps) { super(ps); --- jboss-4.0.3RC1-src/common/src/main/org/jboss/logging/util/CategoryWriter.java.orig Sat May 25 02:43:00 2002 +++ jboss-4.0.3RC1-src/common/src/main/org/jboss/logging/util/CategoryWriter.java Wed Aug 10 23:01:57 2005 @@ -13,11 +13,11 @@ import java.io.PrintWriter; import java.io.Writer; -import org.apache.log4j.Category; -import org.apache.log4j.Priority; +import org.apache.log4j.Logger; +import org.apache.log4j.Level; /** - * A subclass of PrintWriter that redirects its output to a log4j Category.
+ * A subclass of PrintWriter that redirects its output to a log4j Logger.
* * This class is used to have something to give api methods that require a * PrintWriter for logging. JBoss-owned classes of this nature generally ignore @@ -32,18 +32,18 @@ */ public class CategoryWriter extends PrintWriter { - private Category category; - private Priority priority; + private Logger category; + private Level priority; private boolean inWrite; private boolean issuedWarning; /** - * Redirect logging to the indicated category using Priority.INFO + * Redirect logging to the indicated category using Level.INFO * * @param category Description of Parameter */ - public CategoryWriter( final Category category ) { - this( category, Priority.INFO ); + public CategoryWriter( final Logger category ) { + this( category, Level.INFO ); } /** @@ -53,8 +53,8 @@ * @param category Description of Parameter * @param priority Description of Parameter */ - public CategoryWriter( final Category category, - final Priority priority ) { + public CategoryWriter( final Logger category, + final Level priority ) { super( new InternalCategoryWriter( category, priority ), true ); } @@ -62,11 +62,11 @@ * @created August 19, 2001 */ static class InternalCategoryWriter extends Writer { - private Category category; - private Priority priority; + private Logger category; + private Level priority; private boolean closed; - public InternalCategoryWriter( final Category category, final Priority priority ) { + public InternalCategoryWriter( final Logger category, final Level priority ) { lock = category; //synchronize on this category this.category = category; --- jboss-4.0.3RC1-src/security/src/main/org/jboss/test/LoginModulesTestCase.java.orig Mon Apr 4 03:00:34 2005 +++ jboss-4.0.3RC1-src/security/src/main/org/jboss/test/LoginModulesTestCase.java Wed Aug 10 20:25:12 2005 @@ -34,7 +34,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.log4j.Category; +import org.apache.log4j.Logger; import org.apache.log4j.FileAppender; import org.apache.log4j.PatternLayout; @@ -285,7 +285,7 @@ protected void setUp() throws Exception { // Set up a simple configuration that logs to LoginModulesTestCase.log - Category root = Category.getRoot(); + Logger root = Logger.getRootLogger(); root.setLevel(XLevel.TRACE); FileAppender appender = new FileAppender(new PatternLayout("%x%m%n"), "LoginModulesTestCase.log"); root.addAppender(appender); --- jboss-4.0.3RC1-src/security/src/main/org/jboss/test/SRPProtocolTestCase.java.orig Wed Aug 27 06:31:51 2003 +++ jboss-4.0.3RC1-src/security/src/main/org/jboss/test/SRPProtocolTestCase.java Wed Aug 10 21:21:33 2005 @@ -12,7 +12,7 @@ import java.security.KeyException; import java.security.MessageDigest; -import org.apache.log4j.Category; +import org.apache.log4j.Logger; import org.apache.log4j.NDC; import org.apache.log4j.PatternLayout; import org.apache.log4j.WriterAppender; @@ -50,7 +50,7 @@ protected void setUp() throws Exception { // Set up a simple configuration that logs on the console. - Category root = Category.getRoot(); + Logger root = Logger.getRootLogger(); root.setLevel(XLevel.TRACE); root.addAppender(new WriterAppender(new PatternLayout("%x%m%n"), System.out)); Util.init(); --- jboss-4.0.3RC1-src/security/src/main/org/jboss/test/TestJCEIntegration.java.orig Wed Apr 6 23:17:00 2005 +++ jboss-4.0.3RC1-src/security/src/main/org/jboss/test/TestJCEIntegration.java Wed Aug 10 20:27:56 2005 @@ -20,7 +20,7 @@ import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; -import org.apache.log4j.Category; +import org.apache.log4j.Logger; import org.apache.log4j.WriterAppender; import org.apache.log4j.NDC; import org.apache.log4j.PatternLayout; @@ -46,7 +46,7 @@ TestJCEIntegration() throws Exception { // Set up a simple configuration that logs on the console. - Category root = Category.getRoot(); + Logger root = Logger.getRootLogger(); root.setLevel(XLevel.TRACE); root.addAppender(new WriterAppender(new PatternLayout("%x%m%n"), System.out)); Util.init(); --- jboss-4.0.3RC1-src/security/src/main/org/jboss/test/TestProtocol.java.orig Wed Aug 27 06:31:51 2003 +++ jboss-4.0.3RC1-src/security/src/main/org/jboss/test/TestProtocol.java Wed Aug 10 21:14:37 2005 @@ -13,7 +13,6 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import org.apache.log4j.Category; import org.apache.log4j.ConsoleAppender; import org.apache.log4j.NDC; import org.apache.log4j.PatternLayout; @@ -142,7 +141,7 @@ protected void setUp() throws Exception { // Set up a simple configuration that logs on the console. - Category root = Category.getRoot(); + org.apache.log4j.Logger root = org.apache.log4j.Logger.getRootLogger(); root.setLevel(XLevel.TRACE); root.addAppender(new ConsoleAppender(new PatternLayout("%x%m%n"))); Util.init(); --- jboss-4.0.3RC1-src/security/src/main/org/jboss/test/TstClient.java.orig Wed Apr 6 23:17:00 2005 +++ jboss-4.0.3RC1-src/security/src/main/org/jboss/test/TstClient.java Wed Aug 10 20:30:20 2005 @@ -9,7 +9,7 @@ import java.io.IOException; import javax.naming.InitialContext; -import org.apache.log4j.Category; +import org.apache.log4j.Logger; import org.apache.log4j.ConsoleAppender; import org.apache.log4j.PatternLayout; @@ -34,7 +34,7 @@ String serviceName = args.length == 3 ? args[2] : "srp-test/SRPServerInterface"; // Set up a simple configuration that logs on the console. - Category root = Category.getRoot(); + Logger root = Logger.getRootLogger(); root.setLevel(XLevel.TRACE); root.addAppender(new ConsoleAppender(new PatternLayout("%x%m%n"))); --- jboss-4.0.3RC1-src/jboss.net/src/main/org/jboss/net/jmx/server/Constants.java.orig Fri Mar 26 04:56:48 2004 +++ jboss-4.0.3RC1-src/jboss.net/src/main/org/jboss/net/jmx/server/Constants.java Wed Aug 10 20:48:20 2005 @@ -9,7 +9,7 @@ package org.jboss.net.jmx.server; -import org.apache.log4j.Category; +import org.apache.log4j.Logger; /** * Some Constants for the jmx server package @@ -21,8 +21,8 @@ public interface Constants extends org.jboss.net.axis.server.Constants { - static final Category LOG = - Category.getInstance(Constants.class.getPackage().getName()); + static final Logger LOG = + Logger.getLogger(Constants.class.getPackage().getName()); static final String MBEAN_SERVER_ID_PROPERTY = "MBeanServerId"; static final String OBJECTNAME_PROPERTY = "ObjectName"; static final String WRONG_OBJECT_NAME = --- jboss-4.0.3RC1-src/remoting/src/main/org/jboss/remoting/detection/util/DetectorUtil.java.orig Thu Feb 24 17:42:27 2005 +++ jboss-4.0.3RC1-src/remoting/src/main/org/jboss/remoting/detection/util/DetectorUtil.java Wed Aug 10 20:52:58 2005 @@ -81,7 +81,7 @@ { org.apache.log4j.BasicConfigurator.configure(); - org.apache.log4j.Category.getRoot().setLevel(Level.DEBUG); + org.apache.log4j.Logger.getRootLogger().setLevel(Level.DEBUG); Logger log = Logger.getLogger(getClass()); System.setProperty("jboss.identity", String.valueOf(System.currentTimeMillis()));