From 4a7d8662e91fe118759ceb933cae375e787e57d2 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 18 Feb 2014 14:14:43 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/LoggingCategoryNames.java | 6 ------
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/loggers/LoggingCategoryNamesTest.java | 9 +++++++++
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/LoggingCategoryNames.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/LoggingCategoryNames.java
index 27f2e08..681d9f3 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/LoggingCategoryNames.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/LoggingCategoryNames.java
@@ -48,12 +48,6 @@
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");
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/loggers/LoggingCategoryNamesTest.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/loggers/LoggingCategoryNamesTest.java
index 6e7b237..30269a2 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/loggers/LoggingCategoryNamesTest.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/loggers/LoggingCategoryNamesTest.java
@@ -73,4 +73,13 @@
{
assertEquals(LoggingCategoryNames.getCategoryName(classname), classname);
}
+
+ @Test
+ public void testSubPackages() throws Exception
+ {
+ assertEquals(LoggingCategoryNames.getCategoryName("org.opends.server.backends.jeb.foo"), "JEB");
+ assertEquals(LoggingCategoryNames.getCategoryName("org.opends.server.backends.jeb"), "JEB");
+ assertEquals(LoggingCategoryNames.getCategoryName("org.opends.server.backends"), "BACKEND");
+ assertEquals(LoggingCategoryNames.getCategoryName("org.opends.server"), "org.opends.server");
+ }
}
--
Gitblit v1.10.0