ceki 2004/05/28 07:51:13
Modified: src/java/org/apache/log4j/net JMSSink.java
SimpleSocketServer.java
src/java/org/apache/log4j/joran JoranConfigurator.java
src/java/org/apache/log4j Category.java
Log:
- Cosmetic changes.
- Removed the last static configure() method in JoranConfigurator
Revision Changes Path
1.16 +4 -1 logging-log4j/src/java/org/apache/log4j/net/JMSSink.java
Index: JMSSink.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/JMSSink.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JMSSink.java 26 May 2004 17:19:37 -0000 1.15
+++ JMSSink.java 28 May 2004 14:51:13 -0000 1.16
@@ -9,6 +9,7 @@
import org.apache.log4j.joran.JoranConfigurator;
import org.apache.log4j.spi.LoggingEvent;
+import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
@@ -56,7 +57,9 @@
String configFile = args[4];
if(configFile.endsWith(".xml")) {
- JoranConfigurator.configure(configFile);
+ JoranConfigurator jc = new JoranConfigurator();
+ jc.doConfigure(configFile, LogManager.getLoggerRepository());
+ jc.logErrors();
} else {
PropertyConfigurator.configure(configFile);
}
1.8 +41 -33
logging-log4j/src/java/org/apache/log4j/net/SimpleSocketServer.java
Index: SimpleSocketServer.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/SimpleSocketServer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SimpleSocketServer.java 26 May 2004 17:19:37 -0000 1.7
+++ SimpleSocketServer.java 28 May 2004 14:51:13 -0000 1.8
@@ -1,20 +1,29 @@
/*
- * 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 org.apache.log4j.Category;
import org.apache.log4j.LogManager;
import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.joran.JoranConfigurator;
+import java.net.ServerSocket;
+import java.net.Socket;
+
/**
* A simple [EMAIL PROTECTED] SocketNode} based server.
@@ -29,58 +38,57 @@
*
* @author Ceki Gülcü
*
- * @since 0.8.4
+ * @since 0.8.4
* */
-public class SimpleSocketServer {
-
- static Category cat = Category.getInstance(SimpleSocketServer.class.getName());
-
+public class SimpleSocketServer {
+ static Category cat =
+ Category.getInstance(SimpleSocketServer.class.getName());
static int port;
- public
- static
- void main(String argv[]) {
- if(argv.length == 2) {
+ public static void main(String[] argv) {
+ if (argv.length == 2) {
init(argv[0], argv[1]);
} else {
usage("Wrong number of arguments.");
}
-
+
try {
cat.info("Listening on port " + port);
+
ServerSocket serverSocket = new ServerSocket(port);
- while(true) {
- cat.info("Waiting to accept a new client.");
- Socket socket = serverSocket.accept();
- cat.info("Connected to client at " + socket.getInetAddress());
- cat.info("Starting new socket node.");
- new Thread(new SocketNode(socket,
- LogManager.getLoggerRepository())).start();
+
+ while (true) {
+ cat.info("Waiting to accept a new client.");
+
+ Socket socket = serverSocket.accept();
+ cat.info("Connected to client at " + socket.getInetAddress());
+ cat.info("Starting new socket node.");
+ new Thread(new SocketNode(socket, LogManager.getLoggerRepository()))
+ .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 " +SimpleSocketServer.class.getName() + " port configFile");
+ "Usage: java " + SimpleSocketServer.class.getName() + " port configFile");
System.exit(1);
}
static void init(String portStr, String configFile) {
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 + "].");
}
-
- if(configFile.endsWith(".xml")) {
+
+ if (configFile.endsWith(".xml")) {
JoranConfigurator jc = new JoranConfigurator();
- jc.doConfigure(configFile, LogManager.getLoggerRepository());
+ jc.doConfigure(configFile, LogManager.getLoggerRepository());
} else {
PropertyConfigurator.configure(configFile);
}
1.12 +4 -21
logging-log4j/src/java/org/apache/log4j/joran/JoranConfigurator.java
Index: JoranConfigurator.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/JoranConfigurator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JoranConfigurator.java 26 May 2004 17:56:18 -0000 1.11
+++ JoranConfigurator.java 28 May 2004 14:51:13 -0000 1.12
@@ -35,7 +35,6 @@
import org.apache.joran.action.NewRuleAction;
import org.apache.joran.action.ParamAction;
import org.apache.joran.helper.SimpleRuleStore;
-import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
//import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.joran.action.ActionConst;
@@ -78,17 +77,6 @@
selfInitialize();
}
- /**
- *
- *
- * @param filename
- */
- //public static void configure(URL url) {
- //xx JoranConfigurator jc = new JoranConfigurator();
- //jc.doConfigure(url, LogManager.getLoggerRepository());
- //}
-
-
public void doConfigure(URL url, LoggerRepository repository) {
ExecutionContext ec = joranInterpreter.getExecutionContext();
String errMsg;
@@ -105,15 +93,10 @@
//Use the instance from [EMAIL PROTECTED] #doConfigure(String,
LoggingRepository)} instead
- /**
- *
- *
- * @param filename
- */
- public static void configure(String filename) {
- JoranConfigurator jc = new JoranConfigurator();
- jc.doConfigure(filename, LogManager.getLoggerRepository());
- }
+// public static void configure(String filename) {
+// JoranConfigurator jc = new JoranConfigurator();
+// jc.doConfigure(filename, LogManager.getLoggerRepository());
+// }
/**
* Configure a repository from a configuration file passed as parameter.
1.84 +9 -9 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.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- Category.java 19 May 2004 14:36:22 -0000 1.83
+++ Category.java 28 May 2004 14:51:13 -0000 1.84
@@ -1065,15 +1065,15 @@
this.level = level;
}
- /**
- * Set the level of this Category.
- *
- * <p>
- * Null values are admitted.
- * </p>
- *
- * @deprecated Please use [EMAIL PROTECTED] #setLevel} instead.
- */
+// /**
+// * Set the level of this Category.
+// *
+// * <p>
+// * Null values are admitted.
+// * </p>
+// *
+// * @deprecated Please use [EMAIL PROTECTED] #setLevel} instead.
+// */
// public void setPriority(Priority priority) {
// this.level = (Level) priority;
// }
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
