From 9d3cd6f40f49af8a06d1722252fe4e96983db5dc Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 30 Mar 2009 06:46:00 +0000
Subject: [PATCH] Fix for 3893 : dsreplication enable between 1.2 and 1.3 can fail because of Initialize task
---
opends/src/server/org/opends/server/tasks/InitializeTask.java | 4 +-
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java | 10 ++--
opends/src/server/org/opends/server/tasks/InitializeTargetTask.java | 4 +-
opends/resource/config/config.ldif | 6 +-
opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 2
opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java | 4 +-
opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 4 +-
opends/src/server/org/opends/server/tasks/SetGenerationIdTask.java | 4 +-
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java | 26 ++++++------
opends/src/server/org/opends/server/replication/service/ReplicationDomain.java | 4 +-
10 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/opends/resource/config/config.ldif b/opends/resource/config/config.ldif
index fe2e3e1..3b2f3ed 100644
--- a/opends/resource/config/config.ldif
+++ b/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.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.InitializeTargetTask
+ds-cfg-allowed-task: org.opends.server.tasks.InitializeTask
+ds-cfg-allowed-task: org.opends.server.tasks.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
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index cfa0897..97c56ec 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -4350,7 +4350,7 @@
attrs.put(oc);
attrs.put(
"ds-task-class-name",
- "org.opends.server.replication.plugin.InitializeTask");
+ "org.opends.server.tasks.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.plugin.SetGenerationIdTask");
+ "org.opends.server.tasks.SetGenerationIdTask");
attrs.put("ds-task-reset-generation-id-domain-base-dn", suffixDn);
while (!taskCreated)
{
diff --git a/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index c2ff5cc..98eeb88 100644
--- a/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -3065,7 +3065,7 @@
* @return The source as a short value
* @throws DirectoryException if the string is not valid
*/
- short decodeSource(String sourceString)
+ public short decodeSource(String sourceString)
throws DirectoryException
{
short source = 0;
diff --git a/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java b/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java
index 4d0a28e..01bb2de 100644
--- a/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java
+++ b/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java
@@ -36,6 +36,8 @@
import java.io.BufferedOutputStream;
+import org.opends.server.tasks.InitializeTargetTask;
+import org.opends.server.tasks.InitializeTask;
import org.opends.server.types.Attribute;
import org.opends.server.core.DirectoryServer;
@@ -53,8 +55,6 @@
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;
diff --git a/opends/src/server/org/opends/server/replication/plugin/InitializeTargetTask.java b/opends/src/server/org/opends/server/tasks/InitializeTargetTask.java
similarity index 97%
rename from opends/src/server/org/opends/server/replication/plugin/InitializeTargetTask.java
rename to opends/src/server/org/opends/server/tasks/InitializeTargetTask.java
index c20dd28..d81280d 100644
--- a/opends/src/server/org/opends/server/replication/plugin/InitializeTargetTask.java
+++ b/opends/src/server/org/opends/server/tasks/InitializeTargetTask.java
@@ -24,8 +24,8 @@
*
* Copyright 2006-2009 Sun Microsystems, Inc.
*/
-package org.opends.server.replication.plugin;
-import org.opends.server.tasks.TaskUtils;
+package org.opends.server.tasks;
+import org.opends.server.replication.plugin.LDAPReplicationDomain;
import org.opends.messages.TaskMessages;
import org.opends.server.types.ResultCode;
diff --git a/opends/src/server/org/opends/server/replication/plugin/InitializeTask.java b/opends/src/server/org/opends/server/tasks/InitializeTask.java
similarity index 98%
rename from opends/src/server/org/opends/server/replication/plugin/InitializeTask.java
rename to opends/src/server/org/opends/server/tasks/InitializeTask.java
index 8ee6d83..450580c 100644
--- a/opends/src/server/org/opends/server/replication/plugin/InitializeTask.java
+++ b/opends/src/server/org/opends/server/tasks/InitializeTask.java
@@ -24,8 +24,8 @@
*
* Copyright 2006-2009 Sun Microsystems, Inc.
*/
-package org.opends.server.replication.plugin;
-import org.opends.server.tasks.TaskUtils;
+package org.opends.server.tasks;
+import org.opends.server.replication.plugin.LDAPReplicationDomain;
import org.opends.server.types.ResultCode;
diff --git a/opends/src/server/org/opends/server/replication/plugin/SetGenerationIdTask.java b/opends/src/server/org/opends/server/tasks/SetGenerationIdTask.java
similarity index 97%
rename from opends/src/server/org/opends/server/replication/plugin/SetGenerationIdTask.java
rename to opends/src/server/org/opends/server/tasks/SetGenerationIdTask.java
index 7bef2e4..3ebb510 100644
--- a/opends/src/server/org/opends/server/replication/plugin/SetGenerationIdTask.java
+++ b/opends/src/server/org/opends/server/tasks/SetGenerationIdTask.java
@@ -24,12 +24,12 @@
*
* Copyright 2006-2009 Sun Microsystems, Inc.
*/
-package org.opends.server.replication.plugin;
+package org.opends.server.tasks;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.core.DirectoryServer.getAttributeType;
+import org.opends.server.replication.plugin.LDAPReplicationDomain;
import org.opends.server.replication.service.ReplicationDomain;
-import org.opends.server.tasks.TaskUtils;
import java.util.List;
diff --git a/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index eb30971..5aec539 100644
--- a/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/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.plugin.SetGenerationIdTask");
+ "org.opends.server.tasks.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.plugin.InitializeTargetTask");
+ "org.opends.server.tasks.InitializeTargetTask");
attrs.put("ds-task-initialize-domain-dn", baseDN);
attrs.put("ds-task-initialize-replica-server-id", "all");
while (!taskCreated)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
index db86197..3e5a90c 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
@@ -210,7 +210,7 @@
"objectclass: top",
"objectclass: ds-task",
"objectclass: ds-task-initialize-remote-replica",
- "ds-task-class-name: org.opends.server.replication.plugin.InitializeTargetTask",
+ "ds-task-class-name: org.opends.server.tasks.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.plugin.SetGenerationIdTask",
+ "ds-task-class-name: org.opends.server.tasks.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.plugin.SetGenerationIdTask",
+ "ds-task-class-name: org.opends.server.tasks.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.plugin.SetGenerationIdTask",
+ "ds-task-class-name: org.opends.server.tasks.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.plugin.SetGenerationIdTask",
+ "ds-task-class-name: org.opends.server.tasks.SetGenerationIdTask",
"ds-task-reset-generation-id-domain-base-dn: " + baseDnStr,
"ds-task-reset-generation-id-new-value: -1");
addTask(taskReset, ResultCode.SUCCESS, null);
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
index 2b8093f..09321e2 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
@@ -198,7 +198,7 @@
"objectclass: top",
"objectclass: ds-task",
"objectclass: ds-task-initialize-from-remote-replica",
- "ds-task-class-name: org.opends.server.replication.plugin.InitializeTask",
+ "ds-task-class-name: org.opends.server.tasks.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.plugin.InitializeTargetTask",
+ "ds-task-class-name: org.opends.server.tasks.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.plugin.InitializeTargetTask",
+ "ds-task-class-name: org.opends.server.tasks.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.plugin.InitializeTargetTask",
+ "ds-task-class-name: org.opends.server.tasks.InitializeTargetTask",
"ds-task-initialize-domain-dn: foo",
"ds-task-initialize-remote-replica-server-id: " + server2ID);
addTask(taskInitTarget, ResultCode.INVALID_DN_SYNTAX,
@@ -974,7 +974,7 @@
"objectclass: top",
"objectclass: ds-task",
"objectclass: ds-task-initialize-remote-replica",
- "ds-task-class-name: org.opends.server.replication.plugin.InitializeTargetTask",
+ "ds-task-class-name: org.opends.server.tasks.InitializeTargetTask",
"ds-task-initialize-domain-dn: dc=foo",
"ds-task-initialize-remote-replica-server-id: " + server2ID);
addTask(taskInitTarget, ResultCode.OTHER,
@@ -1022,7 +1022,7 @@
"objectclass: top",
"objectclass: ds-task",
"objectclass: ds-task-initialize-from-remote-replica",
- "ds-task-class-name: org.opends.server.replication.plugin.InitializeTask",
+ "ds-task-class-name: org.opends.server.tasks.InitializeTask",
"ds-task-initialize-domain-dn: dc=foo",
"ds-task-initialize-replica-server-id: " + server2ID);
addTask(taskInit, ResultCode.INVALID_DN_SYNTAX,
@@ -1035,7 +1035,7 @@
"objectclass: top",
"objectclass: ds-task",
"objectclass: ds-task-initialize-from-remote-replica",
- "ds-task-class-name: org.opends.server.replication.plugin.InitializeTask",
+ "ds-task-class-name: org.opends.server.tasks.InitializeTask",
"ds-task-initialize-domain-dn: dc=foo",
"ds-task-initialize-replica-server-id: " + server2ID);
addTask(taskInit, ResultCode.INVALID_DN_SYNTAX,
@@ -1048,7 +1048,7 @@
"objectclass: top",
"objectclass: ds-task",
"objectclass: ds-task-initialize-from-remote-replica",
- "ds-task-class-name: org.opends.server.replication.plugin.InitializeTask",
+ "ds-task-class-name: org.opends.server.tasks.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.plugin.InitializeTask",
+ "ds-task-class-name: org.opends.server.tasks.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.plugin.InitializeTask",
+ "ds-task-class-name: org.opends.server.tasks.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.plugin.InitializeTargetTask",
+ "ds-task-class-name: org.opends.server.tasks.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.plugin.InitializeTask",
+ "ds-task-class-name: org.opends.server.tasks.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.plugin.InitializeTask",
+ "ds-task-class-name: org.opends.server.tasks.InitializeTask",
"ds-task-initialize-domain-dn: " + baseDn,
"ds-task-initialize-replica-server-id: " + server2ID);
--
Gitblit v1.10.0