From 776b453c9108faff0ce6929f1ff8f74cce927c2f Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Thu, 30 Jan 2014 14:40:37 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/OpenDJLoggerFactory.java | 4 ++--
opendj-slf4j-adapter/src/main/java/org/slf4j/impl/package-info.java | 3 ++-
opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 1 +
opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/OpenDJLoggerAdapter.java | 17 ++++++++---------
opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/package-info.java | 30 ++++++++++++++++++++++++++++++
5 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/OpenDJLoggerAdapter.java b/opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/OpenDJLoggerAdapter.java
similarity index 96%
rename from opendj-slf4j-adapter/src/main/java/org/slf4j/impl/OpenDJLoggerAdapter.java
rename to opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/OpenDJLoggerAdapter.java
index 5508f94..0398429 100644
--- a/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/OpenDJLoggerAdapter.java
+++ b/opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/OpenDJLoggerAdapter.java
@@ -23,15 +23,11 @@
*
* Copyright 2014 ForgeRock AS.
*/
-package org.slf4j.impl;
+package org.opends.server.loggers;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedMarker;
import org.opends.messages.Severity;
-import org.opends.server.loggers.ErrorLogger;
-import org.opends.server.loggers.debug.DebugLogger;
-import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.DebugLogLevel;
import org.slf4j.Logger;
import org.slf4j.Marker;
@@ -59,8 +55,11 @@
* The name of logger.
*/
public OpenDJLoggerAdapter(final String name) {
- this.name = name;
+ // Tracer always use the provided name
+ // which should be a classname
this.tracer = DebugLogger.getTracer(name);
+ // Name is simplified if possible
+ this.name = LoggingCategoryNames.getCategoryName(name);
}
/** {@inheritDoc} */
@@ -71,13 +70,13 @@
/** Trace with message only. */
private void logTraceMessage(String msg) {
- tracer.debugMessage(DebugLogLevel.VERBOSE, msg);
+ tracer.trace(msg);
}
/** Trace with message and exception. */
- private void logTraceException(@SuppressWarnings("unused") String message, Throwable t) {
- tracer.debugCaught(DebugLogLevel.VERBOSE, t);
+ private void logTraceException(String message, Throwable t) {
+ tracer.traceException(message, t);
}
/**
diff --git a/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/OpenDJLoggerFactory.java b/opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/OpenDJLoggerFactory.java
similarity index 94%
rename from opendj-slf4j-adapter/src/main/java/org/slf4j/impl/OpenDJLoggerFactory.java
rename to opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/OpenDJLoggerFactory.java
index a1c9e97..d651c30 100644
--- a/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/OpenDJLoggerFactory.java
+++ b/opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/OpenDJLoggerFactory.java
@@ -23,7 +23,7 @@
*
* Copyright 2014 ForgeRock AS.
*/
-package org.slf4j.impl;
+package org.opends.server.loggers;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -34,7 +34,7 @@
/**
* Factory to retrieve an openDJ implementation of SLF4J Logger.
*/
-final class OpenDJLoggerFactory implements ILoggerFactory {
+public final class OpenDJLoggerFactory implements ILoggerFactory {
private final ConcurrentMap<String, Logger> loggerMap;
diff --git a/opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/package-info.java b/opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/package-info.java
new file mode 100644
index 0000000..32d8724
--- /dev/null
+++ b/opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/package-info.java
@@ -0,0 +1,30 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2014 ForgeRock AS.
+ */
+
+/**
+ * Classes implementing a SLF4J Logging Adapter for OpenDJ server.
+ */
+package org.opends.server.loggers;
diff --git a/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
index ab249ab..9fb5365 100644
--- a/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
+++ b/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
@@ -25,6 +25,7 @@
*/
package org.slf4j.impl;
+import org.opends.server.loggers.OpenDJLoggerFactory;
import org.slf4j.ILoggerFactory;
import org.slf4j.LoggerFactory;
import org.slf4j.spi.LoggerFactoryBinder;
diff --git a/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/package-info.java b/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/package-info.java
index 38ee4e3..392a2b4 100644
--- a/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/package-info.java
+++ b/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/package-info.java
@@ -25,6 +25,7 @@
*/
/**
- * Classes implementing a SLF4J Logging Adapter for OpenDJ server.
+ * Classes needed by SLF4J to choose actual implementation of SLF4J API.
*/
package org.slf4j.impl;
+
--
Gitblit v1.10.0