Fix for issue 3816 (problems with replication, to find DN when uppercase ar...

gbellato

10.00.2009 e33168dd5e030ea869d7aa3121e321001339984b

Fix for issue 3816 (problems with replication, to find DN when uppercase are presents in DN)

This involve making the tasks private to the LDAP ReplicationDomain because tasks have to normalize DNs.

 opends/resource/config/config.ldif

@@ -58,9 +58,9 @@
ds-cfg-allowed-task: org.opends.server.tasks.EnterLockdownModeTask
ds-cfg-allowed-task: org.opends.server.tasks.ExportTask
ds-cfg-allowed-task: org.opends.server.tasks.ImportTask
ds-cfg-allowed-task: org.opends.server.replication.service.InitializeTargetTask
ds-cfg-allowed-task: org.opends.server.replication.service.InitializeTask
ds-cfg-allowed-task: org.opends.server.replication.service.SetGenerationIdTask
ds-cfg-allowed-task: org.opends.server.replication.plugin.InitializeTargetTask
ds-cfg-allowed-task: org.opends.server.replication.plugin.InitializeTask
ds-cfg-allowed-task: org.opends.server.replication.plugin.SetGenerationIdTask
ds-cfg-allowed-task: org.opends.server.tasks.LeaveLockdownModeTask
ds-cfg-allowed-task: org.opends.server.tasks.RebuildTask
ds-cfg-allowed-task: org.opends.server.tasks.RestoreTask

 opends/src/messages/messages/replication.properties

@@ -146,7 +146,7 @@
SEVERE_ERR_INVALID_IMPORT_SOURCE_45=Invalid source for the import
SEVERE_ERR_INVALID_EXPORT_TARGET_46=Invalid target for the export
SEVERE_ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN_47=No reachable peer in the domain
SEVERE_ERR_NO_MATCHING_DOMAIN_48=No domain matches the base DN provided
SEVERE_ERR_NO_MATCHING_DOMAIN_48=No domain matches the provided base DN '%s'
SEVERE_ERR_MULTIPLE_MATCHING_DOMAIN_49=Multiple domains match the base DN \
 provided
SEVERE_ERR_INVALID_PROVIDER_50=The provider class does not allow the \

 opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Copyright 2006-2009 Sun Microsystems, Inc.
 */
package org.opends.quicksetup.installer;

@@ -4350,7 +4350,7 @@
    attrs.put(oc);
    attrs.put(
        "ds-task-class-name",
        "org.opends.server.replication.service.InitializeTask");
        "org.opends.server.replication.plugin.InitializeTask");
    attrs.put("ds-task-initialize-domain-dn", suffixDn);
    attrs.put("ds-task-initialize-replica-server-id",
        String.valueOf(replicaId));
@@ -4667,7 +4667,7 @@
    oc.add("ds-task-reset-generation-id");
    attrs.put(oc);
    attrs.put("ds-task-class-name",
        "org.opends.server.replication.service.SetGenerationIdTask");
        "org.opends.server.replication.plugin.SetGenerationIdTask");
    attrs.put("ds-task-reset-generation-id-domain-base-dn", suffixDn);
    while (!taskCreated)
    {

 opends/src/server/org/opends/server/replication/plugin/InitializeTargetTask.java

File was renamed from opends/src/server/org/opends/server/replication/service/InitializeTargetTask.java
@@ -22,9 +22,9 @@
 * CDDL HEADER END
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Copyright 2006-2009 Sun Microsystems, Inc.
 */
package org.opends.server.replication.service;
package org.opends.server.replication.plugin;
import org.opends.server.tasks.TaskUtils;

import org.opends.messages.TaskMessages;
@@ -43,6 +43,7 @@
import org.opends.server.backends.task.TaskState;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;

@@ -60,7 +61,7 @@

  // Config properties
  private String  domainString            = null;
  private ReplicationDomain domain = null;
  private LDAPReplicationDomain domain = null;
  private short target;
  private long total;

@@ -91,7 +92,9 @@

    try
    {
      domain = ReplicationDomain.retrievesReplicationDomain(domainString);
      DN dn = DN.decode(domainString);
      // We can assume that this is an LDAP replication domain
      domain = LDAPReplicationDomain.retrievesReplicationDomain(dn);
    }
    catch(DirectoryException e)
    {

 opends/src/server/org/opends/server/replication/plugin/InitializeTask.java

File was renamed from opends/src/server/org/opends/server/replication/service/InitializeTask.java
@@ -22,9 +22,9 @@
 * CDDL HEADER END
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Copyright 2006-2009 Sun Microsystems, Inc.
 */
package org.opends.server.replication.service;
package org.opends.server.replication.plugin;
import org.opends.server.tasks.TaskUtils;

import org.opends.server.types.ResultCode;
@@ -47,6 +47,7 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;

@@ -64,7 +65,7 @@

  private String  domainString            = null;
  private short  source;
  private ReplicationDomain domain        = null;
  private LDAPReplicationDomain domain        = null;
  private TaskState initState;

  // The total number of entries expected to be processed when this import
@@ -111,7 +112,9 @@

    try
    {
      domain = ReplicationDomain.retrievesReplicationDomain(domainString);
      DN dn = DN.decode(domainString);
      // We can assume that this is an LDAP replication domain
      domain = LDAPReplicationDomain.retrievesReplicationDomain(dn);
    }
    catch(DirectoryException e)
    {

 opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java

@@ -2626,11 +2626,8 @@

    if (replicationDomain == null)
    {
      MessageBuilder mb = new MessageBuilder(ERR_NO_MATCHING_DOMAIN.get());
      mb.append(" ");
      mb.append(String.valueOf(baseDn));
      throw new DirectoryException(ResultCode.OTHER,
         mb.toMessage());
          ERR_NO_MATCHING_DOMAIN.get(String.valueOf(baseDn)));
    }
    return replicationDomain;
  }
@@ -3043,4 +3040,46 @@

    return attributes;
  }

  /**
   * Verifies that the given string represents a valid source
   * from which this server can be initialized.
   * @param sourceString The string representing the source
   * @return The source as a short value
   * @throws DirectoryException if the string is not valid
   */
  short decodeSource(String sourceString)
  throws DirectoryException
  {
    short  source = 0;
    Throwable cause = null;
    try
    {
      source = Integer.decode(sourceString).shortValue();
      if ((source >= -1) && (source != serverId))
      {
        // TODO Verifies serverID is in the domain
        // We should check here that this is a server implied
        // in the current domain.
        return source;
      }
    }
    catch(Exception e)
    {
      cause = e;
    }

    ResultCode resultCode = ResultCode.OTHER;
    Message message = ERR_INVALID_IMPORT_SOURCE.get();
    if (cause != null)
    {
      throw new DirectoryException(
          resultCode, message, cause);
    }
    else
    {
      throw new DirectoryException(
          resultCode, message);
    }
  }
}

 opends/src/server/org/opends/server/replication/plugin/SetGenerationIdTask.java

File was renamed from opends/src/server/org/opends/server/replication/service/SetGenerationIdTask.java
@@ -22,12 +22,13 @@
 * CDDL HEADER END
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Copyright 2006-2009 Sun Microsystems, Inc.
 */
package org.opends.server.replication.service;
package org.opends.server.replication.plugin;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.core.DirectoryServer.getAttributeType;

import org.opends.server.replication.service.ReplicationDomain;
import org.opends.server.tasks.TaskUtils;


@@ -42,6 +43,7 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
import org.opends.server.types.ResultCode;
@@ -123,7 +125,8 @@

    try
    {
      domain = ReplicationDomain.retrievesReplicationDomain(domainString);
      DN dn = DN.decode(domainString);
      domain = LDAPReplicationDomain.retrievesReplicationDomain(dn);
    }
    catch(DirectoryException e)
    {

 opends/src/server/org/opends/server/replication/service/ReplicationDomain.java

@@ -52,6 +52,9 @@

import org.opends.server.config.ConfigException;
import java.util.Collection;

import org.opends.server.replication.plugin.InitializeTargetTask;
import org.opends.server.replication.plugin.InitializeTask;
import org.opends.server.replication.protocol.ReplSessionSecurity;
import org.opends.server.replication.protocol.ResetGenerationIdMsg;

@@ -949,11 +952,8 @@
    ReplicationDomain replicationDomain = domains.get(serviceID);
    if (replicationDomain == null)
    {
      MessageBuilder mb = new MessageBuilder(ERR_NO_MATCHING_DOMAIN.get());
      mb.append(" ");
      mb.append(serviceID);
      throw new DirectoryException(ResultCode.OTHER,
         mb.toMessage());
          ERR_NO_MATCHING_DOMAIN.get(serviceID));
    }
    return replicationDomain;
  }
@@ -1177,17 +1177,25 @@
  }

  /**
   * Process the initialization of some other server or servers in the topology
   * specified by the target argument.
   * Initializes a remote server from this server.
   * <p>
   * The {@link #exportBackend(OutputStream)} will therefore be called
   * on this server, and the {@link #importBackend(InputStream)}
   * will be called on the remote server.
   * <p>
   * The InputStream and OutpuStream given as a parameter to those
   * methods will be connected through the replication protocol.
   *
   * @param target    The target that should be initialized
   * @param initTask  The task that triggers this initialization and that should
   *                  be updated with its progress.
   * @param target   The server-id of the server that should be initialized.
   *                 The target can be discovered using the
   *                 {@link #getDsList()} method.
   * @param initTask The task that triggers this initialization and that should
   *                 be updated with its progress.
   *
   * @exception DirectoryException  If the Replication Initialization protocol
   *                                failed.
   * @throws DirectoryException If it was not possible to publish the
   *                            Initialization message to the Topology.
   */
  void initializeRemote(short target, Task initTask)
  public void initializeRemote(short target, Task initTask)
  throws DirectoryException
  {
    initializeRemote(target, serverID, initTask);
@@ -1485,7 +1493,7 @@
   * @param source   The server-id of the source from which to initialize.
   *                 The source can be discovered using the
   *                 {@link #getDsList()} method.

   *
   * @throws DirectoryException If it was not possible to publish the
   *                            Initialization message to the Topology.
   */
@@ -1519,13 +1527,27 @@

  /**
   * Initializes this domain from another source server.
   * <p>
   * When this method is called, a request for initialization will
   * be sent to the source server asking for initialization.
   * <p>
   * The {@link #exportBackend(OutputStream)} will therefore be called
   * on the source server, and the {@link #importBackend(InputStream)}
   * will be called on his server.
   * <p>
   * The InputStream and OutpuStream given as a parameter to those
   * methods will be connected through the replication protocol.
   *
   * @param source The source from which to initialize
   * @param source   The server-id of the source from which to initialize.
   *                 The source can be discovered using the
   *                 {@link #getDsList()} method.
   * @param initTask The task that launched the initialization
   *                 and should be updated of its progress.
   * @throws DirectoryException when an error occurs
   *
   * @throws DirectoryException If it was not possible to publish the
   *                            Initialization message to the Topology.
   */
  void initializeFromRemote(short source, Task initTask)
  public void initializeFromRemote(short source, Task initTask)
  throws DirectoryException
  {
    if (debugEnabled())
@@ -1665,48 +1687,6 @@
  }

  /**
   * Verifies that the given string represents a valid source
   * from which this server can be initialized.
   * @param sourceString The string representing the source
   * @return The source as a short value
   * @throws DirectoryException if the string is not valid
   */
  short decodeSource(String sourceString)
  throws DirectoryException
  {
    short  source = 0;
    Throwable cause = null;
    try
    {
      source = Integer.decode(sourceString).shortValue();
      if ((source >= -1) && (source != serverID))
      {
        // TODO Verifies serverID is in the domain
        // We should check here that this is a server implied
        // in the current domain.
        return source;
      }
    }
    catch(Exception e)
    {
      cause = e;
    }

    ResultCode resultCode = ResultCode.OTHER;
    Message message = ERR_INVALID_IMPORT_SOURCE.get();
    if (cause != null)
    {
      throw new DirectoryException(
          resultCode, message, cause);
    }
    else
    {
      throw new DirectoryException(
          resultCode, message);
    }
  }

  /**
   * Check the value of the Replication Servers generation ID.
   *
   * @param generationID        The expected value of the generation ID.
@@ -1789,7 +1769,7 @@
   * @param generationIdNewValue  The new value of the generation Id.
   * @throws DirectoryException   When an error occurs
   */
  void resetGenerationId(Long generationIdNewValue)
  public void resetGenerationId(Long generationIdNewValue)
  throws DirectoryException
  {
    if (debugEnabled())

 opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java

@@ -6386,7 +6386,7 @@
    oc.add("ds-task-reset-generation-id");
    attrs.put(oc);
    attrs.put("ds-task-class-name",
        "org.opends.server.replication.service.SetGenerationIdTask");
        "org.opends.server.replication.plugin.SetGenerationIdTask");
    if (isPre)
    {
      if (!localOnly)
@@ -6557,7 +6557,7 @@
    oc.add("ds-task-initialize-remote-replica");
    attrs.put(oc);
    attrs.put("ds-task-class-name",
        "org.opends.server.replication.service.InitializeTargetTask");
        "org.opends.server.replication.plugin.InitializeTargetTask");
    attrs.put("ds-task-initialize-domain-dn", baseDN);
    attrs.put("ds-task-initialize-replica-server-id", "all");
    while (!taskCreated)

 opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Copyright 2006-2009 Sun Microsystems, Inc.
 */
package org.opends.server.replication;

@@ -210,7 +210,7 @@
        "objectclass: top",
        "objectclass: ds-task",
        "objectclass: ds-task-initialize-remote-replica",
        "ds-task-class-name: org.opends.server.replication.service.InitializeTargetTask",
        "ds-task-class-name: org.opends.server.replication.plugin.InitializeTargetTask",
        "ds-task-initialize-domain-dn: " + baseDn,
        "ds-task-initialize-replica-server-id: " + server2ID);
  }
@@ -882,7 +882,7 @@
          "objectclass: top",
          "objectclass: ds-task",
          "objectclass: ds-task-reset-generation-id",
          "ds-task-class-name: org.opends.server.replication.service.SetGenerationIdTask",
          "ds-task-class-name: org.opends.server.replication.plugin.SetGenerationIdTask",
          "ds-task-reset-generation-id-domain-base-dn: " + baseDnStr);
      addTask(taskReset, ResultCode.SUCCESS, null);
      waitTaskState(taskReset, TaskState.COMPLETED_SUCCESSFULLY, null);
@@ -1032,7 +1032,7 @@
          "objectclass: top",
          "objectclass: ds-task",
          "objectclass: ds-task-reset-generation-id",
          "ds-task-class-name: org.opends.server.replication.service.SetGenerationIdTask",
          "ds-task-class-name: org.opends.server.replication.plugin.SetGenerationIdTask",
          "ds-task-reset-generation-id-domain-base-dn: " + baseDnStr);

      addTask(taskReset, ResultCode.SUCCESS, null);
@@ -1225,7 +1225,7 @@
        "objectclass: top",
        "objectclass: ds-task",
        "objectclass: ds-task-reset-generation-id",
        "ds-task-class-name: org.opends.server.replication.service.SetGenerationIdTask",
        "ds-task-class-name: org.opends.server.replication.plugin.SetGenerationIdTask",
        "ds-task-reset-generation-id-domain-base-dn: " + baseDnStr);
      addTask(taskReset, ResultCode.SUCCESS, null);
      waitTaskState(taskReset, TaskState.COMPLETED_SUCCESSFULLY, null);
@@ -1244,7 +1244,7 @@
        "objectclass: top",
        "objectclass: ds-task",
        "objectclass: ds-task-reset-generation-id",
        "ds-task-class-name: org.opends.server.replication.service.SetGenerationIdTask",
        "ds-task-class-name: org.opends.server.replication.plugin.SetGenerationIdTask",
        "ds-task-reset-generation-id-domain-base-dn: " + baseDnStr,
        "ds-task-reset-generation-id-new-value: -1");
      addTask(taskReset, ResultCode.SUCCESS, null);

 opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Copyright 2006-2009 Sun Microsystems, Inc.
 */
package org.opends.server.replication;

@@ -198,7 +198,7 @@
        "objectclass: top",
        "objectclass: ds-task",
        "objectclass: ds-task-initialize-from-remote-replica",
        "ds-task-class-name: org.opends.server.replication.service.InitializeTask",
        "ds-task-class-name: org.opends.server.replication.plugin.InitializeTask",
        "ds-task-initialize-domain-dn: " + EXAMPLE_DN,
        "ds-task-initialize-replica-server-id: " + server2ID);

@@ -208,7 +208,7 @@
        "objectclass: top",
        "objectclass: ds-task",
        "objectclass: ds-task-initialize-remote-replica",
        "ds-task-class-name: org.opends.server.replication.service.InitializeTargetTask",
        "ds-task-class-name: org.opends.server.replication.plugin.InitializeTargetTask",
        "ds-task-initialize-domain-dn: " + EXAMPLE_DN,
        "ds-task-initialize-replica-server-id: " + server2ID);

@@ -218,7 +218,7 @@
        "objectclass: top",
        "objectclass: ds-task",
        "objectclass: ds-task-initialize-remote-replica",
        "ds-task-class-name: org.opends.server.replication.service.InitializeTargetTask",
        "ds-task-class-name: org.opends.server.replication.plugin.InitializeTargetTask",
        "ds-task-initialize-domain-dn: " + EXAMPLE_DN,
        "ds-task-initialize-replica-server-id: all");
  }
@@ -961,7 +961,7 @@
          "objectclass: top",
          "objectclass: ds-task",
          "objectclass: ds-task-initialize-remote-replica",
          "ds-task-class-name: org.opends.server.replication.service.InitializeTargetTask",
          "ds-task-class-name: org.opends.server.replication.plugin.InitializeTargetTask",
          "ds-task-initialize-domain-dn: foo",
          "ds-task-initialize-remote-replica-server-id: " + server2ID);
      addTask(taskInitTarget, ResultCode.INVALID_DN_SYNTAX,
@@ -974,11 +974,11 @@
          "objectclass: top",
          "objectclass: ds-task",
          "objectclass: ds-task-initialize-remote-replica",
          "ds-task-class-name: org.opends.server.replication.service.InitializeTargetTask",
          "ds-task-class-name: org.opends.server.replication.plugin.InitializeTargetTask",
          "ds-task-initialize-domain-dn: dc=foo",
          "ds-task-initialize-remote-replica-server-id: " + server2ID);
      addTask(taskInitTarget, ResultCode.OTHER,
          ERR_NO_MATCHING_DOMAIN.get());
          ERR_NO_MATCHING_DOMAIN.get(""));

      // Invalid scope
      // createTask(taskInitTargetS2);
@@ -1022,11 +1022,11 @@
          "objectclass: top",
          "objectclass: ds-task",
          "objectclass: ds-task-initialize-from-remote-replica",
          "ds-task-class-name: org.opends.server.replication.service.InitializeTask",
          "ds-task-initialize-domain-dn: foo",
          "ds-task-class-name: org.opends.server.replication.plugin.InitializeTask",
          "ds-task-initialize-domain-dn: dc=foo",
          "ds-task-initialize-replica-server-id: " + server2ID);
      addTask(taskInit, ResultCode.INVALID_DN_SYNTAX,
          ERR_NO_MATCHING_DOMAIN.get());
          ERR_NO_MATCHING_DOMAIN.get("dc=foo"));

      // Domain base dn not related to any domain
      taskInit = TestCaseUtils.makeEntry(
@@ -1035,11 +1035,11 @@
          "objectclass: top",
          "objectclass: ds-task",
          "objectclass: ds-task-initialize-from-remote-replica",
          "ds-task-class-name: org.opends.server.replication.service.InitializeTask",
          "ds-task-class-name: org.opends.server.replication.plugin.InitializeTask",
          "ds-task-initialize-domain-dn: dc=foo",
          "ds-task-initialize-replica-server-id: " + server2ID);
      addTask(taskInit, ResultCode.INVALID_DN_SYNTAX,
          ERR_NO_MATCHING_DOMAIN.get());
          ERR_NO_MATCHING_DOMAIN.get("dc=foo"));

      // Invalid Source
      taskInit = TestCaseUtils.makeEntry(
@@ -1048,7 +1048,7 @@
          "objectclass: top",
          "objectclass: ds-task",
          "objectclass: ds-task-initialize-from-remote-replica",
          "ds-task-class-name: org.opends.server.replication.service.InitializeTask",
          "ds-task-class-name: org.opends.server.replication.plugin.InitializeTask",
          "ds-task-initialize-domain-dn: " + baseDn,
          "ds-task-initialize-replica-server-id: -3");
      addTask(taskInit, ResultCode.OTHER,
@@ -1311,7 +1311,7 @@
        "objectclass: top",
        "objectclass: ds-task",
        "objectclass: ds-task-initialize-from-remote-replica",
        "ds-task-class-name: org.opends.server.replication.service.InitializeTask",
        "ds-task-class-name: org.opends.server.replication.plugin.InitializeTask",
        "ds-task-initialize-domain-dn: " + baseDn,
        "ds-task-initialize-replica-server-id: " + 20);

@@ -1327,7 +1327,7 @@
        "objectclass: top",
        "objectclass: ds-task",
        "objectclass: ds-task-initialize-from-remote-replica",
        "ds-task-class-name: org.opends.server.replication.service.InitializeTask",
        "ds-task-class-name: org.opends.server.replication.plugin.InitializeTask",
        "ds-task-initialize-domain-dn: " + baseDn,
        "ds-task-initialize-replica-server-id: " + server1ID);

@@ -1369,7 +1369,7 @@
        "objectclass: top",
        "objectclass: ds-task",
        "objectclass: ds-task-initialize-remote-replica",
        "ds-task-class-name: org.opends.server.replication.service.InitializeTargetTask",
        "ds-task-class-name: org.opends.server.replication.plugin.InitializeTargetTask",
        "ds-task-initialize-domain-dn: " + baseDn,
        "ds-task-initialize-replica-server-id: " + 0);

@@ -1443,7 +1443,7 @@
        "objectclass: top",
        "objectclass: ds-task",
        "objectclass: ds-task-initialize-from-remote-replica",
        "ds-task-class-name: org.opends.server.replication.service.InitializeTask",
        "ds-task-class-name: org.opends.server.replication.plugin.InitializeTask",
        "ds-task-initialize-domain-dn: " + baseDn,
        "ds-task-initialize-replica-server-id: " + server2ID);

@@ -1457,7 +1457,7 @@
        "objectclass: top",
        "objectclass: ds-task",
        "objectclass: ds-task-initialize-from-remote-replica",
        "ds-task-class-name: org.opends.server.replication.service.InitializeTask",
        "ds-task-class-name: org.opends.server.replication.plugin.InitializeTask",
        "ds-task-initialize-domain-dn: " + baseDn,
        "ds-task-initialize-replica-server-id: " + server2ID);


 opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java

@@ -1295,9 +1295,7 @@
   throws Exception
   {
     String buildRoot = System.getProperty(TestCaseUtils.PROPERTY_BUILD_ROOT);
     String path = buildRoot + File.separator + "build" +
                   File.separator + "unit-tests" + File.separator +
                   "package-instance"+ File.separator + "exportLDIF.ldif";
     String path = "exportLDIF.ldif";
     return TestCaseUtils.makeEntry(
     "dn: ds-task-id=" + UUID.randomUUID() + ",cn=Scheduled Tasks,cn=Tasks",
     "objectclass: top",
@@ -1314,9 +1312,7 @@
   {
     String root = suffix.substring(suffix.indexOf('=')+1, suffix.indexOf(','));
     String buildRoot = System.getProperty(TestCaseUtils.PROPERTY_BUILD_ROOT);
     String path = buildRoot + File.separator + "build" +
                   File.separator + "unit-tests" + File.separator +
                   "package-instance"+ File.separator + "exportLDIF" + root +".ldif";
     String path = "exportLDIF" + root +".ldif";
     return TestCaseUtils.makeEntry(
     "dn: ds-task-id=" + UUID.randomUUID() + ",cn=Scheduled Tasks,cn=Tasks",
     "objectclass: top",