OPENDJ-2226 PR-96 Resolve split package issues

Gaetan Boismal

09.25.2015 09a696cadc620d9d18add4262c352831d7ba7043

OPENDJ-2226 PR-96 Resolve split package issues

Rename opendj-config message resource files to change generated package from
com.forgerock.opendj.ldap.* to com.forgerock.opendj.ldap.config.*
to prevent OSGI package conflict between opendj-core and main jar.

Create an org.opends.server.loggers.slf4j package to prevent package splitting
between opendj-slf4j-adapter and main jar.

 opendj-config/pom.xml

@@ -113,10 +113,10 @@
            </goals>
            <configuration>
              <messageFiles>
                <messageFile>com/forgerock/opendj/ldap/admin.properties</messageFile>
                <messageFile>com/forgerock/opendj/ldap/config.properties</messageFile>
                <messageFile>com/forgerock/opendj/ldap/extension.properties</messageFile>
                <messageFile>com/forgerock/opendj/ldap/protocol.properties</messageFile>
                <messageFile>com/forgerock/opendj/ldap/config/admin.properties</messageFile>
                <messageFile>com/forgerock/opendj/ldap/config/config.properties</messageFile>
                <messageFile>com/forgerock/opendj/ldap/config/extension.properties</messageFile>
                <messageFile>com/forgerock/opendj/ldap/config/protocol.properties</messageFile>
                <messageFile>com/forgerock/opendj/dsconfig/dsconfig.properties</messageFile>
              </messageFiles>
            </configuration>

 opendj-config/src/main/java/org/forgerock/opendj/config/AggregationPropertyDefinition.java

@@ -26,7 +26,7 @@
 */
package org.forgerock.opendj.config;

import static com.forgerock.opendj.ldap.AdminMessages.*;
import static com.forgerock.opendj.ldap.config.AdminMessages.*;
import static com.forgerock.opendj.util.StaticUtils.*;

import org.forgerock.util.Reject;

 opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationFramework.java

@@ -26,8 +26,8 @@
 */
package org.forgerock.opendj.config;

import static com.forgerock.opendj.ldap.AdminMessages.*;
import static com.forgerock.opendj.ldap.ExtensionMessages.NOTE_LOG_EXTENSION_INFORMATION;
import static com.forgerock.opendj.ldap.config.AdminMessages.*;
import static com.forgerock.opendj.ldap.config.ExtensionMessages.NOTE_LOG_EXTENSION_INFORMATION;
import static com.forgerock.opendj.util.StaticUtils.EOL;
import static com.forgerock.opendj.util.StaticUtils.stackTraceToSingleLineString;

@@ -61,7 +61,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.forgerock.opendj.ldap.AdminMessages;
import com.forgerock.opendj.ldap.config.AdminMessages;

/**
 * This class is responsible for managing the configuration framework including:

 opendj-config/src/main/java/org/forgerock/opendj/config/DefinitionDecodingException.java

@@ -22,11 +22,12 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2015 ForgeRock AS.
 */

package org.forgerock.opendj.config;

import static com.forgerock.opendj.ldap.AdminMessages.*;
import static com.forgerock.opendj.ldap.config.AdminMessages.*;

import org.forgerock.i18n.LocalizableMessage;


 opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectAlreadyExistsException.java

@@ -22,10 +22,11 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2015 ForgeRock AS.
 */
package org.forgerock.opendj.config;

import static com.forgerock.opendj.ldap.AdminMessages.*;
import static com.forgerock.opendj.ldap.config.AdminMessages.*;

/**
 * A managed object could not be created because there is an existing managed

 opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectNotFoundException.java

@@ -22,10 +22,11 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2015 ForgeRock AS.
 */
package org.forgerock.opendj.config;

import static com.forgerock.opendj.ldap.AdminMessages.*;
import static com.forgerock.opendj.ldap.config.AdminMessages.*;

/**
 * The requested managed object could not be located.

 opendj-config/src/main/java/org/forgerock/opendj/config/PropertyException.java

@@ -22,16 +22,12 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2015 ForgeRock AS.
 */

package org.forgerock.opendj.config;

import static com.forgerock.opendj.ldap.AdminMessages.ERR_DEFAULT_BEHAVIOR_PROPERTY_EXCEPTION;
import static com.forgerock.opendj.ldap.AdminMessages.ERR_ILLEGAL_PROPERTY_VALUE_EXCEPTION;
import static com.forgerock.opendj.ldap.AdminMessages.ERR_PROPERTY_IS_MANDATORY_EXCEPTION;
import static com.forgerock.opendj.ldap.AdminMessages.ERR_PROPERTY_IS_READ_ONLY_EXCEPTION;
import static com.forgerock.opendj.ldap.AdminMessages.ERR_PROPERTY_IS_SINGLE_VALUED_EXCEPTION;
import static com.forgerock.opendj.ldap.AdminMessages.ERR_UNKNOWN_PROPERTY_DEFINITION_EXCEPTION;
import static com.forgerock.opendj.ldap.config.AdminMessages.*;

import org.forgerock.i18n.LocalizableException;
import org.forgerock.i18n.LocalizableMessage;

 opendj-config/src/main/java/org/forgerock/opendj/config/PropertyNotFoundException.java

@@ -22,10 +22,11 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2015 ForgeRock AS.
 */
package org.forgerock.opendj.config;

import static com.forgerock.opendj.ldap.AdminMessages.*;
import static com.forgerock.opendj.ldap.config.AdminMessages.*;

/**
 * Thrown when an attempt is made to retrieve a property using its name but the

 opendj-config/src/main/java/org/forgerock/opendj/config/client/AuthenticationException.java

@@ -22,12 +22,13 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2015 ForgeRock AS.
 */
package org.forgerock.opendj.config.client;

import org.forgerock.i18n.LocalizableMessage;

import static com.forgerock.opendj.ldap.AdminMessages.*;
import static com.forgerock.opendj.ldap.config.AdminMessages.*;

/**
 * This exception is thrown when an authentication error occurs while connecting

 opendj-config/src/main/java/org/forgerock/opendj/config/client/AuthenticationNotSupportedException.java

@@ -22,12 +22,13 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2015 ForgeRock AS.
 */
package org.forgerock.opendj.config.client;

import org.forgerock.i18n.LocalizableMessage;

import static com.forgerock.opendj.ldap.AdminMessages.*;
import static com.forgerock.opendj.ldap.config.AdminMessages.*;

/**
 * This exception is thrown when the particular flavor of authentication

 opendj-config/src/main/java/org/forgerock/opendj/config/client/ConcurrentModificationException.java

@@ -22,10 +22,11 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2015 ForgeRock AS.
 */
package org.forgerock.opendj.config.client;

import static com.forgerock.opendj.ldap.AdminMessages.*;
import static com.forgerock.opendj.ldap.config.AdminMessages.*;

import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.OperationsException;

 opendj-config/src/main/java/org/forgerock/opendj/config/client/IllegalManagedObjectNameException.java

@@ -22,10 +22,11 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2015 ForgeRock AS.
 */
package org.forgerock.opendj.config.client;

import static com.forgerock.opendj.ldap.AdminMessages.*;
import static com.forgerock.opendj.ldap.config.AdminMessages.*;

import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.PropertyException;

 opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagedObjectDecodingException.java

@@ -22,10 +22,11 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2015 ForgeRock AS.
 */
package org.forgerock.opendj.config.client;

import static com.forgerock.opendj.ldap.AdminMessages.*;
import static com.forgerock.opendj.ldap.config.AdminMessages.*;

import java.util.Collection;
import java.util.Collections;

 opendj-config/src/main/java/org/forgerock/opendj/config/client/MissingMandatoryPropertiesException.java

@@ -26,7 +26,7 @@
 */
package org.forgerock.opendj.config.client;

import static com.forgerock.opendj.ldap.AdminMessages.*;
import static com.forgerock.opendj.ldap.config.AdminMessages.*;

import java.util.ArrayList;
import java.util.Collection;

 opendj-config/src/main/java/org/forgerock/opendj/config/client/OperationRejectedException.java

@@ -26,7 +26,7 @@
 */
package org.forgerock.opendj.config.client;

import static com.forgerock.opendj.ldap.AdminMessages.*;
import static com.forgerock.opendj.ldap.config.AdminMessages.*;

import java.util.ArrayList;
import java.util.Collection;

 opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/BuildVersion.java

@@ -26,10 +26,7 @@
 */
package org.forgerock.opendj.config.dsconfig;

import static com.forgerock.opendj.ldap.ConfigMessages.ERR_BUILDVERSION_MISMATCH;
import static com.forgerock.opendj.ldap.ConfigMessages.ERR_BUILDVERSION_MALFORMED;
import static com.forgerock.opendj.ldap.ConfigMessages.ERR_BUILDVERSION_NOT_FOUND;
import static com.forgerock.opendj.ldap.ConfigMessages.ERR_CONFIGVERSION_NOT_FOUND;
import static com.forgerock.opendj.ldap.config.ConfigMessages.*;
import static org.forgerock.util.Utils.closeSilently;

import java.io.BufferedReader;

 opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigChangeListenerAdaptor.java

@@ -26,7 +26,7 @@
 */
package org.forgerock.opendj.config.server;

import static com.forgerock.opendj.ldap.AdminMessages.*;
import static com.forgerock.opendj.ldap.config.AdminMessages.*;

import java.util.Collection;
import java.util.HashSet;

 opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigDeleteListenerAdaptor.java

@@ -26,7 +26,7 @@
 */
package org.forgerock.opendj.config.server;

import static com.forgerock.opendj.ldap.AdminMessages.*;
import static com.forgerock.opendj.ldap.config.AdminMessages.*;

import java.util.LinkedList;
import java.util.List;

 opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigExceptionFactory.java

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2015 ForgeRock AS.
 */
package org.forgerock.opendj.config.server;

@@ -31,7 +32,7 @@
import org.forgerock.opendj.config.DefinitionDecodingException;
import org.forgerock.opendj.ldap.DN;

import com.forgerock.opendj.ldap.AdminMessages;
import com.forgerock.opendj.ldap.config.AdminMessages;

/**
 * A utility class for converting admin exceptions to config exceptions.

 opendj-config/src/main/java/org/forgerock/opendj/config/server/ConstraintViolationException.java

@@ -26,7 +26,7 @@
 */
package org.forgerock.opendj.config.server;

import static com.forgerock.opendj.ldap.AdminMessages.*;
import static com.forgerock.opendj.ldap.config.AdminMessages.*;

import org.forgerock.opendj.config.DecodingException;
import org.forgerock.util.Reject;

 opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java

@@ -26,7 +26,7 @@
 */
package org.forgerock.opendj.config.server;

import static com.forgerock.opendj.ldap.AdminMessages.*;
import static com.forgerock.opendj.ldap.config.AdminMessages.*;

import java.util.Collections;
import java.util.LinkedList;

 opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectDecodingException.java

@@ -22,11 +22,12 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2015 ForgeRock AS.
 */

package org.forgerock.opendj.config.server;

import static com.forgerock.opendj.ldap.AdminMessages.*;
import static com.forgerock.opendj.ldap.config.AdminMessages.*;

import java.util.Collection;
import java.util.Collections;

 opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java

@@ -27,7 +27,7 @@

package org.forgerock.opendj.config.server;

import static com.forgerock.opendj.ldap.AdminMessages.*;
import static com.forgerock.opendj.ldap.config.AdminMessages.*;
import static com.forgerock.opendj.util.StaticUtils.*;
import static org.forgerock.opendj.config.PropertyException.defaultBehaviorException;
import static org.forgerock.opendj.config.PropertyException.propertyIsSingleValuedException;

 opendj-config/src/main/resources/com/forgerock/opendj/ldap/config/admin.properties

 opendj-config/src/main/resources/com/forgerock/opendj/ldap/config/config.properties

 opendj-config/src/main/resources/com/forgerock/opendj/ldap/config/extension.properties

 opendj-config/src/main/resources/com/forgerock/opendj/ldap/config/protocol.properties

 opendj-server-legacy/pom.xml

@@ -759,7 +759,7 @@
              <finalName>opendj-slf4j-adapter</finalName>
              <includes>
                <include>**/org/slf4j/**</include>
                <include>**/org/opends/server/loggers/OpenDJLogger*</include>
                <include>**/org/opends/server/loggers/slf4j/**</include>
              </includes>
            </configuration>
          </execution>
@@ -971,7 +971,7 @@
                <exclude>**/*_zh_CN.properties</exclude>
                <exclude>**/*_zh_TW.properties</exclude>
                <exclude>org/slf4j/**</exclude>
                <exclude>org/opends/server/loggers/OpenDJLogger*</exclude>
                <exclude>org/opends/server/loggers/slf4j/OpenDJLogger*</exclude>
                <exclude>org/opends/server/backends/jeb/**</exclude>
                <exclude>org/opends/server/replication/server/changelog/je/**</exclude>
              </excludes>

 opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogger.java

@@ -115,7 +115,7 @@
   *
   * @return True if debug logging is enabled. False otherwise.
   */
  static boolean debugEnabled()
  public static boolean debugEnabled()
  {
    return enabled;
  }
@@ -137,7 +137,7 @@
   * @return The tracer for the provided class or null if there are
   *         no tracers registered.
   */
  static DebugTracer getTracer(final String className)
  public static DebugTracer getTracer(final String className)
  {
    DebugTracer tracer = classTracers.get(className);
    if (tracer == null)

 opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugTracer.java

@@ -39,8 +39,16 @@
 * Logging is always done at a level basis, with debug log messages
 * exceeding the trace threshold being traced, others being discarded.
 */
class DebugTracer
public class DebugTracer
{
  /**
   *  We have to harcode this value because we cannot import
   *  org.opends.server.loggers.slf4j.OpenDJLoggerAdapter(.class.getName())
   *  to avoid OSGI split package issues.
   *  See OPENDJ-2226.
   */
  private static final String OPENDJ_LOGGER_ADAPTER_CLASS_NAME = "org.opends.server.loggers.slf4j.OpenDJLoggerAdapter";

  /** The class this aspect traces. */
  private String className;

@@ -96,7 +104,7 @@
   * @param msg
   *          message to log.
   */
  void trace(String msg)
  public void trace(String msg)
  {
    traceException(msg, null);
  }
@@ -109,7 +117,7 @@
   * @param exception
   *          the exception caught. May be {@code null}.
   */
  void traceException(String msg, Throwable exception)
  public void traceException(String msg, Throwable exception)
  {
    StackTraceElement[] stackTrace = null;
    StackTraceElement[] filteredStackTrace = null;
@@ -206,7 +214,7 @@
   *
   * @return {@code true} if logging is enabled, false otherwise.
   */
  boolean enabled()
  public boolean enabled()
  {
    for (PublisherSettings settings : publisherSettings)
    {
@@ -290,7 +298,7 @@
    String name = trace.getClassName();
    return name.startsWith(Thread.class.getName())
        || name.startsWith(DebugTracer.class.getName())
        || name.startsWith(OpenDJLoggerAdapter.class.getName())
        || name.startsWith(OPENDJ_LOGGER_ADAPTER_CLASS_NAME)
        || name.startsWith(LocalizedLogger.class.getName());
  }


 opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogger.java

@@ -107,7 +107,7 @@
   * @param exception
   *          The exception to be logged. May be {@code null}.
   */
  static void log(String category, Severity severity, LocalizableMessage message, Throwable exception)
  public static void log(String category, Severity severity, LocalizableMessage message, Throwable exception)
  {
    for (ErrorLogPublisher<?> publisher : loggerStorage.getLogPublishers())
    {
@@ -136,7 +136,7 @@
   *          The severity of logging event.
   * @return {@code true} if logger is enabled
   */
  static boolean isEnabledFor(String category, Severity severity)
  public static boolean isEnabledFor(String category, Severity severity)
  {
    if (Thread.currentThread() instanceof DirectoryThread)
    {

 opendj-server-legacy/src/main/java/org/opends/server/loggers/LoggingCategoryNames.java

@@ -36,7 +36,7 @@
 * to get the corresponding simplified category name if it exists, eg "CORE". If
 * no simplified category name exist, the classname is used as a category name.
 */
class LoggingCategoryNames
public class LoggingCategoryNames
{
  /**
   * Contains mapping from class names (or package names) to category names. In
@@ -142,7 +142,7 @@
   * @return the simple category name, or the provided className if no matching
   *         simple category name is found
   */
  static String getCategoryName(final String className)
  public static String getCategoryName(final String className)
  {
    final Entry<String, String> entry = NAMES.floorEntry(className);
    if (entry != null && className.startsWith(entry.getKey()))

 opendj-server-legacy/src/main/java/org/opends/server/loggers/slf4j/OpenDJLoggerAdapter.java

File was renamed from opendj-server-legacy/src/main/java/org/opends/server/loggers/OpenDJLoggerAdapter.java
@@ -21,13 +21,17 @@
 * CDDL HEADER END
 *
 *
 *      Copyright 2014 ForgeRock AS.
 *      Copyright 2014-2015 ForgeRock AS.
 */
package org.opends.server.loggers;
package org.opends.server.loggers.slf4j;

import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedMarker;
import org.opends.messages.Severity;
import org.opends.server.loggers.DebugLogger;
import org.opends.server.loggers.DebugTracer;
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.LoggingCategoryNames;
import org.slf4j.Logger;
import org.slf4j.Marker;


 opendj-server-legacy/src/main/java/org/opends/server/loggers/slf4j/OpenDJLoggerFactory.java

File was renamed from opendj-server-legacy/src/main/java/org/opends/server/loggers/OpenDJLoggerFactory.java
@@ -23,7 +23,7 @@
 *
 *      Copyright 2014-2015 ForgeRock AS.
 */
package org.opends.server.loggers;
package org.opends.server.loggers.slf4j;

import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;

 opendj-server-legacy/src/main/java/org/opends/server/loggers/slf4j/package-info.java

New file
@@ -0,0 +1,28 @@
/*
 * 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 2015 ForgeRock AS
 */

/** Contains classes exported in opendj-slf4j-adapter osgi bundle. */
package org.opends.server.loggers.slf4j;

 opendj-server-legacy/src/main/java/org/slf4j/impl/StaticLoggerBinder.java

@@ -21,11 +21,11 @@
 * CDDL HEADER END
 *
 *
 *      Copyright 2014 ForgeRock AS.
 *      Copyright 2014-2015 ForgeRock AS.
 */
package org.slf4j.impl;

import org.opends.server.loggers.OpenDJLoggerFactory;
import org.opends.server.loggers.slf4j.OpenDJLoggerFactory;
import org.slf4j.ILoggerFactory;
import org.slf4j.spi.LoggerFactoryBinder;