First set of modifications for issue 1090 : rename synchronization componen...

gbellato

25.09.2007 82fac34ae279ec769891444f0f6ea10b47382f8d

First set of modifications for issue 1090 : rename synchronization components
Move from synchronization package name to replication.

 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


 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

 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'

 opends/src/server/org/opends/server/replication/changelog/AckMessageList.java

File was renamed from opends/src/server/org/opends/server/synchronization/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

 opends/src/server/org/opends/server/replication/changelog/AckMessageListComparator.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;


 opends/src/server/org/opends/server/replication/changelog/Changelog.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

 opends/src/server/org/opends/server/replication/changelog/ChangelogAckMessageList.java

File was renamed from opends/src/server/org/opends/server/synchronization/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

 opends/src/server/org/opends/server/replication/changelog/ChangelogCache.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

 opends/src/server/org/opends/server/replication/changelog/ChangelogDB.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

 opends/src/server/org/opends/server/replication/changelog/ChangelogDBException.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;




 opends/src/server/org/opends/server/replication/changelog/ChangelogData.java

File was renamed from opends/src/server/org/opends/server/synchronization/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.

 opends/src/server/org/opends/server/replication/changelog/ChangelogDbEnv.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

 opends/src/server/org/opends/server/replication/changelog/ChangelogIterator.java

File was renamed from opends/src/server/org/opends/server/synchronization/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

 opends/src/server/org/opends/server/replication/changelog/ChangelogIteratorComparator.java

File was renamed from opends/src/server/org/opends/server/synchronization/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

 opends/src/server/org/opends/server/replication/changelog/ChangelogKey.java

File was renamed from opends/src/server/org/opends/server/synchronization/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.

 opends/src/server/org/opends/server/replication/changelog/DbHandler.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;


 opends/src/server/org/opends/server/replication/changelog/MsgQueue.java

File was renamed from opends/src/server/org/opends/server/synchronization/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.

 opends/src/server/org/opends/server/replication/changelog/ServerHandler.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

 opends/src/server/org/opends/server/replication/changelog/ServerReader.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;


 opends/src/server/org/opends/server/replication/changelog/ServerWriter.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;


 opends/src/server/org/opends/server/replication/changelog/UpdateComparator.java

File was renamed from opends/src/server/org/opends/server/synchronization/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.

 opends/src/server/org/opends/server/replication/changelog/package-info.java

File was renamed from opends/src/server/org/opends/server/synchronization/changelog/package-info.java
@@ -76,4 +76,4 @@
 *  </ul>
 */

package org.opends.server.synchronization.changelog;
package org.opends.server.replication.changelog;

 opends/src/server/org/opends/server/replication/common/ChangeNumber.java

File was renamed from opends/src/server/org/opends/server/synchronization/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.

 opends/src/server/org/opends/server/replication/common/ChangeNumberGenerator.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;


 opends/src/server/org/opends/server/replication/common/ServerState.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

 opends/src/server/org/opends/server/replication/common/package-info.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

 opends/src/server/org/opends/server/replication/package-info.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/src/server/org/opends/server/synchronization/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;



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

File was renamed from opends/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/src/server/org/opends/server/synchronization/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;


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

File was renamed from opends/src/server/org/opends/server/synchronization/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;



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

File was renamed from opends/src/server/org/opends/server/synchronization/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;


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

File was renamed from opends/src/server/org/opends/server/synchronization/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

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

File was renamed from opends/src/server/org/opends/server/synchronization/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.

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

File was renamed from opends/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/src/server/org/opends/server/synchronization/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;


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

File was renamed from opends/src/server/org/opends/server/synchronization/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;


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

File was renamed from opends/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/src/server/org/opends/server/synchronization/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;

/**

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

File was renamed from opends/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/src/server/org/opends/server/synchronization/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;




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

File was renamed from opends/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/src/server/org/opends/server/synchronization/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;

/**

 opends/src/server/org/opends/server/replication/plugin/package-info.java

File was renamed from opends/src/server/org/opends/server/synchronization/plugin/package-info.java
@@ -47,4 +47,4 @@
 * </li>
 * </ul>
 */
package org.opends.server.synchronization.plugin;
package org.opends.server.replication.plugin;

 opends/src/server/org/opends/server/replication/protocol/AckMessage.java

File was renamed from opends/src/server/org/opends/server/synchronization/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.

 opends/src/server/org/opends/server/replication/protocol/AddContext.java

File was renamed from opends/src/server/org/opends/server/synchronization/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

 opends/src/server/org/opends/server/replication/protocol/AddMsg.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

/**

 opends/src/server/org/opends/server/replication/protocol/ChangelogStartMessage.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;


 opends/src/server/org/opends/server/replication/protocol/DeleteContext.java

File was renamed from opends/src/server/org/opends/server/synchronization/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.

 opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

/**

 opends/src/server/org/opends/server/replication/protocol/DoneMessage.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

 opends/src/server/org/opends/server/replication/protocol/EntryMessage.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

 opends/src/server/org/opends/server/replication/protocol/ErrorMessage.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

 opends/src/server/org/opends/server/replication/protocol/HeartbeatMessage.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;


 opends/src/server/org/opends/server/replication/protocol/HeartbeatThread.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

 opends/src/server/org/opends/server/replication/protocol/InitializeRequestMessage.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

 opends/src/server/org/opends/server/replication/protocol/InitializeTargetMessage.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

 opends/src/server/org/opends/server/replication/protocol/ModifyContext.java

File was renamed from opends/src/server/org/opends/server/synchronization/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

 opends/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

/**

 opends/src/server/org/opends/server/replication/protocol/ModifyDnContext.java

File was renamed from opends/src/server/org/opends/server/synchronization/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

 opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

 opends/src/server/org/opends/server/replication/protocol/OperationContext.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

/**

 opends/src/server/org/opends/server/replication/protocol/ProtocolSession.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

 opends/src/server/org/opends/server/replication/protocol/RoutableMessage.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;


 opends/src/server/org/opends/server/replication/protocol/ServerStartMessage.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;


 opends/src/server/org/opends/server/replication/protocol/SocketSession.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

 opends/src/server/org/opends/server/replication/protocol/SynchronizationMessage.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

 opends/src/server/org/opends/server/replication/protocol/UpdateMessage.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;


 opends/src/server/org/opends/server/replication/protocol/WindowMessage.java

File was renamed from opends/src/server/org/opends/server/synchronization/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;

 opends/src/server/org/opends/server/replication/protocol/package-info.java

File was renamed from opends/src/server/org/opends/server/synchronization/protocol/package-info.java
@@ -48,4 +48,4 @@
 *  </ul>
 */

package org.opends.server.synchronization.protocol;
package org.opends.server.replication.protocol;

 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;

 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;

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

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/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());

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

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/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;


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

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/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.*;

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

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/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;


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

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/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;



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

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/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;

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

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/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;