From 39be274a446bc48400fb0f4ff8ec74b54883f7a6 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 12 Feb 2014 10:55:00 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 :    Migrate I18n and logging support to i18n framework and SLF4J

---
 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ControlPanelLog.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ControlPanelLog.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ControlPanelLog.java
index b908582..1a879c7 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ControlPanelLog.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ControlPanelLog.java
@@ -33,7 +33,7 @@
 import java.util.Date;
 import java.text.DateFormat;
 
-import org.opends.server.loggers.JdkLoggingFormater;
+import org.opends.server.loggers.JDKLogging;
 
 /**
  * Utilities for setting up Control Panel application log.
@@ -57,18 +57,21 @@
     {
       logFile = file;
       fileHandler = new FileHandler(logFile.getCanonicalPath());
-      fileHandler.setFormatter(new JdkLoggingFormater());
-      for (String packageName : packages)
+      fileHandler.setFormatter(JDKLogging.getFormatter());
+      boolean initialLogDone = false;
+      for (String root : JDKLogging.getOpendDJLoggingRoots())
       {
-        Logger logger = Logger.getLogger(packageName);
+        Logger logger = Logger.getLogger(root);
         if (disableLoggingToConsole())
         {
           logger.setUseParentHandlers(false); // disable logging to console
         }
         logger.addHandler(fileHandler);
+        if (!initialLogDone) {
+          logger.info(getInitialLogRecord());
+          initialLogDone = true;
+        }
       }
-      Logger logger = Logger.getLogger(packages[0]);
-      logger.info(getInitialLogRecord());
     }
   }
 

--
Gitblit v1.10.0