From 9f31b55669037de744e5b7ca3da5493abbebeff5 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 11 Aug 2009 22:39:18 +0000
Subject: [PATCH] Fix a warning message displayed to the user when all the base DN's are disabled but not the replication server. Display the message only if the replication server is actually configured in the server.
---
opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 3 ++-
opendj-sdk/opends/src/messages/messages/admin_tool.properties | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/messages/messages/admin_tool.properties b/opendj-sdk/opends/src/messages/messages/admin_tool.properties
index 3d5cd31..4b7fbbf 100644
--- a/opendj-sdk/opends/src/messages/messages/admin_tool.properties
+++ b/opendj-sdk/opends/src/messages/messages/admin_tool.properties
@@ -676,7 +676,7 @@
binary copy.
INFO_REPLICATION_DISABLE_SUFFIX_PROMPT=Disable replication on base DN %s?
INFO_REPLICATION_DISABLE_ALL_SUFFIXES_KEEP_REPLICATION_SERVER=You have chosen \
- to disable replication on all the replicated servers of '%s'. If you want \
+ to disable replication on all the replicated base DN's of '%s'. If you want \
also the replication server (changelog and replication port) to be disabled \
you must also specify the '--%s' or '--%s' argument.
INFO_REPLICATION_DISABLE_ALL_SUFFIXES_DISABLE_REPLICATION_SERVER=You have \
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index 652dee4..68ed4eb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -3571,7 +3571,8 @@
}
if (!isInteractive() && !uData.disableReplicationServer() &&
- !uData.disableAll() && disableAllBaseDns(ctx, uData))
+ !uData.disableAll() && disableAllBaseDns(ctx, uData) &&
+ hasReplicationPort(ctx))
{
// Inform the user that the replication server will not be disabled.
// Inform also of the user of the disableReplicationServerArg
--
Gitblit v1.10.0