From 7adb93986ace907531875e25be1f94d735fbb068 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 08 Dec 2008 08:03:33 +0000
Subject: [PATCH] Merge the replication-service branch with the OpenDS trunk
---
opendj-sdk/opends/src/server/org/opends/server/replication/service/SetGenerationIdTask.java | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/SetGenerationIdTask.java b/opendj-sdk/opends/src/server/org/opends/server/replication/service/SetGenerationIdTask.java
similarity index 87%
rename from opendj-sdk/opends/src/server/org/opends/server/tasks/SetGenerationIdTask.java
rename to opendj-sdk/opends/src/server/org/opends/server/replication/service/SetGenerationIdTask.java
index f6b9a84..e465800 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/SetGenerationIdTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/service/SetGenerationIdTask.java
@@ -24,10 +24,13 @@
*
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
-package org.opends.server.tasks;
+package org.opends.server.replication.service;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.core.DirectoryServer.getAttributeType;
+import org.opends.server.tasks.TaskUtils;
+
+
import java.util.List;
import org.opends.messages.MessageBuilder;
@@ -37,10 +40,8 @@
import org.opends.server.backends.task.TaskState;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.replication.plugin.ReplicationDomain;
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;
@@ -56,14 +57,9 @@
* The tracer object for the debug logger.
*/
private static final DebugTracer TRACER = getTracer();
-
- boolean isCompressed = false;
- boolean isEncrypted = false;
- boolean skipSchemaValidation = false;
- String domainString = null;
- ReplicationDomain domain = null;
- TaskState initState;
- Long generationId = null;
+ private String domainString = null;
+ private ReplicationDomain domain = null;
+ private Long generationId = null;
private static final void debugInfo(String s)
{
@@ -124,22 +120,18 @@
attrList = taskEntry.getAttribute(typeDomainBase);
domainString = TaskUtils.getSingleValueString(attrList);
- DN domainDN = DN.nullDN();
+
try
{
- domainDN = DN.decode(domainString);
+ domain = ReplicationDomain.retrievesReplicationDomain(domainString);
}
- catch(Exception e)
+ catch(DirectoryException e)
{
MessageBuilder mb = new MessageBuilder();
mb.append(TaskMessages.ERR_TASK_INITIALIZE_INVALID_DN.get());
mb.append(e.getMessage());
- throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
- mb.toMessage());
+ throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, e);
}
-
- domain = ReplicationDomain.retrievesReplicationDomain(domainDN);
-
}
/**
@@ -148,7 +140,7 @@
protected TaskState runTask()
{
debugInfo("setGenerationIdTask is starting on domain%s" +
- domain.getBaseDN());
+ domain.getServiceID());
try
{
--
Gitblit v1.10.0