From 6f264162e943a39cab5cb36dd996c7e386c0f59c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 07 Feb 2014 09:59:52 +0000
Subject: [PATCH] OPENDJ-1307 Migrate server ASN1 classes to SDK

---
 opendj3-server-dev/src/server/org/opends/server/loggers/LoggingCategoryNames.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/LoggingCategoryNames.java b/opendj3-server-dev/src/server/org/opends/server/loggers/LoggingCategoryNames.java
index 182dec7..b0b08f1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/LoggingCategoryNames.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/LoggingCategoryNames.java
@@ -48,8 +48,15 @@
 
   static
   {
+    // catch all categories used when nothing else matches.
+    // FIXME catch all does not work with current code.
+    // Maybe should we use a trie data structure instead of a NavigableMap?
+    // NAMES.put("org.opends", "CORE");
+    // NAMES.put("org.forgerock.opendj", "CORE");
+
     // The category used for messages associated with the core server.
     NAMES.put("org.opends.server.core", "CORE");
+    NAMES.put("org.forgerock.opendj.ldap", "CORE");
 
     // The category used for messages associated with server
     //extensions (e.g., extended operations, SASL mechanisms, password storage
@@ -59,13 +66,12 @@
     // The category used for messages associated with
     // connection and protocol handling (e.g., ASN.1 and LDAP).
     NAMES.put("org.opends.server.protocol", "PROTOCOL");
+    NAMES.put("org.forgerock.opendj.ldap.io", "PROTOCOL");
 
-    // The category used for messages associated with
-    // configuration handling.
+    // The category used for messages associated with configuration handling.
     NAMES.put("org.opends.server.config", "CONFIG");
 
-    // The category used for messages associated with the
-    // server loggers.
+    // The category used for messages associated with the server loggers.
     NAMES.put("org.opends.server.loggers", "LOG");
 
     // The category used for messages associated with the
@@ -75,6 +81,11 @@
     // The category used for messages associated with the
     // server schema elements.
     NAMES.put("org.opends.server.schema", "SCHEMA");
+    NAMES.put("org.forgerock.opendj.ldap.schema", "SCHEMA");
+
+    // The category used for messages associated with the server controls.
+    NAMES.put("org.opends.server.controls", "CONTROLS");
+    NAMES.put("org.forgerock.opendj.ldap.controls", "CONTROLS");
 
     // The category that will be used for messages associated with plugin
     // processing.

--
Gitblit v1.10.0