From da7e56aba1993be9fe43106739f4262e97f5da06 Mon Sep 17 00:00:00 2001
From: BetaSteward <betasteward@gmail>
Date: Mon, 9 May 2011 23:04:05 -0400
Subject: [PATCH] changed logging to log4j

---
 .../interfaces/callback/CallbackClientDaemon.java     | 10 ++++------
 .../interfaces/callback/CallbackServerSession.java    | 11 +++++------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Mage.Common/src/mage/interfaces/callback/CallbackClientDaemon.java b/Mage.Common/src/mage/interfaces/callback/CallbackClientDaemon.java
index daf76cbb5d4..95a6ecdc40b 100644
--- a/Mage.Common/src/mage/interfaces/callback/CallbackClientDaemon.java
+++ b/Mage.Common/src/mage/interfaces/callback/CallbackClientDaemon.java
@@ -31,9 +31,7 @@ package mage.interfaces.callback;
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import mage.util.Logging;
+import org.apache.log4j.Logger;
 
 /**
  *
@@ -41,7 +39,7 @@ import mage.util.Logging;
  */
 public class CallbackClientDaemon extends Thread {
 
-	private final static Logger logger = Logging.getLogger(CallbackClientDaemon.class.getName());
+	private final static Logger logger = Logger.getLogger(CallbackClientDaemon.class);
 
 	private static ExecutorService callbackExecutor = Executors.newCachedThreadPool();
 	private final CallbackClient client;
@@ -69,14 +67,14 @@ public class CallbackClientDaemon extends Thread {
 							client.processCallback(callback);
 						}
 						catch (Exception ex) {
-							logger.log(Level.SEVERE, null, ex);
+							logger.fatal("CallbackClientDaemon error ", ex);
 						}
 					}
 				}
 			);
          }
       } catch(Exception ex) {
-			logger.log(Level.SEVERE, null, ex);
+			logger.fatal("CallbackClientDaemon error ", ex);
       }
    }
 }
diff --git a/Mage.Common/src/mage/interfaces/callback/CallbackServerSession.java b/Mage.Common/src/mage/interfaces/callback/CallbackServerSession.java
index 508a4a70fbf..63d9a813425 100644
--- a/Mage.Common/src/mage/interfaces/callback/CallbackServerSession.java
+++ b/Mage.Common/src/mage/interfaces/callback/CallbackServerSession.java
@@ -30,8 +30,7 @@ package mage.interfaces.callback;
 
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
-import java.util.logging.Logger;
-import mage.util.Logging;
+import org.apache.log4j.Logger;
 
 /**
  *
@@ -39,7 +38,7 @@ import mage.util.Logging;
  */
 public class CallbackServerSession {
 
-	private final static Logger logger = Logging.getLogger(CallbackServerSession.class.getName());
+	private final static Logger logger = Logger.getLogger(CallbackServerSession.class);
 
 	private final ClientCallback callback = new ClientCallback();
 	private final ReentrantLock lock = new ReentrantLock();
@@ -60,11 +59,11 @@ public class CallbackServerSession {
 			waitingForCallback = true;
 			waiting.signal();
 			while (callback.getMethod() == null) {
-				logger.finer("waiting for callback");
+				logger.trace("waiting for callback");
 				callbackCalled.await();
 			}
 			waitingForCallback = false;
-			logger.finer("callback called:" + callback.getMethod());
+			logger.trace("callback called:" + callback.getMethod());
 			return callback;
 		}
 		finally {
@@ -82,7 +81,7 @@ public class CallbackServerSession {
 		lock.lock();
 		try {
 			while (!waitingForCallback) {
-				logger.finer("waiting for callback state to call:" + call.getMethod());
+				logger.trace("waiting for callback state to call:" + call.getMethod());
 				waiting.await();
 			}
 			callback.setMethod(call.getMethod());