From: Scott M S. <st...@us...> - 2004-04-15 03:32:45
|
User: starksm Date: 04/04/14 20:32:39 Modified: src/main/org/jnp/server Tag: Branch_3_2 Main.java Log: Replace the explicit use of log4j with org.jboss.logging.Logger. Revision Changes Path No revision No revision 1.12.2.8 +4 -14 jnp/src/main/org/jnp/server/Main.java Index: Main.java =================================================================== RCS file: /cvsroot/jboss/jnp/src/main/org/jnp/server/Main.java,v retrieving revision 1.12.2.7 retrieving revision 1.12.2.8 diff -u -r1.12.2.7 -r1.12.2.8 --- Main.java 15 Mar 2004 13:38:43 -0000 1.12.2.7 +++ Main.java 15 Apr 2004 03:32:38 -0000 1.12.2.8 @@ -14,7 +14,6 @@ import java.net.Socket; import java.net.ServerSocket; import java.net.UnknownHostException; -import java.net.URL; import java.rmi.Remote; import java.rmi.MarshalledObject; import java.rmi.server.RMIClientSocketFactory; @@ -23,11 +22,9 @@ import java.lang.reflect.Method; import javax.net.ServerSocketFactory; -import org.apache.log4j.Category; -import org.apache.log4j.PropertyConfigurator; - import org.jnp.interfaces.Naming; import org.jnp.interfaces.NamingContext; +import org.jboss.logging.Logger; import org.jboss.net.sockets.DefaultSocketFactory; /** A main() entry point for running the jnp naming service implementation as @@ -35,7 +32,7 @@ @author oberg @author Sco...@jb... - @version $Revision: 1.12.2.7 $ + @version $Revision: 1.12.2.8 $ */ public class Main implements Runnable, MainMBean { @@ -77,19 +74,12 @@ protected int rmiPort = 0; /** A flag indicating if theServer will be set as the NamingContext.setLocal value */ protected boolean InstallGlobalService = true; - protected Category log; + protected Logger log; // Static -------------------------------------------------------- public static void main(String[] args) throws Exception { - // Make sure the config file can be found - ClassLoader loader = Thread.currentThread().getContextClassLoader(); - URL url = loader.getResource("log4j.properties"); - if( url == null ) - System.err.println("Failed to find log4j.properties"); - else - PropertyConfigurator.configure(url); new Main().start(); } @@ -115,7 +105,7 @@ // Set configuration from the system properties setPort(Integer.getInteger("jnp.port",getPort()).intValue()); setRmiPort(Integer.getInteger("jnp.rmiPort",getRmiPort()).intValue()); - log = Category.getInstance(categoryName); + log = Logger.getLogger(categoryName); } // Public -------------------------------------------------------- |