From 44aad3f84d2a820094f3b5e73722778edc8c23f5 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Tue, 24 Apr 2007 22:40:57 +0000
Subject: [PATCH] Make several significant changes to the OpenDS code base, including:
---
opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java b/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
index 860b456..b8fd131 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
+++ b/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
@@ -36,7 +36,7 @@
import static org.opends.server.messages.ConfigMessages.*;
import static org.opends.server.messages.MessageHandler.getMessage;
import static org.opends.server.messages.ToolMessages.*;
-import static org.opends.server.synchronization.common.LogMessages.*;
+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.util.StaticUtils.createEntry;
@@ -73,14 +73,11 @@
import org.opends.server.core.LockFileManager;
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.ModifyOperation;
-import org.opends.server.core.Operation;
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.protocols.ldap.LDAPException;
import org.opends.server.synchronization.common.ChangeNumber;
import org.opends.server.synchronization.common.ChangeNumberGenerator;
-import org.opends.server.synchronization.common.LogMessages;
import org.opends.server.synchronization.common.ServerState;
import org.opends.server.synchronization.protocol.AckMessage;
import org.opends.server.synchronization.protocol.AddContext;
@@ -107,9 +104,11 @@
import org.opends.server.types.Entry;
import org.opends.server.types.ErrorLogCategory;
import org.opends.server.types.ErrorLogSeverity;
+import org.opends.server.types.LDAPException;
import org.opends.server.types.LDIFExportConfig;
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.Modification;
+import org.opends.server.types.Operation;
import org.opends.server.types.RDN;
import org.opends.server.types.ResultCode;
import org.opends.server.types.SearchFilter;
@@ -2698,7 +2697,7 @@
{
if (!( provider instanceof MultimasterSynchronization))
{
- int msgID = LogMessages.MSGID_INVALID_PROVIDER;
+ int msgID = MSGID_INVALID_PROVIDER;
String message = getMessage(msgID);
throw new DirectoryException(ResultCode.OTHER,
message, msgID);
@@ -2709,7 +2708,7 @@
MultimasterSynchronization.findDomain(baseDN, null);
if (sdomain == null)
{
- int msgID = LogMessages.MSGID_NO_MATCHING_DOMAIN;
+ int msgID = MSGID_NO_MATCHING_DOMAIN;
String message = getMessage(msgID) + " " + baseDN;
throw new DirectoryException(ResultCode.OTHER,
message, msgID);
@@ -2718,7 +2717,7 @@
if (synchronizationDomain != null)
{
// Should never happen
- int msgID = LogMessages.MSGID_MULTIPLE_MATCHING_DOMAIN;
+ int msgID = MSGID_MULTIPLE_MATCHING_DOMAIN;
String message = getMessage(msgID);
throw new DirectoryException(ResultCode.OTHER,
message, msgID);
--
Gitblit v1.10.0