From 82fac34ae279ec769891444f0f6ea10b47382f8d Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Wed, 25 Apr 2007 14:09:13 +0000
Subject: [PATCH] First set of modifications for issue 1090 : rename synchronization components Move from synchronization package name to replication.
---
opends/src/server/org/opends/server/replication/protocol/HeartbeatMessage.java | 2
opends/src/server/org/opends/server/replication/changelog/ChangelogDB.java | 6
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java | 10
opends/src/server/org/opends/server/replication/plugin/PersistentServerState.java | 6
opends/src/server/org/opends/server/replication/protocol/AddContext.java | 4
opends/src/server/org/opends/server/replication/protocol/ModifyDnContext.java | 4
opends/src/server/org/opends/server/replication/protocol/ErrorMessage.java | 2
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SynchronizationTestCase.java | 10
opends/src/server/org/opends/server/replication/changelog/ServerHandler.java | 24 +-
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ServerStateTest.java | 8
opends/src/server/org/opends/server/replication/plugin/AttrInfo.java | 4
opends/src/server/org/opends/server/replication/common/ChangeNumber.java | 2
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java | 26 +-
opends/resource/schema/02-config.ldif | 2
opends/src/server/org/opends/server/replication/changelog/ChangelogDbEnv.java | 2
opends/src/server/org/opends/server/replication/changelog/AckMessageListComparator.java | 2
opends/src/server/org/opends/server/replication/protocol/OperationContext.java | 4
opends/resource/config/config.ldif | 2
opends/src/server/org/opends/server/replication/plugin/SynchroLDIFInputStream.java | 2
opends/src/server/org/opends/server/replication/plugin/SynchroLDIFOutputStream.java | 2
opends/src/server/org/opends/server/replication/protocol/AckMessage.java | 4
opends/src/server/org/opends/server/replication/plugin/Historical.java | 6
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java | 8
opends/src/server/org/opends/server/replication/package-info.java | 2
opends/src/server/org/opends/server/replication/protocol/ProtocolSession.java | 2
opends/src/server/org/opends/server/replication/protocol/package-info.java | 2
opends/src/server/org/opends/server/replication/plugin/FakeOperation.java | 6
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaSynchronizationTest.java | 10
opends/src/server/org/opends/server/replication/plugin/FakeOperationComparator.java | 2
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ChangeNumberGeneratorTest.java | 6
opends/src/server/org/opends/server/replication/plugin/HeartbeatMonitor.java | 4
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/changelog/ChangelogFakeConfiguration.java | 2
opends/src/server/org/opends/server/replication/plugin/ListenerThread.java | 4
opends/src/server/org/opends/server/replication/protocol/DeleteContext.java | 4
opends/src/server/org/opends/server/replication/changelog/ChangelogData.java | 6
opends/src/server/org/opends/server/replication/common/ServerState.java | 2
opends/src/server/org/opends/server/replication/changelog/Changelog.java | 4
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java | 8
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ChangeNumberTest.java | 8
opends/src/server/org/opends/server/replication/plugin/AttrInfoWithOptions.java | 2
opends/src/server/org/opends/server/replication/protocol/AddMsg.java | 6
opends/src/server/org/opends/server/replication/plugin/ValueInfo.java | 4
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java | 9
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentStateTest.java | 9
opends/src/server/org/opends/server/replication/protocol/SynchronizationMessage.java | 2
opends/src/server/org/opends/server/replication/plugin/package-info.java | 2
opends/src/server/org/opends/server/replication/protocol/WindowMessage.java | 2
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java | 10
opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java | 6
opends/src/server/org/opends/server/replication/changelog/ChangelogIteratorComparator.java | 4
opends/src/server/org/opends/server/replication/changelog/ServerWriter.java | 6
opends/src/server/org/opends/server/tasks/InitializeTask.java | 2
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/changelog/ChangelogTest.java | 27 +-
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/changelog/UpdateComparatorTest.java | 16
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java | 2
opends/src/server/org/opends/server/replication/plugin/SynchronizationMonitor.java | 2
opends/src/server/org/opends/server/replication/changelog/UpdateComparator.java | 6
opends/src/server/org/opends/server/replication/changelog/DbHandler.java | 8
opends/src/server/org/opends/server/replication/plugin/SynchronizationDomain.java | 42 +-
opends/src/server/org/opends/server/replication/protocol/SocketSession.java | 2
opends/src/server/org/opends/server/replication/plugin/ChangelogBroker.java | 20
opends/src/server/org/opends/server/replication/plugin/HistKey.java | 2
opends/src/server/org/opends/server/replication/plugin/ModifyFakeOperation.java | 8
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ValueInfoTest.java | 8
opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java | 8
opends/src/server/org/opends/server/replication/protocol/ChangelogStartMessage.java | 4
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java | 17
opends/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java | 2
opends/src/server/org/opends/server/replication/changelog/MsgQueue.java | 6
opends/src/server/org/opends/server/replication/protocol/InitializeTargetMessage.java | 2
opends/src/server/org/opends/server/replication/plugin/MultimasterSynchronization.java | 2
opends/src/server/org/opends/server/replication/protocol/UpdateMessage.java | 4
opends/src/server/org/opends/server/replication/protocol/ServerStartMessage.java | 4
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/changelog/dbHandlerTest.java | 13
opends/src/server/org/opends/server/replication/changelog/ChangelogIterator.java | 8
opends/src/server/org/opends/server/replication/protocol/EntryMessage.java | 2
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/SynchronizationMsgTest.java | 31 ++
opends/src/server/org/opends/server/tasks/InitializeTargetTask.java | 2
opends/src/server/org/opends/server/replication/common/ChangeNumberGenerator.java | 2
opends/src/server/org/opends/server/replication/changelog/ChangelogAckMessageList.java | 4
opends/src/server/org/opends/server/replication/changelog/ChangelogCache.java | 16
opends/resource/config/synchronization.ldif | 2
opends/src/server/org/opends/server/replication/changelog/ServerReader.java | 22 +-
opends/src/server/org/opends/server/replication/common/package-info.java | 4
opends/src/server/org/opends/server/replication/protocol/DoneMessage.java | 2
opends/src/server/org/opends/server/replication/protocol/ModifyContext.java | 4
opends/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java | 6
opends/src/server/org/opends/server/replication/protocol/RoutableMessage.java | 2
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java | 18
opends/src/server/org/opends/server/replication/plugin/ChangelogListener.java | 4
opends/src/server/org/opends/server/replication/changelog/ChangelogKey.java | 4
opends/src/server/org/opends/server/replication/plugin/HistVal.java | 4
opends/src/server/org/opends/server/replication/plugin/PendingChange.java | 6
opends/src/server/org/opends/server/replication/protocol/InitializeRequestMessage.java | 2
opends/src/server/org/opends/server/replication/changelog/ChangelogDBException.java | 2
opends/src/server/org/opends/server/replication/protocol/HeartbeatThread.java | 2
opends/src/server/org/opends/server/replication/changelog/AckMessageList.java | 4
opends/src/server/org/opends/server/replication/changelog/package-info.java | 2
98 files changed, 335 insertions(+), 303 deletions(-)
diff --git a/opends/resource/config/config.ldif b/opends/resource/config/config.ldif
index 64a8ea3..9f4ec56 100644
--- a/opends/resource/config/config.ldif
+++ b/opends/resource/config/config.ldif
@@ -735,7 +735,7 @@
objectClass: ds-cfg-ordering-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
-ds-cfg-matching-rule-class: org.opends.server.synchronization.plugin.HistoricalCsnOrderingMatchingRule
+ds-cfg-matching-rule-class: org.opends.server.replication.plugin.HistoricalCsnOrderingMatchingRule
ds-cfg-matching-rule-enabled: true
cn: Historical CSN Ordering Matching Rule
diff --git a/opends/resource/config/synchronization.ldif b/opends/resource/config/synchronization.ldif
index c2944fd..bd46837 100644
--- a/opends/resource/config/synchronization.ldif
+++ b/opends/resource/config/synchronization.ldif
@@ -15,7 +15,7 @@
objectClass: ds-cfg-synchronization-provider
objectClass: ds-cfg-multimaster-synchronization-provider
ds-cfg-synchronization-provider-enabled: true
-ds-cfg-synchronization-provider-class: org.opends.server.synchronization.plugin.MultimasterSynchronization
+ds-cfg-synchronization-provider-class: org.opends.server.replication.plugin.MultimasterSynchronization
dn: cn=domains, cn=Multimaster Synchronization,cn=Synchronization Providers,cn=config
objectClass: top
diff --git a/opends/resource/schema/02-config.ldif b/opends/resource/schema/02-config.ldif
index e0ee545..a847664 100644
--- a/opends/resource/schema/02-config.ldif
+++ b/opends/resource/schema/02-config.ldif
@@ -518,7 +518,7 @@
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
X-ORIGIN 'OpenDS Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.156 NAME 'ds-sync-hist'
- ORDERING historicalCsnOrderingMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ORDERING historicalCsnOrderingMatch
USAGE directoryOperation X-ORIGIN 'OpenDS Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.157
NAME 'ds-cfg-receive-status'
diff --git a/opends/src/server/org/opends/server/synchronization/changelog/AckMessageList.java b/opends/src/server/org/opends/server/replication/changelog/AckMessageList.java
similarity index 96%
rename from opends/src/server/org/opends/server/synchronization/changelog/AckMessageList.java
rename to opends/src/server/org/opends/server/replication/changelog/AckMessageList.java
index 54a5cc5..4d78f3d 100644
--- a/opends/src/server/org/opends/server/synchronization/changelog/AckMessageList.java
+++ b/opends/src/server/org/opends/server/replication/changelog/AckMessageList.java
@@ -24,11 +24,11 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
import java.util.LinkedList;
-import org.opends.server.synchronization.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumber;
/**
* This class is used to store the list of acks received for
diff --git a/opends/src/server/org/opends/server/synchronization/changelog/AckMessageListComparator.java b/opends/src/server/org/opends/server/replication/changelog/AckMessageListComparator.java
similarity index 95%
rename from opends/src/server/org/opends/server/synchronization/changelog/AckMessageListComparator.java
rename to opends/src/server/org/opends/server/replication/changelog/AckMessageListComparator.java
index 48c6cc9..bf33e23 100644
--- a/opends/src/server/org/opends/server/synchronization/changelog/AckMessageListComparator.java
+++ b/opends/src/server/org/opends/server/replication/changelog/AckMessageListComparator.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
import java.util.Comparator;
diff --git a/opends/src/server/org/opends/server/synchronization/changelog/Changelog.java b/opends/src/server/org/opends/server/replication/changelog/Changelog.java
similarity index 98%
rename from opends/src/server/org/opends/server/synchronization/changelog/Changelog.java
rename to opends/src/server/org/opends/server/replication/changelog/Changelog.java
index 221d232..c4965c6 100644
--- a/opends/src/server/org/opends/server/synchronization/changelog/Changelog.java
+++ b/opends/src/server/org/opends/server/replication/changelog/Changelog.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
import static org.opends.server.loggers.Error.logError;
import static org.opends.server.messages.MessageHandler.getMessage;
@@ -52,7 +52,7 @@
import org.opends.server.config.ConfigAttribute;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
-import org.opends.server.synchronization.protocol.SocketSession;
+import org.opends.server.replication.protocol.SocketSession;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.ErrorLogCategory;
diff --git a/opends/src/server/org/opends/server/synchronization/changelog/ChangelogAckMessageList.java b/opends/src/server/org/opends/server/replication/changelog/ChangelogAckMessageList.java
similarity index 95%
rename from opends/src/server/org/opends/server/synchronization/changelog/ChangelogAckMessageList.java
rename to opends/src/server/org/opends/server/replication/changelog/ChangelogAckMessageList.java
index e13d519..0df682f 100644
--- a/opends/src/server/org/opends/server/synchronization/changelog/ChangelogAckMessageList.java
+++ b/opends/src/server/org/opends/server/replication/changelog/ChangelogAckMessageList.java
@@ -24,9 +24,9 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
-import org.opends.server.synchronization.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumber;
/**
* This class is used to store acks for update messages coming from
diff --git a/opends/src/server/org/opends/server/synchronization/changelog/ChangelogCache.java b/opends/src/server/org/opends/server/replication/changelog/ChangelogCache.java
similarity index 97%
rename from opends/src/server/org/opends/server/synchronization/changelog/ChangelogCache.java
rename to opends/src/server/org/opends/server/replication/changelog/ChangelogCache.java
index 81cb38f..ae0f158 100644
--- a/opends/src/server/org/opends/server/synchronization/changelog/ChangelogCache.java
+++ b/opends/src/server/org/opends/server/replication/changelog/ChangelogCache.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
import static org.opends.server.loggers.Error.logError;
import static org.opends.server.messages.MessageHandler.getMessage;
@@ -39,13 +39,13 @@
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.common.ServerState;
-import org.opends.server.synchronization.protocol.AckMessage;
-import org.opends.server.synchronization.protocol.InitializeRequestMessage;
-import org.opends.server.synchronization.protocol.ErrorMessage;
-import org.opends.server.synchronization.protocol.RoutableMessage;
-import org.opends.server.synchronization.protocol.UpdateMessage;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.ServerState;
+import org.opends.server.replication.protocol.AckMessage;
+import org.opends.server.replication.protocol.ErrorMessage;
+import org.opends.server.replication.protocol.InitializeRequestMessage;
+import org.opends.server.replication.protocol.RoutableMessage;
+import org.opends.server.replication.protocol.UpdateMessage;
import org.opends.server.types.DN;
import org.opends.server.types.ErrorLogCategory;
import org.opends.server.types.ErrorLogSeverity;
diff --git a/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDB.java b/opends/src/server/org/opends/server/replication/changelog/ChangelogDB.java
similarity index 98%
rename from opends/src/server/org/opends/server/synchronization/changelog/ChangelogDB.java
rename to opends/src/server/org/opends/server/replication/changelog/ChangelogDB.java
index 2b6ba03..ce1902d 100644
--- a/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDB.java
+++ b/opends/src/server/org/opends/server/replication/changelog/ChangelogDB.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
import static org.opends.server.loggers.Error.logError;
import static org.opends.server.messages.MessageHandler.getMessage;
@@ -37,8 +37,8 @@
import org.opends.server.types.DN;
import org.opends.server.types.ErrorLogCategory;
import org.opends.server.types.ErrorLogSeverity;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.protocol.UpdateMessage;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.protocol.UpdateMessage;
import com.sleepycat.je.Cursor;
import com.sleepycat.je.DatabaseEntry;
diff --git a/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDBException.java b/opends/src/server/org/opends/server/replication/changelog/ChangelogDBException.java
similarity index 97%
rename from opends/src/server/org/opends/server/synchronization/changelog/ChangelogDBException.java
rename to opends/src/server/org/opends/server/replication/changelog/ChangelogDBException.java
index 542688c..cdbd331 100644
--- a/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDBException.java
+++ b/opends/src/server/org/opends/server/replication/changelog/ChangelogDBException.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
diff --git a/opends/src/server/org/opends/server/synchronization/changelog/ChangelogData.java b/opends/src/server/org/opends/server/replication/changelog/ChangelogData.java
similarity index 90%
rename from opends/src/server/org/opends/server/synchronization/changelog/ChangelogData.java
rename to opends/src/server/org/opends/server/replication/changelog/ChangelogData.java
index 75bea43..bd0f4a1 100644
--- a/opends/src/server/org/opends/server/synchronization/changelog/ChangelogData.java
+++ b/opends/src/server/org/opends/server/replication/changelog/ChangelogData.java
@@ -24,12 +24,12 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
import com.sleepycat.je.DatabaseEntry;
-import org.opends.server.synchronization.protocol.SynchronizationMessage;
-import org.opends.server.synchronization.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.SynchronizationMessage;
+import org.opends.server.replication.protocol.UpdateMessage;
/**
* SuperClass of DatabaseEntry used for data stored in the Changelog Databases.
diff --git a/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDbEnv.java b/opends/src/server/org/opends/server/replication/changelog/ChangelogDbEnv.java
similarity index 99%
rename from opends/src/server/org/opends/server/synchronization/changelog/ChangelogDbEnv.java
rename to opends/src/server/org/opends/server/replication/changelog/ChangelogDbEnv.java
index fd6383e..397e3f9 100644
--- a/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDbEnv.java
+++ b/opends/src/server/org/opends/server/replication/changelog/ChangelogDbEnv.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
import static org.opends.server.loggers.Error.logError;
import static org.opends.server.messages.MessageHandler.getMessage;
diff --git a/opends/src/server/org/opends/server/synchronization/changelog/ChangelogIterator.java b/opends/src/server/org/opends/server/replication/changelog/ChangelogIterator.java
similarity index 92%
rename from opends/src/server/org/opends/server/synchronization/changelog/ChangelogIterator.java
rename to opends/src/server/org/opends/server/replication/changelog/ChangelogIterator.java
index 1594962..891d427 100644
--- a/opends/src/server/org/opends/server/synchronization/changelog/ChangelogIterator.java
+++ b/opends/src/server/org/opends/server/replication/changelog/ChangelogIterator.java
@@ -24,13 +24,13 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
import com.sleepycat.je.DatabaseException;
-import org.opends.server.synchronization.changelog.ChangelogDB.ChangelogCursor;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.protocol.UpdateMessage;
+import org.opends.server.replication.changelog.ChangelogDB.ChangelogCursor;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.protocol.UpdateMessage;
/**
* This class allows to iterate through the changes received from a given
diff --git a/opends/src/server/org/opends/server/synchronization/changelog/ChangelogIteratorComparator.java b/opends/src/server/org/opends/server/replication/changelog/ChangelogIteratorComparator.java
similarity index 93%
rename from opends/src/server/org/opends/server/synchronization/changelog/ChangelogIteratorComparator.java
rename to opends/src/server/org/opends/server/replication/changelog/ChangelogIteratorComparator.java
index 67bb054..9585f7b 100644
--- a/opends/src/server/org/opends/server/synchronization/changelog/ChangelogIteratorComparator.java
+++ b/opends/src/server/org/opends/server/replication/changelog/ChangelogIteratorComparator.java
@@ -24,11 +24,11 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
import java.util.Comparator;
-import org.opends.server.synchronization.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumber;
/**
* This Class define a Comparator that allows to know which ChangelogIterator
diff --git a/opends/src/server/org/opends/server/synchronization/changelog/ChangelogKey.java b/opends/src/server/org/opends/server/replication/changelog/ChangelogKey.java
similarity index 93%
rename from opends/src/server/org/opends/server/synchronization/changelog/ChangelogKey.java
rename to opends/src/server/org/opends/server/replication/changelog/ChangelogKey.java
index eebf9cb..25d707b 100644
--- a/opends/src/server/org/opends/server/synchronization/changelog/ChangelogKey.java
+++ b/opends/src/server/org/opends/server/replication/changelog/ChangelogKey.java
@@ -24,13 +24,13 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
import java.io.UnsupportedEncodingException;
import com.sleepycat.je.DatabaseEntry;
-import org.opends.server.synchronization.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumber;
/**
* Superclass of DatabaseEntry.
diff --git a/opends/src/server/org/opends/server/synchronization/changelog/DbHandler.java b/opends/src/server/org/opends/server/replication/changelog/DbHandler.java
similarity index 97%
rename from opends/src/server/org/opends/server/synchronization/changelog/DbHandler.java
rename to opends/src/server/org/opends/server/replication/changelog/DbHandler.java
index 901b611..09e9949 100644
--- a/opends/src/server/org/opends/server/synchronization/changelog/DbHandler.java
+++ b/opends/src/server/org/opends/server/replication/changelog/DbHandler.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
import static org.opends.server.loggers.Error.logError;
import static org.opends.server.messages.MessageHandler.getMessage;
@@ -48,9 +48,9 @@
import org.opends.server.types.InitializationException;
import org.opends.server.util.TimeThread;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.synchronization.changelog.ChangelogDB.ChangelogCursor;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.protocol.UpdateMessage;
+import org.opends.server.replication.changelog.ChangelogDB.ChangelogCursor;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.protocol.UpdateMessage;
import com.sleepycat.je.DatabaseException;
diff --git a/opends/src/server/org/opends/server/synchronization/changelog/MsgQueue.java b/opends/src/server/org/opends/server/replication/changelog/MsgQueue.java
similarity index 94%
rename from opends/src/server/org/opends/server/synchronization/changelog/MsgQueue.java
rename to opends/src/server/org/opends/server/replication/changelog/MsgQueue.java
index ccebb88..585c2f0 100644
--- a/opends/src/server/org/opends/server/synchronization/changelog/MsgQueue.java
+++ b/opends/src/server/org/opends/server/replication/changelog/MsgQueue.java
@@ -24,13 +24,13 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
import java.util.SortedMap;
import java.util.TreeMap;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.protocol.UpdateMessage;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.protocol.UpdateMessage;
/**
* This class is used to build ordered lists of UpdateMessage.
diff --git a/opends/src/server/org/opends/server/synchronization/changelog/ServerHandler.java b/opends/src/server/org/opends/server/replication/changelog/ServerHandler.java
similarity index 97%
rename from opends/src/server/org/opends/server/synchronization/changelog/ServerHandler.java
rename to opends/src/server/org/opends/server/replication/changelog/ServerHandler.java
index 23312cb..4a90410 100644
--- a/opends/src/server/org/opends/server/synchronization/changelog/ServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/changelog/ServerHandler.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
import static org.opends.server.loggers.Error.logError;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
@@ -47,17 +47,17 @@
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.common.ServerState;
-import org.opends.server.synchronization.protocol.AckMessage;
-import org.opends.server.synchronization.protocol.ChangelogStartMessage;
-import org.opends.server.synchronization.protocol.HeartbeatThread;
-import org.opends.server.synchronization.protocol.ProtocolSession;
-import org.opends.server.synchronization.protocol.RoutableMessage;
-import org.opends.server.synchronization.protocol.ServerStartMessage;
-import org.opends.server.synchronization.protocol.SynchronizationMessage;
-import org.opends.server.synchronization.protocol.UpdateMessage;
-import org.opends.server.synchronization.protocol.WindowMessage;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.ServerState;
+import org.opends.server.replication.protocol.AckMessage;
+import org.opends.server.replication.protocol.ChangelogStartMessage;
+import org.opends.server.replication.protocol.HeartbeatThread;
+import org.opends.server.replication.protocol.ProtocolSession;
+import org.opends.server.replication.protocol.RoutableMessage;
+import org.opends.server.replication.protocol.ServerStartMessage;
+import org.opends.server.replication.protocol.SynchronizationMessage;
+import org.opends.server.replication.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.WindowMessage;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
diff --git a/opends/src/server/org/opends/server/synchronization/changelog/ServerReader.java b/opends/src/server/org/opends/server/replication/changelog/ServerReader.java
similarity index 88%
rename from opends/src/server/org/opends/server/synchronization/changelog/ServerReader.java
rename to opends/src/server/org/opends/server/replication/changelog/ServerReader.java
index 2f6f620..87cd407 100644
--- a/opends/src/server/org/opends/server/synchronization/changelog/ServerReader.java
+++ b/opends/src/server/org/opends/server/replication/changelog/ServerReader.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
import static org.opends.server.loggers.Error.logError;
import static org.opends.server.messages.MessageHandler.getMessage;
@@ -33,16 +33,16 @@
import java.io.IOException;
import org.opends.server.api.DirectoryThread;
-import org.opends.server.synchronization.protocol.AckMessage;
-import org.opends.server.synchronization.protocol.ErrorMessage;
-import org.opends.server.synchronization.protocol.DoneMessage;
-import org.opends.server.synchronization.protocol.EntryMessage;
-import org.opends.server.synchronization.protocol.InitializeRequestMessage;
-import org.opends.server.synchronization.protocol.InitializeTargetMessage;
-import org.opends.server.synchronization.protocol.ProtocolSession;
-import org.opends.server.synchronization.protocol.SynchronizationMessage;
-import org.opends.server.synchronization.protocol.UpdateMessage;
-import org.opends.server.synchronization.protocol.WindowMessage;
+import org.opends.server.replication.protocol.AckMessage;
+import org.opends.server.replication.protocol.DoneMessage;
+import org.opends.server.replication.protocol.EntryMessage;
+import org.opends.server.replication.protocol.ErrorMessage;
+import org.opends.server.replication.protocol.InitializeRequestMessage;
+import org.opends.server.replication.protocol.InitializeTargetMessage;
+import org.opends.server.replication.protocol.ProtocolSession;
+import org.opends.server.replication.protocol.SynchronizationMessage;
+import org.opends.server.replication.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.WindowMessage;
import org.opends.server.types.ErrorLogCategory;
import org.opends.server.types.ErrorLogSeverity;
diff --git a/opends/src/server/org/opends/server/synchronization/changelog/ServerWriter.java b/opends/src/server/org/opends/server/replication/changelog/ServerWriter.java
similarity index 95%
rename from opends/src/server/org/opends/server/synchronization/changelog/ServerWriter.java
rename to opends/src/server/org/opends/server/replication/changelog/ServerWriter.java
index f2951de..2d96876 100644
--- a/opends/src/server/org/opends/server/synchronization/changelog/ServerWriter.java
+++ b/opends/src/server/org/opends/server/replication/changelog/ServerWriter.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
import static org.opends.server.loggers.Error.logError;
import static org.opends.server.messages.MessageHandler.getMessage;
@@ -35,8 +35,8 @@
import java.util.NoSuchElementException;
import org.opends.server.api.DirectoryThread;
-import org.opends.server.synchronization.protocol.ProtocolSession;
-import org.opends.server.synchronization.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.ProtocolSession;
+import org.opends.server.replication.protocol.UpdateMessage;
import org.opends.server.types.ErrorLogCategory;
import org.opends.server.types.ErrorLogSeverity;
diff --git a/opends/src/server/org/opends/server/synchronization/changelog/UpdateComparator.java b/opends/src/server/org/opends/server/replication/changelog/UpdateComparator.java
similarity index 90%
rename from opends/src/server/org/opends/server/synchronization/changelog/UpdateComparator.java
rename to opends/src/server/org/opends/server/replication/changelog/UpdateComparator.java
index eda7272..ea880d7 100644
--- a/opends/src/server/org/opends/server/synchronization/changelog/UpdateComparator.java
+++ b/opends/src/server/org/opends/server/replication/changelog/UpdateComparator.java
@@ -24,12 +24,12 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
import java.util.Comparator;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.protocol.UpdateMessage;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.protocol.UpdateMessage;
/**
* Class to use for establishing an order within UpdateMessages.
diff --git a/opends/src/server/org/opends/server/synchronization/changelog/package-info.java b/opends/src/server/org/opends/server/replication/changelog/package-info.java
similarity index 97%
rename from opends/src/server/org/opends/server/synchronization/changelog/package-info.java
rename to opends/src/server/org/opends/server/replication/changelog/package-info.java
index fe582ab..79d16fc 100644
--- a/opends/src/server/org/opends/server/synchronization/changelog/package-info.java
+++ b/opends/src/server/org/opends/server/replication/changelog/package-info.java
@@ -76,4 +76,4 @@
* </ul>
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
diff --git a/opends/src/server/org/opends/server/synchronization/common/ChangeNumber.java b/opends/src/server/org/opends/server/replication/common/ChangeNumber.java
similarity index 98%
rename from opends/src/server/org/opends/server/synchronization/common/ChangeNumber.java
rename to opends/src/server/org/opends/server/replication/common/ChangeNumber.java
index fc29781..cb73fb4 100644
--- a/opends/src/server/org/opends/server/synchronization/common/ChangeNumber.java
+++ b/opends/src/server/org/opends/server/replication/common/ChangeNumber.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.common;
+package org.opends.server.replication.common;
/**
* Class used to represent Change Numbers.
diff --git a/opends/src/server/org/opends/server/synchronization/common/ChangeNumberGenerator.java b/opends/src/server/org/opends/server/replication/common/ChangeNumberGenerator.java
similarity index 98%
rename from opends/src/server/org/opends/server/synchronization/common/ChangeNumberGenerator.java
rename to opends/src/server/org/opends/server/replication/common/ChangeNumberGenerator.java
index aa311fb..a49577c 100644
--- a/opends/src/server/org/opends/server/synchronization/common/ChangeNumberGenerator.java
+++ b/opends/src/server/org/opends/server/replication/common/ChangeNumberGenerator.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.common;
+package org.opends.server.replication.common;
import org.opends.server.util.TimeThread;
diff --git a/opends/src/server/org/opends/server/synchronization/common/ServerState.java b/opends/src/server/org/opends/server/replication/common/ServerState.java
similarity index 99%
rename from opends/src/server/org/opends/server/synchronization/common/ServerState.java
rename to opends/src/server/org/opends/server/replication/common/ServerState.java
index 1804fa5..50c79f2 100644
--- a/opends/src/server/org/opends/server/synchronization/common/ServerState.java
+++ b/opends/src/server/org/opends/server/replication/common/ServerState.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.common;
+package org.opends.server.replication.common;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
diff --git a/opends/src/server/org/opends/server/synchronization/common/package-info.java b/opends/src/server/org/opends/server/replication/common/package-info.java
similarity index 93%
rename from opends/src/server/org/opends/server/synchronization/common/package-info.java
rename to opends/src/server/org/opends/server/replication/common/package-info.java
index b8e3fa0..96d3f4d 100644
--- a/opends/src/server/org/opends/server/synchronization/common/package-info.java
+++ b/opends/src/server/org/opends/server/replication/common/package-info.java
@@ -27,7 +27,7 @@
/**
* This package contains utilities that can are used by all the packages
- * below org.opends.server.synchronization.
+ * below org.opends.server.replication.
* <br>
* The main classes of this core are :
* <ul>
@@ -43,4 +43,4 @@
* </li>
* </ul>
*/
-package org.opends.server.synchronization.common;
+package org.opends.server.replication.common;
diff --git a/opends/src/server/org/opends/server/synchronization/package-info.java b/opends/src/server/org/opends/server/replication/package-info.java
similarity index 95%
rename from opends/src/server/org/opends/server/synchronization/package-info.java
rename to opends/src/server/org/opends/server/replication/package-info.java
index 66a3381..bd0b285 100644
--- a/opends/src/server/org/opends/server/synchronization/package-info.java
+++ b/opends/src/server/org/opends/server/replication/package-info.java
@@ -29,4 +29,4 @@
* This package contains the code for the synchronization feature
* which provides a Multi-Master replication system.
*/
-package org.opends.server.synchronization;
+package org.opends.server.replication;
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/AttrInfo.java b/opends/src/server/org/opends/server/replication/plugin/AttrInfo.java
similarity index 97%
rename from opends/src/server/org/opends/server/synchronization/plugin/AttrInfo.java
rename to opends/src/server/org/opends/server/replication/plugin/AttrInfo.java
index 33f6b32..183a7c8 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/AttrInfo.java
+++ b/opends/src/server/org/opends/server/replication/plugin/AttrInfo.java
@@ -24,13 +24,13 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashSet;
-import org.opends.server.synchronization.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.types.AttributeValue;
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/AttrInfoWithOptions.java b/opends/src/server/org/opends/server/replication/plugin/AttrInfoWithOptions.java
similarity index 97%
rename from opends/src/server/org/opends/server/synchronization/plugin/AttrInfoWithOptions.java
rename to opends/src/server/org/opends/server/replication/plugin/AttrInfoWithOptions.java
index 336b83a..66ded95 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/AttrInfoWithOptions.java
+++ b/opends/src/server/org/opends/server/replication/plugin/AttrInfoWithOptions.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
import java.util.HashMap;
import java.util.Set;
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/ChangelogBroker.java b/opends/src/server/org/opends/server/replication/plugin/ChangelogBroker.java
similarity index 96%
rename from opends/src/server/org/opends/server/synchronization/plugin/ChangelogBroker.java
rename to opends/src/server/org/opends/server/replication/plugin/ChangelogBroker.java
index b1d1036..7162149 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/ChangelogBroker.java
+++ b/opends/src/server/org/opends/server/replication/plugin/ChangelogBroker.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
import static org.opends.server.loggers.Error.logError;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
@@ -50,15 +50,15 @@
import org.opends.server.protocols.internal.InternalSearchListener;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPFilter;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.common.ServerState;
-import org.opends.server.synchronization.protocol.ChangelogStartMessage;
-import org.opends.server.synchronization.protocol.ProtocolSession;
-import org.opends.server.synchronization.protocol.ServerStartMessage;
-import org.opends.server.synchronization.protocol.SocketSession;
-import org.opends.server.synchronization.protocol.SynchronizationMessage;
-import org.opends.server.synchronization.protocol.UpdateMessage;
-import org.opends.server.synchronization.protocol.WindowMessage;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.ServerState;
+import org.opends.server.replication.protocol.ChangelogStartMessage;
+import org.opends.server.replication.protocol.ProtocolSession;
+import org.opends.server.replication.protocol.ServerStartMessage;
+import org.opends.server.replication.protocol.SocketSession;
+import org.opends.server.replication.protocol.SynchronizationMessage;
+import org.opends.server.replication.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.WindowMessage;
import org.opends.server.types.DN;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.ErrorLogCategory;
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/ChangelogListener.java b/opends/src/server/org/opends/server/replication/plugin/ChangelogListener.java
similarity index 97%
rename from opends/src/server/org/opends/server/synchronization/plugin/ChangelogListener.java
rename to opends/src/server/org/opends/server/replication/plugin/ChangelogListener.java
index 68e50c8..98f1d03 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/ChangelogListener.java
+++ b/opends/src/server/org/opends/server/replication/plugin/ChangelogListener.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
import java.util.List;
@@ -33,7 +33,7 @@
import org.opends.server.admin.std.server.ChangelogServerCfg;
import org.opends.server.admin.std.server.MultimasterSynchronizationProviderCfg;
import org.opends.server.config.ConfigException;
-import org.opends.server.synchronization.changelog.Changelog;
+import org.opends.server.replication.changelog.Changelog;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.ResultCode;
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/FakeOperation.java b/opends/src/server/org/opends/server/replication/plugin/FakeOperation.java
similarity index 93%
rename from opends/src/server/org/opends/server/synchronization/plugin/FakeOperation.java
rename to opends/src/server/org/opends/server/replication/plugin/FakeOperation.java
index 21b53ae..115cff3 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/FakeOperation.java
+++ b/opends/src/server/org/opends/server/replication/plugin/FakeOperation.java
@@ -24,10 +24,10 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.protocol.SynchronizationMessage;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.protocol.SynchronizationMessage;
import org.opends.server.types.Modification;
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/FakeOperationComparator.java b/opends/src/server/org/opends/server/replication/plugin/FakeOperationComparator.java
similarity index 96%
rename from opends/src/server/org/opends/server/synchronization/plugin/FakeOperationComparator.java
rename to opends/src/server/org/opends/server/replication/plugin/FakeOperationComparator.java
index 993ba00..504bbfe 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/FakeOperationComparator.java
+++ b/opends/src/server/org/opends/server/replication/plugin/FakeOperationComparator.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
import java.util.Comparator;
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/HeartbeatMonitor.java b/opends/src/server/org/opends/server/replication/plugin/HeartbeatMonitor.java
similarity index 96%
rename from opends/src/server/org/opends/server/synchronization/plugin/HeartbeatMonitor.java
rename to opends/src/server/org/opends/server/replication/plugin/HeartbeatMonitor.java
index 670db40..0987c81 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/HeartbeatMonitor.java
+++ b/opends/src/server/org/opends/server/replication/plugin/HeartbeatMonitor.java
@@ -25,7 +25,7 @@
* Portions Copyright 2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.debug.DebugLogger.debugInfo;
@@ -33,7 +33,7 @@
import java.io.IOException;
import org.opends.server.api.DirectoryThread;
-import org.opends.server.synchronization.protocol.ProtocolSession;
+import org.opends.server.replication.protocol.ProtocolSession;
/**
* This class implements a thread to monitor heartbeat messages from the
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/HistKey.java b/opends/src/server/org/opends/server/replication/plugin/HistKey.java
similarity index 97%
rename from opends/src/server/org/opends/server/synchronization/plugin/HistKey.java
rename to opends/src/server/org/opends/server/replication/plugin/HistKey.java
index d5c490d..71c630f 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/HistKey.java
+++ b/opends/src/server/org/opends/server/replication/plugin/HistKey.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
/**
* Enumeration used for storing type of historical information.
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/HistVal.java b/opends/src/server/org/opends/server/replication/plugin/HistVal.java
similarity index 97%
rename from opends/src/server/org/opends/server/synchronization/plugin/HistVal.java
rename to opends/src/server/org/opends/server/replication/plugin/HistVal.java
index c1226a8..a947d44 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/HistVal.java
+++ b/opends/src/server/org/opends/server/replication/plugin/HistVal.java
@@ -24,13 +24,13 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
import java.util.LinkedHashSet;
import java.util.Set;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.synchronization.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/Historical.java b/opends/src/server/org/opends/server/replication/plugin/Historical.java
similarity index 99%
rename from opends/src/server/org/opends/server/synchronization/plugin/Historical.java
rename to opends/src/server/org/opends/server/replication/plugin/Historical.java
index fb86913..a1213cc 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/Historical.java
+++ b/opends/src/server/org/opends/server/replication/plugin/Historical.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
import java.util.ArrayList;
import java.util.HashMap;
@@ -39,8 +39,8 @@
import org.opends.server.core.AddOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.protocol.OperationContext;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.protocol.OperationContext;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/HistoricalCsnOrderingMatchingRule.java b/opends/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java
similarity index 98%
rename from opends/src/server/org/opends/server/synchronization/plugin/HistoricalCsnOrderingMatchingRule.java
rename to opends/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java
index 6930b03..9635161 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/HistoricalCsnOrderingMatchingRule.java
+++ b/opends/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.config.ConfigEntry;
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/ListenerThread.java b/opends/src/server/org/opends/server/replication/plugin/ListenerThread.java
similarity index 95%
rename from opends/src/server/org/opends/server/synchronization/plugin/ListenerThread.java
rename to opends/src/server/org/opends/server/replication/plugin/ListenerThread.java
index ca55624..a44f245 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/ListenerThread.java
+++ b/opends/src/server/org/opends/server/replication/plugin/ListenerThread.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
import static org.opends.server.loggers.Error.logError;
import static org.opends.server.messages.MessageHandler.getMessage;
@@ -32,7 +32,7 @@
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
import org.opends.server.api.DirectoryThread;
-import org.opends.server.synchronization.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.UpdateMessage;
import org.opends.server.types.ErrorLogCategory;
import org.opends.server.types.ErrorLogSeverity;
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/ModifyFakeOperation.java b/opends/src/server/org/opends/server/replication/plugin/ModifyFakeOperation.java
similarity index 90%
rename from opends/src/server/org/opends/server/synchronization/plugin/ModifyFakeOperation.java
rename to opends/src/server/org/opends/server/replication/plugin/ModifyFakeOperation.java
index 52b6dca..e795ab0 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/ModifyFakeOperation.java
+++ b/opends/src/server/org/opends/server/replication/plugin/ModifyFakeOperation.java
@@ -24,13 +24,13 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
import java.util.ArrayList;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.protocol.ModifyMsg;
-import org.opends.server.synchronization.protocol.SynchronizationMessage;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.protocol.ModifyMsg;
+import org.opends.server.replication.protocol.SynchronizationMessage;
import org.opends.server.types.DN;
import org.opends.server.types.Modification;
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/MultimasterSynchronization.java b/opends/src/server/org/opends/server/replication/plugin/MultimasterSynchronization.java
similarity index 99%
rename from opends/src/server/org/opends/server/synchronization/plugin/MultimasterSynchronization.java
rename to opends/src/server/org/opends/server/replication/plugin/MultimasterSynchronization.java
index da57868..8a5365a 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/MultimasterSynchronization.java
+++ b/opends/src/server/org/opends/server/replication/plugin/MultimasterSynchronization.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
import java.util.HashMap;
import java.util.List;
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/PendingChange.java b/opends/src/server/org/opends/server/replication/plugin/PendingChange.java
similarity index 94%
rename from opends/src/server/org/opends/server/synchronization/plugin/PendingChange.java
rename to opends/src/server/org/opends/server/replication/plugin/PendingChange.java
index 001da1b..9eba25a 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/PendingChange.java
+++ b/opends/src/server/org/opends/server/replication/plugin/PendingChange.java
@@ -24,10 +24,10 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.protocol.UpdateMessage;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.protocol.UpdateMessage;
import org.opends.server.types.Operation;
/**
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/PersistentServerState.java b/opends/src/server/org/opends/server/replication/plugin/PersistentServerState.java
similarity index 97%
rename from opends/src/server/org/opends/server/synchronization/plugin/PersistentServerState.java
rename to opends/src/server/org/opends/server/replication/plugin/PersistentServerState.java
index a37adff..4ee6d09 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/PersistentServerState.java
+++ b/opends/src/server/org/opends/server/replication/plugin/PersistentServerState.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
import static org.opends.server.loggers.Error.logError;
import static org.opends.server.messages.MessageHandler.getMessage;
@@ -43,8 +43,8 @@
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.protocols.ldap.LDAPModification;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.common.ServerState;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.ServerState;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/SynchroLDIFInputStream.java b/opends/src/server/org/opends/server/replication/plugin/SynchroLDIFInputStream.java
similarity index 98%
rename from opends/src/server/org/opends/server/synchronization/plugin/SynchroLDIFInputStream.java
rename to opends/src/server/org/opends/server/replication/plugin/SynchroLDIFInputStream.java
index 973437c..9252bb4 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/SynchroLDIFInputStream.java
+++ b/opends/src/server/org/opends/server/replication/plugin/SynchroLDIFInputStream.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/SynchroLDIFOutputStream.java b/opends/src/server/org/opends/server/replication/plugin/SynchroLDIFOutputStream.java
similarity index 97%
rename from opends/src/server/org/opends/server/synchronization/plugin/SynchroLDIFOutputStream.java
rename to opends/src/server/org/opends/server/replication/plugin/SynchroLDIFOutputStream.java
index 75c40a0..2516a7e 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/SynchroLDIFOutputStream.java
+++ b/opends/src/server/org/opends/server/replication/plugin/SynchroLDIFOutputStream.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java b/opends/src/server/org/opends/server/replication/plugin/SynchronizationDomain.java
similarity index 98%
rename from opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
rename to opends/src/server/org/opends/server/replication/plugin/SynchronizationDomain.java
index b8fd131..3ff932c 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
+++ b/opends/src/server/org/opends/server/replication/plugin/SynchronizationDomain.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
import static org.opends.server.config.ConfigConstants.ATTR_BACKEND_BASE_DN;
import static org.opends.server.config.ConfigConstants.ATTR_BACKEND_CLASS;
@@ -37,8 +37,8 @@
import static org.opends.server.messages.MessageHandler.getMessage;
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.messages.SynchronizationMessages.*;
-import static org.opends.server.synchronization.plugin.Historical.ENTRYUIDNAME;
-import static org.opends.server.synchronization.protocol.OperationContext.*;
+import static org.opends.server.replication.plugin.Historical.ENTRYUIDNAME;
+import static org.opends.server.replication.protocol.OperationContext.*;
import static org.opends.server.util.StaticUtils.createEntry;
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
@@ -76,24 +76,24 @@
import org.opends.server.protocols.asn1.ASN1Exception;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.common.ChangeNumberGenerator;
-import org.opends.server.synchronization.common.ServerState;
-import org.opends.server.synchronization.protocol.AckMessage;
-import org.opends.server.synchronization.protocol.AddContext;
-import org.opends.server.synchronization.protocol.DeleteContext;
-import org.opends.server.synchronization.protocol.DoneMessage;
-import org.opends.server.synchronization.protocol.EntryMessage;
-import org.opends.server.synchronization.protocol.ErrorMessage;
-import org.opends.server.synchronization.protocol.InitializeRequestMessage;
-import org.opends.server.synchronization.protocol.InitializeTargetMessage;
-import org.opends.server.synchronization.protocol.ModifyContext;
-import org.opends.server.synchronization.protocol.ModifyDNMsg;
-import org.opends.server.synchronization.protocol.ModifyDnContext;
-import org.opends.server.synchronization.protocol.OperationContext;
-import org.opends.server.synchronization.protocol.RoutableMessage;
-import org.opends.server.synchronization.protocol.SynchronizationMessage;
-import org.opends.server.synchronization.protocol.UpdateMessage;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumberGenerator;
+import org.opends.server.replication.common.ServerState;
+import org.opends.server.replication.protocol.AckMessage;
+import org.opends.server.replication.protocol.AddContext;
+import org.opends.server.replication.protocol.DeleteContext;
+import org.opends.server.replication.protocol.DoneMessage;
+import org.opends.server.replication.protocol.EntryMessage;
+import org.opends.server.replication.protocol.ErrorMessage;
+import org.opends.server.replication.protocol.InitializeRequestMessage;
+import org.opends.server.replication.protocol.InitializeTargetMessage;
+import org.opends.server.replication.protocol.ModifyContext;
+import org.opends.server.replication.protocol.ModifyDNMsg;
+import org.opends.server.replication.protocol.ModifyDnContext;
+import org.opends.server.replication.protocol.OperationContext;
+import org.opends.server.replication.protocol.RoutableMessage;
+import org.opends.server.replication.protocol.SynchronizationMessage;
+import org.opends.server.replication.protocol.UpdateMessage;
import org.opends.server.tasks.InitializeTargetTask;
import org.opends.server.tasks.InitializeTask;
import org.opends.server.tasks.TaskUtils;
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationMonitor.java b/opends/src/server/org/opends/server/replication/plugin/SynchronizationMonitor.java
similarity index 98%
rename from opends/src/server/org/opends/server/synchronization/plugin/SynchronizationMonitor.java
rename to opends/src/server/org/opends/server/replication/plugin/SynchronizationMonitor.java
index 26b85df..be8d9a2 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationMonitor.java
+++ b/opends/src/server/org/opends/server/replication/plugin/SynchronizationMonitor.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
import java.util.ArrayList;
import java.util.LinkedHashSet;
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/ValueInfo.java b/opends/src/server/org/opends/server/replication/plugin/ValueInfo.java
similarity index 96%
rename from opends/src/server/org/opends/server/synchronization/plugin/ValueInfo.java
rename to opends/src/server/org/opends/server/replication/plugin/ValueInfo.java
index e1bedb0..ed4dc88 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/ValueInfo.java
+++ b/opends/src/server/org/opends/server/replication/plugin/ValueInfo.java
@@ -24,9 +24,9 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
-import org.opends.server.synchronization.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.types.AttributeValue;
/**
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/package-info.java b/opends/src/server/org/opends/server/replication/plugin/package-info.java
similarity index 97%
rename from opends/src/server/org/opends/server/synchronization/plugin/package-info.java
rename to opends/src/server/org/opends/server/replication/plugin/package-info.java
index 6dd14f8..297e465 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/package-info.java
+++ b/opends/src/server/org/opends/server/replication/plugin/package-info.java
@@ -47,4 +47,4 @@
* </li>
* </ul>
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/AckMessage.java b/opends/src/server/org/opends/server/replication/protocol/AckMessage.java
similarity index 96%
rename from opends/src/server/org/opends/server/synchronization/protocol/AckMessage.java
rename to opends/src/server/org/opends/server/replication/protocol/AckMessage.java
index 97a437f..9cc8e83 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/AckMessage.java
+++ b/opends/src/server/org/opends/server/replication/protocol/AckMessage.java
@@ -24,12 +24,12 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
import java.io.UnsupportedEncodingException;
import java.util.zip.DataFormatException;
-import org.opends.server.synchronization.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumber;
/**
* Used to send acks between LDAP and changelog servers.
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/AddContext.java b/opends/src/server/org/opends/server/replication/protocol/AddContext.java
similarity index 93%
rename from opends/src/server/org/opends/server/synchronization/protocol/AddContext.java
rename to opends/src/server/org/opends/server/replication/protocol/AddContext.java
index e873d3f..43e0183 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/AddContext.java
+++ b/opends/src/server/org/opends/server/replication/protocol/AddContext.java
@@ -24,9 +24,9 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
-import org.opends.server.synchronization.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumber;
/**
* This class describe the Synchronization contexte that is attached to
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/AddMsg.java b/opends/src/server/org/opends/server/replication/protocol/AddMsg.java
similarity index 97%
rename from opends/src/server/org/opends/server/synchronization/protocol/AddMsg.java
rename to opends/src/server/org/opends/server/replication/protocol/AddMsg.java
index 754f067..4f41767 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/AddMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/AddMsg.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DirectoryServer;
@@ -41,13 +41,13 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.LDAPAttribute;
-import org.opends.server.synchronization.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.LDAPException;
import org.opends.server.types.RawAttribute;
-import static org.opends.server.synchronization.protocol.OperationContext.*;
+import static org.opends.server.replication.protocol.OperationContext.*;
import static org.opends.server.util.StaticUtils.toLowerCase;
/**
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/ChangelogStartMessage.java b/opends/src/server/org/opends/server/replication/protocol/ChangelogStartMessage.java
similarity index 98%
rename from opends/src/server/org/opends/server/synchronization/protocol/ChangelogStartMessage.java
rename to opends/src/server/org/opends/server/replication/protocol/ChangelogStartMessage.java
index 8023132..3853c92 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/ChangelogStartMessage.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ChangelogStartMessage.java
@@ -24,13 +24,13 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.zip.DataFormatException;
-import org.opends.server.synchronization.common.ServerState;
+import org.opends.server.replication.common.ServerState;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/DeleteContext.java b/opends/src/server/org/opends/server/replication/protocol/DeleteContext.java
similarity index 92%
rename from opends/src/server/org/opends/server/synchronization/protocol/DeleteContext.java
rename to opends/src/server/org/opends/server/replication/protocol/DeleteContext.java
index 7d706f3..cf09b5b 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/DeleteContext.java
+++ b/opends/src/server/org/opends/server/replication/protocol/DeleteContext.java
@@ -24,9 +24,9 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
-import org.opends.server.synchronization.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumber;
/**
* This class is used to describe the context attached to a Delete Operation.
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/DeleteMsg.java b/opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java
similarity index 94%
rename from opends/src/server/org/opends/server/synchronization/protocol/DeleteMsg.java
rename to opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java
index d40b233..e439144 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/DeleteMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java
@@ -24,9 +24,9 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
-import static org.opends.server.synchronization.protocol.OperationContext.*;
+import static org.opends.server.replication.protocol.OperationContext.*;
import java.io.UnsupportedEncodingException;
import java.util.zip.DataFormatException;
@@ -34,7 +34,7 @@
import org.opends.server.core.DeleteOperation;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.synchronization.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.types.Operation;
/**
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/DoneMessage.java b/opends/src/server/org/opends/server/replication/protocol/DoneMessage.java
similarity index 98%
rename from opends/src/server/org/opends/server/synchronization/protocol/DoneMessage.java
rename to opends/src/server/org/opends/server/replication/protocol/DoneMessage.java
index 23bc42f..741558e 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/DoneMessage.java
+++ b/opends/src/server/org/opends/server/replication/protocol/DoneMessage.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/EntryMessage.java b/opends/src/server/org/opends/server/replication/protocol/EntryMessage.java
similarity index 98%
rename from opends/src/server/org/opends/server/synchronization/protocol/EntryMessage.java
rename to opends/src/server/org/opends/server/replication/protocol/EntryMessage.java
index cea9198..4c2b8d7 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/EntryMessage.java
+++ b/opends/src/server/org/opends/server/replication/protocol/EntryMessage.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/ErrorMessage.java b/opends/src/server/org/opends/server/replication/protocol/ErrorMessage.java
similarity index 98%
rename from opends/src/server/org/opends/server/synchronization/protocol/ErrorMessage.java
rename to opends/src/server/org/opends/server/replication/protocol/ErrorMessage.java
index 597041e..e530ee7 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/ErrorMessage.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ErrorMessage.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/HeartbeatMessage.java b/opends/src/server/org/opends/server/replication/protocol/HeartbeatMessage.java
similarity index 97%
rename from opends/src/server/org/opends/server/synchronization/protocol/HeartbeatMessage.java
rename to opends/src/server/org/opends/server/replication/protocol/HeartbeatMessage.java
index d475b5d..19bd4ff 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/HeartbeatMessage.java
+++ b/opends/src/server/org/opends/server/replication/protocol/HeartbeatMessage.java
@@ -25,7 +25,7 @@
* Portions Copyright 2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
import java.util.zip.DataFormatException;
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/HeartbeatThread.java b/opends/src/server/org/opends/server/replication/protocol/HeartbeatThread.java
similarity index 98%
rename from opends/src/server/org/opends/server/synchronization/protocol/HeartbeatThread.java
rename to opends/src/server/org/opends/server/replication/protocol/HeartbeatThread.java
index be33dd9..ca45687 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/HeartbeatThread.java
+++ b/opends/src/server/org/opends/server/replication/protocol/HeartbeatThread.java
@@ -25,7 +25,7 @@
* Portions Copyright 2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
import org.opends.server.api.DirectoryThread;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/InitializeRequestMessage.java b/opends/src/server/org/opends/server/replication/protocol/InitializeRequestMessage.java
similarity index 98%
rename from opends/src/server/org/opends/server/synchronization/protocol/InitializeRequestMessage.java
rename to opends/src/server/org/opends/server/replication/protocol/InitializeRequestMessage.java
index 42a262f..a0c5246 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/InitializeRequestMessage.java
+++ b/opends/src/server/org/opends/server/replication/protocol/InitializeRequestMessage.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/InitializeTargetMessage.java b/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMessage.java
similarity index 98%
rename from opends/src/server/org/opends/server/synchronization/protocol/InitializeTargetMessage.java
rename to opends/src/server/org/opends/server/replication/protocol/InitializeTargetMessage.java
index b86523b..ae211f3 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/InitializeTargetMessage.java
+++ b/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMessage.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/ModifyContext.java b/opends/src/server/org/opends/server/replication/protocol/ModifyContext.java
similarity index 92%
rename from opends/src/server/org/opends/server/synchronization/protocol/ModifyContext.java
rename to opends/src/server/org/opends/server/replication/protocol/ModifyContext.java
index 6d634b4..05bbd9a 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/ModifyContext.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ModifyContext.java
@@ -24,9 +24,9 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
-import org.opends.server.synchronization.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumber;
/**
* This class describe the synchronization context that is attached to
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/ModifyDNMsg.java b/opends/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java
similarity index 97%
rename from opends/src/server/org/opends/server/synchronization/protocol/ModifyDNMsg.java
rename to opends/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java
index f7e7c4b..e7fde71 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/ModifyDNMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java
@@ -24,9 +24,9 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
-import static org.opends.server.synchronization.protocol.OperationContext.*;
+import static org.opends.server.replication.protocol.OperationContext.*;
import java.io.UnsupportedEncodingException;
import java.util.zip.DataFormatException;
@@ -34,7 +34,7 @@
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.synchronization.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.types.Operation;
/**
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/ModifyDnContext.java b/opends/src/server/org/opends/server/replication/protocol/ModifyDnContext.java
similarity index 94%
rename from opends/src/server/org/opends/server/synchronization/protocol/ModifyDnContext.java
rename to opends/src/server/org/opends/server/replication/protocol/ModifyDnContext.java
index 1883eca..19e3d84 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/ModifyDnContext.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ModifyDnContext.java
@@ -24,9 +24,9 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
-import org.opends.server.synchronization.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumber;
/**
* This class describe the synchronization context that is attached to
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/ModifyMsg.java b/opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java
similarity index 96%
rename from opends/src/server/org/opends/server/synchronization/protocol/ModifyMsg.java
rename to opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java
index 7d33d45..a8f1214 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/ModifyMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java
@@ -24,9 +24,9 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
-import static org.opends.server.synchronization.protocol.OperationContext.*;
+import static org.opends.server.replication.protocol.OperationContext.*;
import org.opends.server.core.ModifyOperation;
import org.opends.server.protocols.asn1.ASN1Exception;
@@ -35,8 +35,8 @@
import org.opends.server.protocols.ldap.LDAPModification;
import org.opends.server.protocols.asn1.ASN1Element;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.plugin.Historical;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.plugin.Historical;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeUsage;
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/OperationContext.java b/opends/src/server/org/opends/server/replication/protocol/OperationContext.java
similarity index 96%
rename from opends/src/server/org/opends/server/synchronization/protocol/OperationContext.java
rename to opends/src/server/org/opends/server/replication/protocol/OperationContext.java
index 6d0c285..1487952 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/OperationContext.java
+++ b/opends/src/server/org/opends/server/replication/protocol/OperationContext.java
@@ -24,9 +24,9 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
-import org.opends.server.synchronization.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.types.Operation;
/**
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/ProtocolSession.java b/opends/src/server/org/opends/server/replication/protocol/ProtocolSession.java
similarity index 98%
rename from opends/src/server/org/opends/server/synchronization/protocol/ProtocolSession.java
rename to opends/src/server/org/opends/server/replication/protocol/ProtocolSession.java
index bba5e84..7cbac4a 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/ProtocolSession.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ProtocolSession.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
import java.io.IOException;
import java.net.SocketException;
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/RoutableMessage.java b/opends/src/server/org/opends/server/replication/protocol/RoutableMessage.java
similarity index 97%
rename from opends/src/server/org/opends/server/synchronization/protocol/RoutableMessage.java
rename to opends/src/server/org/opends/server/replication/protocol/RoutableMessage.java
index 625f29a..76f4939 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/RoutableMessage.java
+++ b/opends/src/server/org/opends/server/replication/protocol/RoutableMessage.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
import java.io.Serializable;
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/ServerStartMessage.java b/opends/src/server/org/opends/server/replication/protocol/ServerStartMessage.java
similarity index 98%
rename from opends/src/server/org/opends/server/synchronization/protocol/ServerStartMessage.java
rename to opends/src/server/org/opends/server/replication/protocol/ServerStartMessage.java
index 877236b..385b85a 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/ServerStartMessage.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ServerStartMessage.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
@@ -32,7 +32,7 @@
import java.net.UnknownHostException;
import java.util.zip.DataFormatException;
-import org.opends.server.synchronization.common.ServerState;
+import org.opends.server.replication.common.ServerState;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/SocketSession.java b/opends/src/server/org/opends/server/replication/protocol/SocketSession.java
similarity index 98%
rename from opends/src/server/org/opends/server/synchronization/protocol/SocketSession.java
rename to opends/src/server/org/opends/server/replication/protocol/SocketSession.java
index d1ceb76..6cd1f89 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/SocketSession.java
+++ b/opends/src/server/org/opends/server/replication/protocol/SocketSession.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
import java.io.IOException;
import java.io.InputStream;
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/SynchronizationMessage.java b/opends/src/server/org/opends/server/replication/protocol/SynchronizationMessage.java
similarity index 98%
rename from opends/src/server/org/opends/server/synchronization/protocol/SynchronizationMessage.java
rename to opends/src/server/org/opends/server/replication/protocol/SynchronizationMessage.java
index 59777e5..44e112e 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/SynchronizationMessage.java
+++ b/opends/src/server/org/opends/server/replication/protocol/SynchronizationMessage.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
import java.io.UnsupportedEncodingException;
import java.util.zip.DataFormatException;
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/UpdateMessage.java b/opends/src/server/org/opends/server/replication/protocol/UpdateMessage.java
similarity index 98%
rename from opends/src/server/org/opends/server/synchronization/protocol/UpdateMessage.java
rename to opends/src/server/org/opends/server/replication/protocol/UpdateMessage.java
index efaafff..d468e10 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/UpdateMessage.java
+++ b/opends/src/server/org/opends/server/replication/protocol/UpdateMessage.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
@@ -36,7 +36,7 @@
import org.opends.server.core.ModifyOperation;
import org.opends.server.protocols.asn1.ASN1Exception;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.synchronization.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.types.LDAPException;
import org.opends.server.types.Operation;
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/WindowMessage.java b/opends/src/server/org/opends/server/replication/protocol/WindowMessage.java
similarity index 98%
rename from opends/src/server/org/opends/server/synchronization/protocol/WindowMessage.java
rename to opends/src/server/org/opends/server/replication/protocol/WindowMessage.java
index 7429e21..27c7e03 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/WindowMessage.java
+++ b/opends/src/server/org/opends/server/replication/protocol/WindowMessage.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
diff --git a/opends/src/server/org/opends/server/synchronization/protocol/package-info.java b/opends/src/server/org/opends/server/replication/protocol/package-info.java
similarity index 97%
rename from opends/src/server/org/opends/server/synchronization/protocol/package-info.java
rename to opends/src/server/org/opends/server/replication/protocol/package-info.java
index 3b8ea6a..5f9b53c 100644
--- a/opends/src/server/org/opends/server/synchronization/protocol/package-info.java
+++ b/opends/src/server/org/opends/server/replication/protocol/package-info.java
@@ -48,4 +48,4 @@
* </ul>
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
diff --git a/opends/src/server/org/opends/server/tasks/InitializeTargetTask.java b/opends/src/server/org/opends/server/tasks/InitializeTargetTask.java
index 090fe76..dd60297 100644
--- a/opends/src/server/org/opends/server/tasks/InitializeTargetTask.java
+++ b/opends/src/server/org/opends/server/tasks/InitializeTargetTask.java
@@ -41,7 +41,7 @@
import org.opends.server.backends.task.TaskState;
import org.opends.server.messages.TaskMessages;
import org.opends.server.protocols.asn1.ASN1OctetString;
-import org.opends.server.synchronization.plugin.SynchronizationDomain;
+import org.opends.server.replication.plugin.SynchronizationDomain;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
diff --git a/opends/src/server/org/opends/server/tasks/InitializeTask.java b/opends/src/server/org/opends/server/tasks/InitializeTask.java
index 84c63c8..07e8fc0 100644
--- a/opends/src/server/org/opends/server/tasks/InitializeTask.java
+++ b/opends/src/server/org/opends/server/tasks/InitializeTask.java
@@ -41,7 +41,7 @@
import org.opends.server.backends.task.TaskState;
import org.opends.server.messages.TaskMessages;
import org.opends.server.protocols.asn1.ASN1OctetString;
-import org.opends.server.synchronization.plugin.SynchronizationDomain;
+import org.opends.server.replication.plugin.SynchronizationDomain;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/InitOnLineTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
similarity index 97%
rename from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/InitOnLineTest.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
index 2884a04..d4185c5 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/InitOnLineTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization;
+package org.opends.server.replication;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.Error.logError;
@@ -46,19 +46,19 @@
import org.opends.server.messages.TaskMessages;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
+import org.opends.server.replication.changelog.Changelog;
+import org.opends.server.replication.changelog.ChangelogFakeConfiguration;
+import org.opends.server.replication.plugin.ChangelogBroker;
+import org.opends.server.replication.plugin.SynchronizationDomain;
+import org.opends.server.replication.protocol.DoneMessage;
+import org.opends.server.replication.protocol.EntryMessage;
+import org.opends.server.replication.protocol.ErrorMessage;
+import org.opends.server.replication.protocol.InitializeRequestMessage;
+import org.opends.server.replication.protocol.InitializeTargetMessage;
+import org.opends.server.replication.protocol.RoutableMessage;
+import org.opends.server.replication.protocol.SocketSession;
+import org.opends.server.replication.protocol.SynchronizationMessage;
import org.opends.server.schema.DirectoryStringSyntax;
-import org.opends.server.synchronization.changelog.Changelog;
-import org.opends.server.synchronization.changelog.ChangelogFakeConfiguration;
-import org.opends.server.synchronization.plugin.ChangelogBroker;
-import org.opends.server.synchronization.plugin.SynchronizationDomain;
-import org.opends.server.synchronization.protocol.DoneMessage;
-import org.opends.server.synchronization.protocol.EntryMessage;
-import org.opends.server.synchronization.protocol.ErrorMessage;
-import org.opends.server.synchronization.protocol.InitializeRequestMessage;
-import org.opends.server.synchronization.protocol.InitializeTargetMessage;
-import org.opends.server.synchronization.protocol.RoutableMessage;
-import org.opends.server.synchronization.protocol.SocketSession;
-import org.opends.server.synchronization.protocol.SynchronizationMessage;
import org.opends.server.types.AttributeType;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/ProtocolWindowTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
similarity index 97%
rename from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/ProtocolWindowTest.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
index fd4c45f..32eca00 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/ProtocolWindowTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
@@ -25,7 +25,7 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization;
+package org.opends.server.replication;
import static org.opends.server.loggers.Error.logError;
import static org.testng.Assert.*;
@@ -43,9 +43,9 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPFilter;
-import org.opends.server.synchronization.plugin.ChangelogBroker;
-import org.opends.server.synchronization.protocol.AddMsg;
-import org.opends.server.synchronization.protocol.SynchronizationMessage;
+import org.opends.server.replication.plugin.ChangelogBroker;
+import org.opends.server.replication.protocol.AddMsg;
+import org.opends.server.replication.protocol.SynchronizationMessage;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/ReSyncTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
similarity index 99%
rename from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/ReSyncTest.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
index b4bf994..8b54ce1 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/ReSyncTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization;
+package org.opends.server.replication;
import static org.opends.server.config.ConfigConstants.ATTR_TASK_COMPLETION_TIME;
import static org.opends.server.config.ConfigConstants.ATTR_TASK_STATE;
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/SchemaSynchronizationTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaSynchronizationTest.java
similarity index 97%
rename from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/SchemaSynchronizationTest.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaSynchronizationTest.java
index 979c9b5..bef63a0 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/SchemaSynchronizationTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaSynchronizationTest.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization;
+package org.opends.server.replication;
import static org.opends.server.loggers.Error.logError;
import static org.testng.Assert.assertTrue;
@@ -44,10 +44,10 @@
import org.opends.server.core.ModifyOperation;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.LDAPModification;
-import org.opends.server.synchronization.common.ChangeNumberGenerator;
-import org.opends.server.synchronization.plugin.ChangelogBroker;
-import org.opends.server.synchronization.protocol.ModifyMsg;
-import org.opends.server.synchronization.protocol.SynchronizationMessage;
+import org.opends.server.replication.common.ChangeNumberGenerator;
+import org.opends.server.replication.plugin.ChangelogBroker;
+import org.opends.server.replication.protocol.ModifyMsg;
+import org.opends.server.replication.protocol.SynchronizationMessage;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/StressTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
similarity index 97%
rename from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/StressTest.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
index 90fa202..e5b83f5 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/StressTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
@@ -25,7 +25,7 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization;
+package org.opends.server.replication;
import static org.opends.server.loggers.Error.logError;
import static org.testng.Assert.assertEquals;
@@ -45,9 +45,9 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.synchronization.plugin.ChangelogBroker;
-import org.opends.server.synchronization.protocol.AddMsg;
-import org.opends.server.synchronization.protocol.SynchronizationMessage;
+import org.opends.server.replication.plugin.ChangelogBroker;
+import org.opends.server.replication.protocol.AddMsg;
+import org.opends.server.replication.protocol.SynchronizationMessage;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/SynchronizationTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SynchronizationTestCase.java
similarity index 97%
rename from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/SynchronizationTestCase.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SynchronizationTestCase.java
index da0c40b..88fe4a3 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/SynchronizationTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SynchronizationTestCase.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization;
+package org.opends.server.replication;
import static org.opends.server.loggers.Error.logError;
import static org.testng.Assert.assertNotNull;
@@ -39,15 +39,15 @@
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
+import org.opends.server.replication.common.ServerState;
+import org.opends.server.replication.plugin.ChangelogBroker;
+import org.opends.server.replication.plugin.PersistentServerState;
import org.opends.server.schema.IntegerSyntax;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPFilter;
-import org.opends.server.synchronization.common.ServerState;
-import org.opends.server.synchronization.plugin.ChangelogBroker;
-import org.opends.server.synchronization.plugin.PersistentServerState;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.ByteStringFactory;
@@ -315,7 +315,7 @@
+ "objectClass: ds-cfg-multimaster-synchronization-provider\n"
+ "ds-cfg-synchronization-provider-enabled: true\n"
+ "ds-cfg-synchronization-provider-class: " +
- "org.opends.server.synchronization.plugin.MultimasterSynchronization\n";
+ "org.opends.server.replication.plugin.MultimasterSynchronization\n";
Entry synchroPluginEntry = TestCaseUtils.entryFromLdifString(synchroPluginLdif);
DirectoryServer.getConfigHandler().addEntry(synchroPluginEntry, null);
configEntryList.add(synchroPluginEntry.getDN());
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/UpdateOperationTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
similarity index 98%
rename from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/UpdateOperationTest.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
index f6986ed..a29811e 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/UpdateOperationTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
@@ -25,7 +25,7 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization;
+package org.opends.server.replication;
import static org.opends.server.loggers.Error.logError;
import static org.testng.Assert.*;
@@ -37,15 +37,15 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.plugins.ShortCircuitPlugin;
+import org.opends.server.replication.common.ChangeNumberGenerator;
+import org.opends.server.replication.plugin.ChangelogBroker;
+import org.opends.server.replication.protocol.AddMsg;
+import org.opends.server.replication.protocol.DeleteMsg;
+import org.opends.server.replication.protocol.HeartbeatThread;
+import org.opends.server.replication.protocol.ModifyDNMsg;
+import org.opends.server.replication.protocol.ModifyMsg;
+import org.opends.server.replication.protocol.SynchronizationMessage;
import org.opends.server.schema.DirectoryStringSyntax;
-import org.opends.server.synchronization.common.ChangeNumberGenerator;
-import org.opends.server.synchronization.plugin.ChangelogBroker;
-import org.opends.server.synchronization.protocol.AddMsg;
-import org.opends.server.synchronization.protocol.DeleteMsg;
-import org.opends.server.synchronization.protocol.ModifyDNMsg;
-import org.opends.server.synchronization.protocol.ModifyMsg;
-import org.opends.server.synchronization.protocol.SynchronizationMessage;
-import org.opends.server.synchronization.protocol.HeartbeatThread;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/ChangelogFakeConfiguration.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/changelog/ChangelogFakeConfiguration.java
similarity index 98%
rename from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/ChangelogFakeConfiguration.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/server/replication/changelog/ChangelogFakeConfiguration.java
index 1ff7a5e..b6a86ef 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/ChangelogFakeConfiguration.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/changelog/ChangelogFakeConfiguration.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
import java.util.SortedSet;
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/ChangelogTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/changelog/ChangelogTest.java
similarity index 96%
rename from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/ChangelogTest.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/server/replication/changelog/ChangelogTest.java
index 27e5382..ee22cde 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/ChangelogTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/changelog/ChangelogTest.java
@@ -24,12 +24,12 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
-import static org.opends.server.synchronization.protocol.OperationContext.*;
+import static org.opends.server.replication.protocol.OperationContext.*;
import java.net.ServerSocket;
import java.util.ArrayList;
@@ -39,17 +39,18 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.core.ModifyDNOperation;
-import org.opends.server.synchronization.SynchronizationTestCase;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.common.ChangeNumberGenerator;
-import org.opends.server.synchronization.common.ServerState;
-import org.opends.server.synchronization.plugin.ChangelogBroker;
-import org.opends.server.synchronization.protocol.AddMsg;
-import org.opends.server.synchronization.protocol.DeleteMsg;
-import org.opends.server.synchronization.protocol.ModifyDNMsg;
-import org.opends.server.synchronization.protocol.ModifyDnContext;
-import org.opends.server.synchronization.protocol.ModifyMsg;
-import org.opends.server.synchronization.protocol.SynchronizationMessage;
+import org.opends.server.replication.SynchronizationTestCase;
+import org.opends.server.replication.changelog.Changelog;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumberGenerator;
+import org.opends.server.replication.common.ServerState;
+import org.opends.server.replication.plugin.ChangelogBroker;
+import org.opends.server.replication.protocol.AddMsg;
+import org.opends.server.replication.protocol.DeleteMsg;
+import org.opends.server.replication.protocol.ModifyDNMsg;
+import org.opends.server.replication.protocol.ModifyDnContext;
+import org.opends.server.replication.protocol.ModifyMsg;
+import org.opends.server.replication.protocol.SynchronizationMessage;
import org.opends.server.types.Attribute;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/UpdateComparatorTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/changelog/UpdateComparatorTest.java
similarity index 84%
rename from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/UpdateComparatorTest.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/server/replication/changelog/UpdateComparatorTest.java
index a20696c..a35a79f 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/UpdateComparatorTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/changelog/UpdateComparatorTest.java
@@ -24,23 +24,23 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import static org.opends.server.synchronization.protocol.OperationContext.SYNCHROCONTEXT;
+import static org.opends.server.replication.protocol.OperationContext.SYNCHROCONTEXT;
import static org.testng.Assert.*;
import org.opends.server.core.DeleteOperation;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.synchronization.SynchronizationTestCase;
-import org.opends.server.synchronization.changelog.UpdateComparator;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.protocol.DeleteContext;
-import org.opends.server.synchronization.protocol.DeleteMsg;
-import org.opends.server.synchronization.protocol.UpdateMessage;
+import org.opends.server.replication.SynchronizationTestCase;
+import org.opends.server.replication.changelog.UpdateComparator;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.protocol.DeleteContext;
+import org.opends.server.replication.protocol.DeleteMsg;
+import org.opends.server.replication.protocol.UpdateMessage;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.util.TimeThread;
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/dbHandlerTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/changelog/dbHandlerTest.java
similarity index 88%
rename from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/dbHandlerTest.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/server/replication/changelog/dbHandlerTest.java
index 5eb03b6..87851c8 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/dbHandlerTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/changelog/dbHandlerTest.java
@@ -24,16 +24,19 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.changelog;
+package org.opends.server.replication.changelog;
import java.io.File;
import java.net.ServerSocket;
import org.opends.server.TestCaseUtils;
-import org.opends.server.synchronization.SynchronizationTestCase;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.common.ChangeNumberGenerator;
-import org.opends.server.synchronization.protocol.DeleteMsg;
+import org.opends.server.replication.SynchronizationTestCase;
+import org.opends.server.replication.changelog.Changelog;
+import org.opends.server.replication.changelog.ChangelogDbEnv;
+import org.opends.server.replication.changelog.DbHandler;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumberGenerator;
+import org.opends.server.replication.protocol.DeleteMsg;
import org.opends.server.types.DN;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ChangeNumberGeneratorTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ChangeNumberGeneratorTest.java
similarity index 88%
rename from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ChangeNumberGeneratorTest.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ChangeNumberGeneratorTest.java
index 805c14d..ed0394e 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ChangeNumberGeneratorTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ChangeNumberGeneratorTest.java
@@ -24,11 +24,13 @@
*
* Portions Copyright 2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.common;
+package org.opends.server.replication.common;
import static org.testng.Assert.*;
-import org.opends.server.synchronization.SynchronizationTestCase;
+import org.opends.server.replication.SynchronizationTestCase;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumberGenerator;
import org.opends.server.util.TimeThread;
import org.testng.annotations.Test;
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ChangeNumberTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ChangeNumberTest.java
similarity index 97%
rename from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ChangeNumberTest.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ChangeNumberTest.java
index 79a162b..25ca2e0 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ChangeNumberTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ChangeNumberTest.java
@@ -24,16 +24,16 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.common;
+package org.opends.server.replication.common;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
-import org.opends.server.synchronization.SynchronizationTestCase;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.common.ChangeNumberGenerator;
+import org.opends.server.replication.SynchronizationTestCase;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumberGenerator;
import org.opends.server.util.TimeThread;
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ServerStateTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ServerStateTest.java
similarity index 92%
rename from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ServerStateTest.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ServerStateTest.java
index aac3b78..78da8ff 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ServerStateTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ServerStateTest.java
@@ -24,15 +24,15 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.common;
+package org.opends.server.replication.common;
import static org.testng.Assert.*;
import java.util.Set;
-import org.opends.server.synchronization.SynchronizationTestCase;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.common.ServerState;
+import org.opends.server.replication.SynchronizationTestCase;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.ServerState;
import org.opends.server.util.TimeThread;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/AttrInfoTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java
similarity index 94%
rename from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/AttrInfoTest.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java
index 7f9f722..4ae2496 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/AttrInfoTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java
@@ -24,16 +24,16 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.synchronization.SynchronizationTestCase;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.plugin.AttrInfo;
-import org.opends.server.synchronization.plugin.ValueInfo;
+import org.opends.server.replication.SynchronizationTestCase;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.plugin.AttrInfo;
+import org.opends.server.replication.plugin.ValueInfo;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.util.TimeThread;
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/HistoricalTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
similarity index 96%
rename from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/HistoricalTest.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
index 95b54a8..acb7622 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/HistoricalTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
@@ -25,11 +25,13 @@
* Portions Copyright 2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
-import org.opends.server.synchronization.SynchronizationTestCase;
-import org.opends.server.synchronization.protocol.ModifyMsg;
-import org.opends.server.synchronization.common.ChangeNumber;
+import org.opends.server.replication.SynchronizationTestCase;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.plugin.ChangelogBroker;
+import org.opends.server.replication.plugin.Historical;
+import org.opends.server.replication.protocol.ModifyMsg;
import org.opends.server.TestCaseUtils;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.tools.LDAPModify;
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/ModifyConflictTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java
similarity index 96%
rename from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/ModifyConflictTest.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java
index b7762e7..821b1ab 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/ModifyConflictTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
import java.util.ArrayList;
import java.util.HashMap;
@@ -36,18 +36,21 @@
import org.testng.annotations.Test;
import static org.testng.Assert.*;
-import static org.opends.server.synchronization.protocol.OperationContext.*;
+import static org.opends.server.replication.protocol.OperationContext.*;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.synchronization.SynchronizationTestCase;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.protocol.ModifyContext;
-import org.opends.server.synchronization.protocol.SynchronizationMessage;
-import org.opends.server.synchronization.protocol.UpdateMessage;
+import org.opends.server.replication.SynchronizationTestCase;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.plugin.FakeOperation;
+import org.opends.server.replication.plugin.FakeOperationComparator;
+import org.opends.server.replication.plugin.Historical;
+import org.opends.server.replication.protocol.ModifyContext;
+import org.opends.server.replication.protocol.SynchronizationMessage;
+import org.opends.server.replication.protocol.UpdateMessage;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/PersistentServerStateTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java
similarity index 92%
rename from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/PersistentServerStateTest.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java
index 1795814..23e0bcb 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/PersistentServerStateTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java
@@ -24,16 +24,17 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
import static org.testng.Assert.assertEquals;
import org.opends.server.TestCaseUtils;
import org.opends.server.core.AddOperation;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.synchronization.SynchronizationTestCase;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.common.ChangeNumberGenerator;
+import org.opends.server.replication.SynchronizationTestCase;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumberGenerator;
+import org.opends.server.replication.plugin.PersistentServerState;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.testng.annotations.BeforeClass;
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/PersistentStateTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentStateTest.java
similarity index 92%
rename from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/PersistentStateTest.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentStateTest.java
index 0437e4d..e8cdfd6 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/PersistentStateTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentStateTest.java
@@ -24,16 +24,17 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
import static org.testng.Assert.assertEquals;
import org.opends.server.TestCaseUtils;
import org.opends.server.core.AddOperation;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.synchronization.SynchronizationTestCase;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.common.ChangeNumberGenerator;
+import org.opends.server.replication.SynchronizationTestCase;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.ChangeNumberGenerator;
+import org.opends.server.replication.plugin.PersistentServerState;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.testng.annotations.BeforeClass;
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/ValueInfoTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ValueInfoTest.java
similarity index 93%
rename from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/ValueInfoTest.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ValueInfoTest.java
index 5b5a241..f96c452 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/ValueInfoTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ValueInfoTest.java
@@ -24,12 +24,12 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.plugin;
+package org.opends.server.replication.plugin;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.synchronization.SynchronizationTestCase;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.plugin.ValueInfo;
+import org.opends.server.replication.SynchronizationTestCase;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.plugin.ValueInfo;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.util.TimeThread;
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/protocol/SynchronizationMsgTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/SynchronizationMsgTest.java
similarity index 93%
rename from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/protocol/SynchronizationMsgTest.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/SynchronizationMsgTest.java
index ccf920c..e72dc10 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/protocol/SynchronizationMsgTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/SynchronizationMsgTest.java
@@ -24,9 +24,9 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization.protocol;
+package org.opends.server.replication.protocol;
-import static org.opends.server.synchronization.protocol.OperationContext.SYNCHROCONTEXT;
+import static org.opends.server.replication.protocol.OperationContext.SYNCHROCONTEXT;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -44,10 +44,29 @@
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.ModifyOperation;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.synchronization.SynchronizationTestCase;
-import org.opends.server.synchronization.common.ChangeNumber;
-import org.opends.server.synchronization.common.ServerState;
-import org.opends.server.synchronization.plugin.PendingChange;
+import org.opends.server.replication.SynchronizationTestCase;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.ServerState;
+import org.opends.server.replication.plugin.PendingChange;
+import org.opends.server.replication.protocol.AckMessage;
+import org.opends.server.replication.protocol.AddContext;
+import org.opends.server.replication.protocol.AddMsg;
+import org.opends.server.replication.protocol.ChangelogStartMessage;
+import org.opends.server.replication.protocol.DeleteContext;
+import org.opends.server.replication.protocol.DeleteMsg;
+import org.opends.server.replication.protocol.DoneMessage;
+import org.opends.server.replication.protocol.EntryMessage;
+import org.opends.server.replication.protocol.ErrorMessage;
+import org.opends.server.replication.protocol.InitializeRequestMessage;
+import org.opends.server.replication.protocol.InitializeTargetMessage;
+import org.opends.server.replication.protocol.ModifyDNMsg;
+import org.opends.server.replication.protocol.ModifyDnContext;
+import org.opends.server.replication.protocol.ModifyMsg;
+import org.opends.server.replication.protocol.OperationContext;
+import org.opends.server.replication.protocol.ServerStartMessage;
+import org.opends.server.replication.protocol.SynchronizationMessage;
+import org.opends.server.replication.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.WindowMessage;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
--
Gitblit v1.10.0