From 19ce4ef105e1929c42aaf5c86bc51f085ad4118a Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 13 Feb 2015 20:21:13 +0000
Subject: [PATCH] OPENDJ-1777 Merged opendj-slf4j-adapter module into opendj-server-legacy in order to avoid cyclic dependencies
---
/dev/null | 30 ----------
opendj-server-legacy/pom.xml | 35 +++++++----
opendj-server-legacy/src/main/assembly/opendj-archive-component.xml | 51 +++++-----------
opendj-server-legacy/src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 3
opendj-server-legacy/src/main/java/org/slf4j/impl/StaticMarkerBinder.java | 3
opendj-server-legacy/src/main/java/org/slf4j/impl/StaticMDCBinder.java | 4 -
opendj-server-legacy/src/main/java/org/slf4j/impl/package-info.java | 0
opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateManifestClassPathMojo.java | 11 +++
pom.xml | 1
9 files changed, 52 insertions(+), 86 deletions(-)
diff --git a/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateManifestClassPathMojo.java b/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateManifestClassPathMojo.java
index 7ac5c1f..a2a18f2 100644
--- a/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateManifestClassPathMojo.java
+++ b/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateManifestClassPathMojo.java
@@ -82,6 +82,12 @@
private List<String> includes;
/**
+ * List of additional JARs to include in the classpath. Each item must be of format "file.jar".
+ */
+ @Parameter
+ private List<String> additionalJars;
+
+ /**
* Name of product jar, e.g. "OpenDJ".
*/
@Parameter
@@ -158,6 +164,11 @@
}
classpathItems.add(0, productJarName + ".jar");
}
+ // add additional JARs
+ if (additionalJars != null) {
+ classpathItems.addAll(additionalJars);
+ }
+
return classpathItems;
}
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index 478bd2d..6a53e66 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -94,17 +94,6 @@
</dependency>
<dependency>
<groupId>org.forgerock.opendj</groupId>
- <artifactId>opendj-slf4j-adapter</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.forgerock.opendj</groupId>
- <artifactId>opendj3-server-dev</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-config</artifactId>
<version>${project.version}</version>
</dependency>
@@ -376,6 +365,9 @@
<excludes>
<exclude>org.slf4j:slf4j-jdk14</exclude>
</excludes>
+ <additionalJars>
+ <additionalJar>opendj-slf4j-adapter.jar</additionalJar>
+ </additionalJars>
</configuration>
</execution>
<execution>
@@ -387,9 +379,6 @@
<classPathProperty>classpath.bootstrap-client</classPathProperty>
<productJarName>${shortProductName}</productJarName>
<supportedLocales>${locales}</supportedLocales>
- <excludes>
- <exclude>org.forgerock.opendj:opendj-slf4j-adapter</exclude>
- </excludes>
</configuration>
</execution>
@@ -661,6 +650,22 @@
</includes>
</configuration>
</execution>
+ <!-- Package OpenDJ SL4J Logger Adapter jar -->
+ <execution>
+ <id>build-opendj-slf4j-adapter-jar</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${jars.dir}</outputDirectory>
+ <finalName>opendj-slf4j-adapter</finalName>
+ <includes>
+ <include>**/org/slf4j/**</include>
+ <include>**/org/opends/server/loggers/OpenDJLogger*</include>
+ </includes>
+ </configuration>
+ </execution>
<!-- Build localized jars (one per supported locale) -->
<!-- (is there a way to avoid all these repeated executions ?) -->
<execution>
@@ -852,6 +857,8 @@
<exclude>**/*_pl.properties</exclude>
<exclude>**/*_zh_CN.properties</exclude>
<exclude>**/*_zh_TW.properties</exclude>
+ <exclude>org/slf4j/**</exclude>
+ <exclude>org/opends/server/loggers/OpenDJLogger*</exclude>
</excludes>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
diff --git a/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml b/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
index a9a239b..6ec70d1 100644
--- a/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
+++ b/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
@@ -64,7 +64,7 @@
<exclude>_*.sh</exclude>
<exclude>*.bat</exclude>
</excludes>
- <fileMode>755</fileMode>
+ <fileMode>755</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
@@ -115,7 +115,7 @@
<fileMode>755</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
-
+
<!-- Adds Mac Info.plist files at the archive root -->
<fileSet>
<directory>${project.build.outputDirectory}</directory>
@@ -250,16 +250,9 @@
<fileSet>
<directory>${jars.dir}</directory>
<outputDirectory>lib</outputDirectory>
- <includes>
- <include>${shortProductName}_*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${jars.dir}</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>bootstrap*.jar</include>
- </includes>
+ <excludes>
+ <exclude>build-tools.jar</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>.</directory>
@@ -269,37 +262,27 @@
</excludes>
</fileSet>
</fileSets>
- <files>
- <!-- Adds logo png to root directory -->
- <file>
- <source>${basedir}/resource/images/opendj_logo.png</source>
- <outputDirectory></outputDirectory>
- </file>
- <!-- Main jar (OpenDJ) -->
+ <files>
+ <!-- Adds logo png to root directory -->
<file>
- <source>${jars.dir}/${shortProductName}.jar</source>
- <outputDirectory>lib</outputDirectory>
+ <source>${basedir}/resource/images/opendj_logo.png</source>
+ <outputDirectory></outputDirectory>
</file>
- <!-- quicksetup jar -->
+ <!-- Adds buildinfo to configuration template/config -->
<file>
- <source>${jars.dir}/quicksetup.jar</source>
- <outputDirectory>lib</outputDirectory>
- </file>
- <!-- Adds buildinfo to configuration template/config -->
- <file>
- <source>${project.build.outputDirectory}/META-INF/product/buildinfo</source>
- <outputDirectory>template/config</outputDirectory>
+ <source>${project.build.outputDirectory}/META-INF/product/buildinfo</source>
+ <outputDirectory>template/config</outputDirectory>
</file>
<!-- Adds base schema that may be used during the upgrade process -->
<file>
- <source>${project.build.directory}/upgrade/schema.ldif.${buildRevision}</source>
- <outputDirectory>template/config/upgrade</outputDirectory>
+ <source>${project.build.directory}/upgrade/schema.ldif.${buildRevision}</source>
+ <outputDirectory>template/config/upgrade</outputDirectory>
</file>
<!-- Adds example-plugin.zip to root directory -->
<file>
- <source>${project.build.directory}/example-plugin.zip</source>
- <outputDirectory></outputDirectory>
+ <source>${project.build.directory}/example-plugin.zip</source>
+ <outputDirectory></outputDirectory>
</file>
- </files>
+ </files>
</component>
diff --git a/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/opendj-server-legacy/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
similarity index 95%
rename from opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
rename to opendj-server-legacy/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
index 2814f33..8539676 100644
--- a/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
+++ b/opendj-server-legacy/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
@@ -27,11 +27,10 @@
import org.opends.server.loggers.OpenDJLoggerFactory;
import org.slf4j.ILoggerFactory;
-import org.slf4j.LoggerFactory;
import org.slf4j.spi.LoggerFactoryBinder;
/**
- * Binds {@link LoggerFactory} class with an instance of {@link ILoggerFactory}.
+ * Binds {@link org.slf4j.LoggerFactory} class with an instance of {@link ILoggerFactory}.
*/
//@Checkstyle:off
public class StaticLoggerBinder implements LoggerFactoryBinder {
diff --git a/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticMDCBinder.java b/opendj-server-legacy/src/main/java/org/slf4j/impl/StaticMDCBinder.java
similarity index 91%
rename from opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticMDCBinder.java
rename to opendj-server-legacy/src/main/java/org/slf4j/impl/StaticMDCBinder.java
index ea3f532..b05eb77 100644
--- a/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticMDCBinder.java
+++ b/opendj-server-legacy/src/main/java/org/slf4j/impl/StaticMDCBinder.java
@@ -25,13 +25,11 @@
*/
package org.slf4j.impl;
-import org.slf4j.IMarkerFactory;
-import org.slf4j.MarkerFactory;
import org.slf4j.helpers.BasicMDCAdapter;
import org.slf4j.spi.MDCAdapter;
/**
- * Binds {@link MarkerFactory} class with an instance of {@link IMarkerFactory}.
+ * Binds {@link org.slf4j.MarkerFactory} class with an instance of {@link org.slf4j.IMarkerFactory}.
*/
//@Checkstyle:off
public class StaticMDCBinder {
diff --git a/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticMarkerBinder.java b/opendj-server-legacy/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
similarity index 93%
rename from opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
rename to opendj-server-legacy/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
index 7447760..7735969 100644
--- a/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
+++ b/opendj-server-legacy/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
@@ -26,12 +26,11 @@
package org.slf4j.impl;
import org.slf4j.IMarkerFactory;
-import org.slf4j.MarkerFactory;
import org.slf4j.helpers.BasicMarkerFactory;
import org.slf4j.spi.MarkerFactoryBinder;
/**
- * Binds {@link MarkerFactory} class with an instance of {@link IMarkerFactory}.
+ * Binds {@link org.slf4j.MarkerFactory} class with an instance of {@link IMarkerFactory}.
*/
//@Checkstyle:off
public class StaticMarkerBinder implements MarkerFactoryBinder {
diff --git a/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/package-info.java b/opendj-server-legacy/src/main/java/org/slf4j/impl/package-info.java
similarity index 100%
rename from opendj-slf4j-adapter/src/main/java/org/slf4j/impl/package-info.java
rename to opendj-server-legacy/src/main/java/org/slf4j/impl/package-info.java
diff --git a/opendj-slf4j-adapter/pom.xml b/opendj-slf4j-adapter/pom.xml
deleted file mode 100644
index 51554b4..0000000
--- a/opendj-slf4j-adapter/pom.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ! 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
- !
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>opendj-project</artifactId>
- <groupId>org.forgerock.opendj</groupId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>opendj-slf4j-adapter</artifactId>
- <name>OpenDJ SLF4J Adapter</name>
- <description>
- This module includes an adapter to SLF4J library which maps SLF4J API
- to OpenDJ logging classes.
- </description>
- <packaging>jar</packaging>
- <dependencies>
- <dependency>
- <groupId>org.forgerock.commons</groupId>
- <artifactId>i18n-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.forgerock.commons</groupId>
- <artifactId>i18n-slf4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.forgerock.opendj</groupId>
- <artifactId>opendj3-server-dev</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>mailing-list</report>
- <report>issue-tracking</report>
- <report>license</report>
- <report>cim</report>
- <report>distribution-management</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <links>
- <link>http://commons.forgerock.org/i18n-framework/i18n-core/apidocs</link>
- </links>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
\ No newline at end of file
diff --git a/opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/OpenDJLoggerAdapter.java b/opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/OpenDJLoggerAdapter.java
deleted file mode 100644
index 213c784..0000000
--- a/opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/OpenDJLoggerAdapter.java
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
- * 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.
- */
-package org.opends.server.loggers;
-
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.slf4j.LocalizedMarker;
-import org.opends.messages.Severity;
-import org.slf4j.Logger;
-import org.slf4j.Marker;
-
-/**
- * OpenDJ implementation of a SLF4J Logger.
- * <p>
- * Log calls at trace level are redirected to {@code DebugLogger}, while calls
- * at other levels are redirected to {@code ErrorLogger}.
- * <p>
- * Trace level calls are accepted with no Marker argument, while calls at other
- * level must be done with a Marker expected to be an instance of
- * {@code LocalizedMarker}.
- */
-final class OpenDJLoggerAdapter implements Logger {
- /** Name of logger, used as the category. */
- private final String name;
-
- /** The tracer associated to this logger. */
- private final DebugTracer tracer;
-
- /**
- * Creates a new logger with the provided name.
- *
- * @param name
- * The name of logger.
- */
- public OpenDJLoggerAdapter(final String 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} */
- @Override
- public String getName() {
- return name;
- }
-
- /** Trace with message only. */
- private void logTraceMessage(String msg) {
- tracer.trace(msg);
- }
-
- /** Trace with message and exception. */
- private void logTraceException(String message, Throwable t) {
- tracer.traceException(message, t);
- }
-
- /**
- * Log a message to {@code ErrorLogger} with the provided severity,
- * extracting {@code LocalizableMessage} from the provided
- * {@code Marker marker} argument.
- *
- * @param marker
- * The marker, expected to be an instance of
- * {@code LocalizedMarker} class, from which message to log is
- * extracted.
- * @param severity
- * The severity to use when logging message.
- * @param throwable
- * Exception to log. May be {@code null}.
- */
- private void logError(Marker marker, Severity severity, Throwable throwable) {
- if (marker instanceof LocalizedMarker) {
- LocalizableMessage message = ((LocalizedMarker) marker).getMessage();
- ErrorLogger.log(name, severity, message, throwable);
- } else {
- throw new IllegalStateException("Expecting the marker to be an instance of LocalizedMarker");
- }
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isTraceEnabled() {
- return DebugLogger.debugEnabled() && tracer.enabled();
- }
-
- /** {@inheritDoc} */
- @Override
- public void trace(String msg) {
- logTraceMessage(msg);
- }
-
- /** {@inheritDoc} */
- @Override
- public void trace(Marker marker, String msg) {
- logTraceMessage(msg);
- }
-
- /** {@inheritDoc} */
- @Override
- public void trace(String msg, Throwable t) {
- logTraceException(msg, t);
- }
-
- /** {@inheritDoc} */
- @Override
- public void trace(Marker marker, String msg, Throwable t) {
- logTraceException(msg, t);
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isDebugEnabled() {
- return ErrorLogger.isEnabledFor(name, Severity.INFORMATION);
- }
-
- /** {@inheritDoc} */
- @Override
- public void debug(Marker marker, String msg) {
- logError(marker, Severity.INFORMATION, null);
- }
-
- /** {@inheritDoc} */
- @Override
- public void debug(Marker marker, String msg, Throwable t) {
- logError(marker, Severity.INFORMATION, t);
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isInfoEnabled() {
- return ErrorLogger.isEnabledFor(name, Severity.NOTICE);
- }
-
- /** {@inheritDoc} */
- @Override
- public void info(Marker marker, String msg) {
- logError(marker, Severity.NOTICE, null);
- }
-
- /** {@inheritDoc} */
- @Override
- public void info(Marker marker, String msg, Throwable t) {
- logError(marker, Severity.NOTICE, t);
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isWarnEnabled() {
- return ErrorLogger.isEnabledFor(name, Severity.WARNING);
- }
-
- /** {@inheritDoc} */
- @Override
- public void warn(Marker marker, String msg) {
- logError(marker, Severity.WARNING, null);
- }
-
- /** {@inheritDoc} */
- @Override
- public void warn(Marker marker, String msg, Throwable t) {
- logError(marker, Severity.WARNING, t);
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isErrorEnabled() {
- return ErrorLogger.isEnabledFor(name, Severity.ERROR);
- }
-
- /** {@inheritDoc} */
- @Override
- public void error(Marker marker, String msg) {
- logError(marker, Severity.ERROR, null);
- }
-
- /** {@inheritDoc} */
- @Override
- public void error(Marker marker, String msg, Throwable t) {
- logError(marker, Severity.ERROR, t);
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isTraceEnabled(Marker marker) {
- return isTraceEnabled();
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isDebugEnabled(Marker marker) {
- return isDebugEnabled();
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isInfoEnabled(Marker marker) {
- return isInfoEnabled();
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isWarnEnabled(Marker marker) {
- return isWarnEnabled();
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isErrorEnabled(Marker marker) {
- return isErrorEnabled();
- }
-
- /** {@inheritDoc} */
- @Override
- public void trace(String format, Object arg) {
- throw new UnsupportedOperationException("Use #trace(String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void trace(String format, Object arg1, Object arg2) {
- throw new UnsupportedOperationException("Use #trace(String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void trace(String format, Object... argArray) {
- throw new UnsupportedOperationException("Use #trace(String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void trace(Marker marker, String format, Object arg) {
- throw new UnsupportedOperationException("Use #trace(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void trace(Marker marker, String format, Object arg1, Object arg2) {
- throw new UnsupportedOperationException("Use #trace(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void trace(Marker marker, String format, Object... argArray) {
- throw new UnsupportedOperationException("Use #trace(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void debug(String msg) {
- throw new UnsupportedOperationException("Use #debug(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void debug(String format, Object arg) {
- throw new UnsupportedOperationException("Use #debug(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void debug(String format, Object arg1, Object arg2) {
- throw new UnsupportedOperationException("Use #debug(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void debug(String format, Object... argArray) {
- throw new UnsupportedOperationException("Use #debug(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void debug(String msg, Throwable t) {
- throw new UnsupportedOperationException("Use #debug(Marker, String, Throwable) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void debug(Marker marker, String format, Object arg) {
- throw new UnsupportedOperationException("Use #debug(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void debug(Marker marker, String format, Object arg1, Object arg2) {
- throw new UnsupportedOperationException("Use #debug(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void debug(Marker marker, String format, Object... arguments) {
- throw new UnsupportedOperationException("Use #debug(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void info(String msg) {
- throw new UnsupportedOperationException("Use #info(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void info(String format, Object arg) {
- throw new UnsupportedOperationException("Use #info(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void info(String format, Object arg1, Object arg2) {
- throw new UnsupportedOperationException("Use #info(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void info(String format, Object... argArray) {
- throw new UnsupportedOperationException("Use #info(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void info(String msg, Throwable t) {
- throw new UnsupportedOperationException("Use #info(Marker, String, Throwable) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void info(Marker marker, String format, Object arg) {
- throw new UnsupportedOperationException("Use #info(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void info(Marker marker, String format, Object arg1, Object arg2) {
- throw new UnsupportedOperationException("Use #info(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void info(Marker marker, String format, Object... arguments) {
- throw new UnsupportedOperationException("Use #info(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void warn(String msg) {
- throw new UnsupportedOperationException("Use #warn(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void warn(String format, Object arg) {
- throw new UnsupportedOperationException("Use #warn(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void warn(String format, Object arg1, Object arg2) {
- throw new UnsupportedOperationException("Use #warn(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void warn(String format, Object... argArray) {
- throw new UnsupportedOperationException("Use #warn(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void warn(String msg, Throwable t) {
- throw new UnsupportedOperationException("Use #warn(Marker, String, Throwable) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void warn(Marker marker, String format, Object arg) {
- throw new UnsupportedOperationException("Use #warn(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void warn(Marker marker, String format, Object arg1, Object arg2) {
- throw new UnsupportedOperationException("Use #warn(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void warn(Marker marker, String format, Object... arguments) {
- throw new UnsupportedOperationException("Use #warn(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void error(String msg) {
- throw new UnsupportedOperationException("Use #error(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void error(String format, Object arg) {
- throw new UnsupportedOperationException("Use #error(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void error(String format, Object arg1, Object arg2) {
- throw new UnsupportedOperationException("Use #error(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void error(String format, Object... arguments) {
- throw new UnsupportedOperationException("Use #error(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void error(String msg, Throwable t) {
- throw new UnsupportedOperationException("Use #error(Marker, String, Throwable) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void error(Marker marker, String format, Object arg) {
- throw new UnsupportedOperationException("Use #error(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void error(Marker marker, String format, Object arg1, Object arg2) {
- throw new UnsupportedOperationException("Use #error(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void error(Marker marker, String format, Object... arguments) {
- throw new UnsupportedOperationException("Use #error(Marker, String) instead.");
- }
-}
diff --git a/opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/OpenDJLoggerFactory.java b/opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/OpenDJLoggerFactory.java
deleted file mode 100644
index d651c30..0000000
--- a/opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/OpenDJLoggerFactory.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.
- */
-package org.opends.server.loggers;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import org.slf4j.ILoggerFactory;
-import org.slf4j.Logger;
-
-/**
- * Factory to retrieve an openDJ implementation of SLF4J Logger.
- */
-public final class OpenDJLoggerFactory implements ILoggerFactory {
-
- private final ConcurrentMap<String, Logger> loggerMap;
-
- /**
- * Create the factory.
- */
- public OpenDJLoggerFactory() {
- loggerMap = new ConcurrentHashMap<String, Logger>();
- }
-
- /** {@inheritDoc} */
- public Logger getLogger(String name) {
- if (name.equalsIgnoreCase(Logger.ROOT_LOGGER_NAME)) {
- name = "org.forgerock";
- }
-
- Logger slf4jLogger = loggerMap.get(name);
- if (slf4jLogger != null) {
- return slf4jLogger;
- }
- Logger newInstance = new OpenDJLoggerAdapter(name);
- Logger oldInstance = loggerMap.putIfAbsent(name, newInstance);
- return oldInstance == null ? newInstance : oldInstance;
- }
-}
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
deleted file mode 100644
index 32d8724..0000000
--- a/opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/package-info.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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/pom.xml b/pom.xml
index c04aa99..f3c8e75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,6 @@
<module>opendj-rest2ldap-servlet</module>
<module>opendj-server</module>
<module>opendj-server-example-plugin</module>
- <module>opendj-slf4j-adapter</module>
<module>opendj-legacy</module>
<module>opendj-server-legacy</module>
</modules>
--
Gitblit v1.10.0