From d954ca4d5899d00df2001ec877fc3ffe94ee28d8 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Tue, 09 Apr 2013 14:45:33 +0000
Subject: [PATCH] CR-1523 Fix OPENDJ-818 dsreplication status shows disabled servers as enabled
---
opends/src/messages/messages/admin_tool_es.properties | 3 +
opends/src/messages/messages/admin_tool_pl.properties | 5 +-
opends/src/ads/org/opends/admin/ads/ServerDescriptor.java | 11 +++++
opends/src/messages/messages/admin_tool_de.properties | 3 +
opends/src/messages/messages/admin_tool_ko.properties | 3 +
opends/src/messages/messages/admin_tool_fr.properties | 3 +
opends/src/ads/org/opends/admin/ads/ReplicaDescriptor.java | 12 ++++++
opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java | 5 ++
opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java | 7 +++
opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java | 6 ++
opends/src/messages/messages/admin_tool.properties | 5 +-
opends/src/messages/messages/admin_tool_ja.properties | 3 +
opends/src/messages/messages/admin_tool_zh_TW.properties | 3 +
opends/src/messages/messages/admin_tool_zh_CN.properties | 3 +
opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 7 +--
opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java | 5 ++
16 files changed, 65 insertions(+), 19 deletions(-)
diff --git a/opends/src/ads/org/opends/admin/ads/ReplicaDescriptor.java b/opends/src/ads/org/opends/admin/ads/ReplicaDescriptor.java
index 5e5cb1d..69af7b3 100644
--- a/opends/src/ads/org/opends/admin/ads/ReplicaDescriptor.java
+++ b/opends/src/ads/org/opends/admin/ads/ReplicaDescriptor.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2007-2009 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock, AS.
*/
package org.opends.admin.ads;
@@ -30,6 +31,7 @@
import java.util.HashSet;
import java.util.Set;
+
/**
* The object of this class represent a Replica (i.e. a suffix in a given
* server).
@@ -65,6 +67,16 @@
}
/**
+ * Returns whether replication is replicated on this server or not.
+ * @return <CODE>true</CODE> if replication is enabled and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean isReplicationEnabled()
+ {
+ return server.isReplicationEnabled();
+ }
+
+ /**
* Sets the number of entries contained in the replica.
* @param entries the number of entries contained in the replica.
*/
diff --git a/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java b/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java
index 6cf14d0..a5345ed 100644
--- a/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java
+++ b/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java
@@ -228,6 +228,17 @@
}
/**
+ * Tells whether replication is enabled on this server or not.
+ * @return <CODE>true</CODE> if replication is enabled and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean isReplicationEnabled()
+ {
+ return Boolean.TRUE.equals(
+ serverProperties.get(ServerProperty.IS_REPLICATION_ENABLED));
+ }
+
+ /**
* Returns the String representation of this replication server based
* on the information we have ("hostname":"replication port") and
* <CODE>null</CODE> if this is not a replication server.
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java b/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
index 2b4538d..0c36f95 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
@@ -50,7 +50,11 @@
/**
* The base DN is replicated.
*/
- REPLICATED
+ REPLICATED,
+ /**
+ * Replication is disabled.
+ */
+ DISABLED
}
private int nEntries;
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java b/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java
index 503c4a8..00d48b9 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock, AS.
*/
package org.opends.guitools.controlpanel.datamodel;
@@ -642,10 +643,14 @@
{
s = INFO_BASEDN_REPLICATED_LABEL.get();
}
- else
+ else if (rep.getType() == BaseDNDescriptor.Type.NOT_REPLICATED)
{
s = INFO_BASEDN_NOT_REPLICATED_LABEL.get();
}
+ else
+ {
+ s = INFO_BASEDN_DISABLED_LABEL.get();
+ }
return s.toString();
}
}
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java b/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
index 0b64817..9fa53ab 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2011 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock, AS.
*/
package org.opends.guitools.controlpanel.util;
@@ -480,7 +481,9 @@
{
if (baseDN.getDn().equals(dn))
{
- baseDN.setType(BaseDNDescriptor.Type.REPLICATED);
+ baseDN.setType(sync.isEnabled() ?
+ BaseDNDescriptor.Type.REPLICATED :
+ BaseDNDescriptor.Type.DISABLED);
baseDN.setReplicaID(domain.getServerId());
}
}
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java b/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java
index c71a78f..e115c27 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2011 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock, AS.
*/
package org.opends.guitools.controlpanel.util;
@@ -330,7 +331,9 @@
{
if (baseDN.getDn().equals(dn))
{
- baseDN.setType(BaseDNDescriptor.Type.REPLICATED);
+ baseDN.setType(sync.isEnabled() ?
+ BaseDNDescriptor.Type.REPLICATED :
+ BaseDNDescriptor.Type.DISABLED);
baseDN.setReplicaID(domain.getServerId());
}
}
diff --git a/opends/src/messages/messages/admin_tool.properties b/opends/src/messages/messages/admin_tool.properties
index 8ce2719..0f8f779 100644
--- a/opends/src/messages/messages/admin_tool.properties
+++ b/opends/src/messages/messages/admin_tool.properties
@@ -21,7 +21,7 @@
# CDDL HEADER END
#
# Copyright 2006-2010 Sun Microsystems, Inc.
-# Portions copyright 2011-2012 ForgeRock AS.
+# Portions copyright 2011-2013 ForgeRock AS.
# Portions copyright 2012 profiq s.r.o.
@@ -302,7 +302,8 @@
name or port is provided, the tool will try to connect to the local server.
INFO_STOP_BUTTON_LABEL=Stop
INFO_STOP_BUTTON_TOOLTIP=Stops the Directory Server
-INFO_BASEDN_NOT_REPLICATED_LABEL=Disabled
+INFO_BASEDN_NOT_REPLICATED_LABEL=
+INFO_BASEDN_DISABLED_LABEL=Disabled
INFO_BASEDN_REPLICATED_LABEL=Enabled
INFO_SUMMARY_DELETING_EXTERNAL_DB_FILES=Deleting Database Files outside the \
Installation Path...
diff --git a/opends/src/messages/messages/admin_tool_de.properties b/opends/src/messages/messages/admin_tool_de.properties
index 6215b53..8e90994 100644
--- a/opends/src/messages/messages/admin_tool_de.properties
+++ b/opends/src/messages/messages/admin_tool_de.properties
@@ -200,7 +200,8 @@
INFO_CONTROL_PANEL_LAUNCHER_USAGE_DESCRIPTION=Dieses Dienstprogramm kann zur Anzeige des Steuerbereich-Fensters verwendet werden, in dem grundlegende Serverinformationen angezeigt werden und einige grundlegende Administrationsaufgaben auf dem Server ausgef\u00fchrt werden k\u00f6nnen.%n%nWenn kein Hostname oder Port angegeben ist, versucht das Tool, eine Verbindung mit dem lokalen Server herzustellen.
INFO_STOP_BUTTON_LABEL=Stoppen
INFO_STOP_BUTTON_TOOLTIP=Stoppt den Directory-Server
-INFO_BASEDN_NOT_REPLICATED_LABEL=Deaktiviert
+INFO_BASEDN_NOT_REPLICATED_LABEL=
+INFO_BASEDN_DISABLED_LABEL=Deaktiviert
INFO_BASEDN_REPLICATED_LABEL=Aktiviert
INFO_SUMMARY_DELETING_EXTERNAL_DB_FILES=Datenbankdateien au\u00dferhalb des Installationspfads werden gel\u00f6scht....
INFO_SUMMARY_DELETING_EXTERNAL_LOG_FILES=Protokolldateien au\u00dferhalb des Installationspfads werden gel\u00f6scht....
diff --git a/opends/src/messages/messages/admin_tool_es.properties b/opends/src/messages/messages/admin_tool_es.properties
index fd520d1..5b3c2fd 100644
--- a/opends/src/messages/messages/admin_tool_es.properties
+++ b/opends/src/messages/messages/admin_tool_es.properties
@@ -200,7 +200,8 @@
INFO_CONTROL_PANEL_LAUNCHER_USAGE_DESCRIPTION=Esta utilidad se puede usar para ver la ventana del panel de control, que muestra la informaci\u00f3n b\u00e1sica del servidor y permite realizar algunas tareas b\u00e1sicas de administraci\u00f3n en el servidor.%n%nSi no se proporciona un nombre de host o un puerto, la herramienta tratar\u00e1 de conectar con el servidor local.
INFO_STOP_BUTTON_LABEL=Detener
INFO_STOP_BUTTON_TOOLTIP=Detiene el servidor de directorios
-INFO_BASEDN_NOT_REPLICATED_LABEL=Desactivado
+INFO_BASEDN_NOT_REPLICATED_LABEL=
+INFO_BASEDN_DISABLED_LABEL=Desactivado
INFO_BASEDN_REPLICATED_LABEL=Activado
INFO_SUMMARY_DELETING_EXTERNAL_DB_FILES=Eliminando los archivos de base de datos ubicados fuera de la ruta de la instalaci\u00f3n...
INFO_SUMMARY_DELETING_EXTERNAL_LOG_FILES=Eliminando los archivos de registro ubicados fuera de la ruta de la instalaci\u00f3n...
diff --git a/opends/src/messages/messages/admin_tool_fr.properties b/opends/src/messages/messages/admin_tool_fr.properties
index 5417178..aee606d 100644
--- a/opends/src/messages/messages/admin_tool_fr.properties
+++ b/opends/src/messages/messages/admin_tool_fr.properties
@@ -200,7 +200,8 @@
INFO_CONTROL_PANEL_LAUNCHER_USAGE_DESCRIPTION=Cet utilitaire permet d'afficher la fen\u00eatre de panneau de contr\u00f4le qui affiche des informations de base sur le serveur et permet d'ex\u00e9cuter des t\u00e2ches d'administration de base sur ce serveur.%n%nSi vous n'entrez aucun nom d'h\u00f4te ou num\u00e9ro de port, l'outil tente de se connecter au serveur local.
INFO_STOP_BUTTON_LABEL=Arr\u00eater
INFO_STOP_BUTTON_TOOLTIP=Arr\u00eate Directory Server
-INFO_BASEDN_NOT_REPLICATED_LABEL=D\u00e9sactiv\u00e9
+INFO_BASEDN_NOT_REPLICATED_LABEL=
+INFO_BASEDN_DISABLED_LABEL=D\u00e9sactiv\u00e9
INFO_BASEDN_REPLICATED_LABEL=Activ\u00e9
INFO_SUMMARY_DELETING_EXTERNAL_DB_FILES=Suppression des fichiers de base de donn\u00e9es en dehors du r\u00e9pertoire d'installation...
INFO_SUMMARY_DELETING_EXTERNAL_LOG_FILES=Suppression des fichiers journaux en dehors du r\u00e9pertoire d'installation...
diff --git a/opends/src/messages/messages/admin_tool_ja.properties b/opends/src/messages/messages/admin_tool_ja.properties
index afc99c6..a2da6e5 100644
--- a/opends/src/messages/messages/admin_tool_ja.properties
+++ b/opends/src/messages/messages/admin_tool_ja.properties
@@ -200,7 +200,8 @@
INFO_CONTROL_PANEL_LAUNCHER_USAGE_DESCRIPTION=\u3053\u306e\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fc\u3092\u4f7f\u7528\u3059\u308b\u3068\u3001\u57fa\u672c\u7684\u306a\u30b5\u30fc\u30d0\u30fc\u306e\u60c5\u5831\u3092\u8868\u793a\u3057\u3001\u30b5\u30fc\u30d0\u30fc\u4e0a\u3067\u3044\u304f\u3064\u304b\u306e\u57fa\u672c\u7684\u306a\u7ba1\u7406\u30bf\u30b9\u30af\u3092\u5b9f\u884c\u3067\u304d\u308b\u30b3\u30f3\u30c8\u30ed\u30fc\u30eb\u30d1\u30cd\u30eb\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u8868\u793a\u3067\u304d\u307e\u3059\u3002%n%n\u30db\u30b9\u30c8\u540d\u3082\u30dd\u30fc\u30c8\u3082\u6307\u5b9a\u3057\u306a\u3044\u5834\u5408\u3001\u30c4\u30fc\u30eb\u306f\u30ed\u30fc\u30ab\u30eb\u30b5\u30fc\u30d0\u30fc\u3078\u306e\u63a5\u7d9a\u3092\u8a66\u307f\u307e\u3059\u3002
INFO_STOP_BUTTON_LABEL=\u505c\u6b62
INFO_STOP_BUTTON_TOOLTIP=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u3092\u505c\u6b62\u3059\u308b
-INFO_BASEDN_NOT_REPLICATED_LABEL=\u7121\u52b9
+INFO_BASEDN_NOT_REPLICATED_LABEL=
+INFO_BASEDN_DISABLED_LABEL=\u7121\u52b9
INFO_BASEDN_REPLICATED_LABEL=\u6709\u52b9
INFO_SUMMARY_DELETING_EXTERNAL_DB_FILES=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u30d1\u30b9\u5916\u90e8\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
INFO_SUMMARY_DELETING_EXTERNAL_LOG_FILES=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u30d1\u30b9\u5916\u90e8\u306e\u30ed\u30b0\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
diff --git a/opends/src/messages/messages/admin_tool_ko.properties b/opends/src/messages/messages/admin_tool_ko.properties
index 5f5bc2a..cce2b30 100644
--- a/opends/src/messages/messages/admin_tool_ko.properties
+++ b/opends/src/messages/messages/admin_tool_ko.properties
@@ -178,7 +178,8 @@
INFO_STATUS_CLI_USAGE_DESCRIPTION=\uc774 \uc720\ud2f8\ub9ac\ud2f0\ub97c \uc0ac\uc6a9\ud558\uc5ec \uae30\ubcf8 \uc11c\ubc84 \uc815\ubcf4\ub97c \ud45c\uc2dc\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
INFO_STOP_BUTTON_LABEL=\uc911\uc9c0
INFO_STOP_BUTTON_TOOLTIP=\ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \uc911\uc9c0
-INFO_BASEDN_NOT_REPLICATED_LABEL=\uc0ac\uc6a9 \ubd88\uac00\ub2a5
+INFO_BASEDN_NOT_REPLICATED_LABEL=
+INFO_BASEDN_DISABLED_LABEL=\uc0ac\uc6a9 \ubd88\uac00\ub2a5
INFO_BASEDN_REPLICATED_LABEL=\uc0ac\uc6a9 \uac00\ub2a5
INFO_SUMMARY_DELETING_EXTERNAL_DB_FILES=\uc124\uce58 \uacbd\ub85c \uc678\ubd80\uc758 \ub370\uc774\ud130\ubca0\uc774\uc2a4 \ud30c\uc77c\uc744 \uc0ad\uc81c\ud558\ub294 \uc911...
INFO_SUMMARY_DELETING_EXTERNAL_LOG_FILES=\uc124\uce58 \uacbd\ub85c \uc678\ubd80\uc758 \ub85c\uadf8 \ud30c\uc77c\uc744 \uc0ad\uc81c\ud558\ub294 \uc911...
diff --git a/opends/src/messages/messages/admin_tool_pl.properties b/opends/src/messages/messages/admin_tool_pl.properties
index 24d6db8..7c06ef1 100644
--- a/opends/src/messages/messages/admin_tool_pl.properties
+++ b/opends/src/messages/messages/admin_tool_pl.properties
@@ -157,7 +157,9 @@
INFO_CTRL_PANEL_VLV_INDEXES_NOT_DEFINED_CONFIRMATION_TITLE=Niezdefiniowany indeks
INFO_CTRL_PANEL_INDEX_APPROXIMATE=Przybli\u017cenie
INFO_CTRL_PANEL_CANCEL_BUTTON_LABEL=Anuluj
-INFO_BASEDN_NOT_REPLICATED_LABEL=Wy\u0142\u0105czony
+INFO_BASEDN_NOT_REPLICATED_LABEL=
+INFO_BASEDN_DISABLED_LABEL=Wy\u0142\u0105czony
+INFO_BASEDN_REPLICATED_LABEL=W\u0142\u0105czony
INFO_REPLICATION_ENABLE_HOST2_CONNECTION_PARAMETERS=>>>> Podaj parametry po\u0142\u0105czenia administracyjnego dla drugiego serwera
INFO_CTRL_PANEL_CONN_HANDLER_REPLICATION=Replikacja
MILD_ERR_CANNOT_CONNECT_TO_REMOTE=Could not connect to server '%s' on port '%s'. Verify that the provided information is valid and that the server is running. Szczeg\u00f3\u0142y: %s
@@ -190,7 +192,6 @@
MILD_ERR_REPLICATION_READING_REGISTERED_SERVERS_CONFIRM_UPDATE_REMOTE=Nast\u0119puj\u0105ce b\u0142\u0119dy napotkano podczas czytania konfiguracji istniej\u0105cych serwer\u00f3w:%n%s%n%nJe\u015bli b\u0119dziesz kontynuowa\u0142, narz\u0119dzie powielania spr\u00f3buje uaktualni\u0107 konfiguracj\u0119 wszystkich serwer\u00f3w. Jednak nie mo\u017ce zagwarantowa\u0107, \u017ce serwery generuj\u0105ce b\u0142\u0119dy zostan\u0105 uaktualnione. Czy chcesz kontynuowa\u0107?
INFO_REPLICATION_DESCRIPTION_EQUIVALENT_COMMAND_FILE_PATH=Pe\u0142na \u015bcie\u017cka do pliku gdzie odpowiednik nieinteraktywnych polece\u0144 b\u0119dzie zapisany je\u015bli polecenie uruchomione jest w trybie interaktywnym
INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_NEW_VLV=Serwer jest uruchomiony. You must provide authentication to create a VLV index.
-INFO_BASEDN_REPLICATED_LABEL=W\u0142\u0105czony
INFO_CTRL_PANEL_MUST_DEFINE_INDEX=Musisz zdefiniowa\u0107 indeks '%s'.
INFO_REMOVE_LDIFS_LABEL=Pliki Eksportu LDIF Znajduj\u0105ce si\u0119 w Katalogu ldif
INFO_DESCRIPTION_ENABLE_REPLICATION_STARTTLS2=U\u017cyj StartTLS do zabezpieczenia komunikacji z drugim serwerem
diff --git a/opends/src/messages/messages/admin_tool_zh_CN.properties b/opends/src/messages/messages/admin_tool_zh_CN.properties
index 2df73da..5ae19fb 100644
--- a/opends/src/messages/messages/admin_tool_zh_CN.properties
+++ b/opends/src/messages/messages/admin_tool_zh_CN.properties
@@ -200,7 +200,8 @@
INFO_CONTROL_PANEL_LAUNCHER_USAGE_DESCRIPTION=\u8be5\u5b9e\u7528\u7a0b\u5e8f\u53ef\u7528\u4e8e\u663e\u793a\u201c\u63a7\u5236\u9762\u677f\u201d\u7a97\u53e3\uff0c\u5176\u4e2d\u4f1a\u663e\u793a\u57fa\u672c\u670d\u52a1\u5668\u4fe1\u606f\u5e76\u5141\u8bb8\u5728\u8be5\u670d\u52a1\u5668\u6267\u884c\u4e00\u4e9b\u57fa\u672c\u7ba1\u7406\u4efb\u52a1\u3002%n%n\u5982\u679c\u6ca1\u6709\u63d0\u4f9b\u4e3b\u673a\u540d\u6216\u7aef\u53e3\uff0c\u8be5\u5de5\u5177\u5c06\u5c1d\u8bd5\u8fde\u63a5\u5230\u672c\u5730\u670d\u52a1\u5668\u3002
INFO_STOP_BUTTON_LABEL=\u505c\u6b62
INFO_STOP_BUTTON_TOOLTIP=\u505c\u6b62\u76ee\u5f55\u670d\u52a1\u5668
-INFO_BASEDN_NOT_REPLICATED_LABEL=\u5df2\u7981\u7528
+INFO_BASEDN_NOT_REPLICATED_LABEL=
+INFO_BASEDN_DISABLED_LABEL=\u5df2\u7981\u7528
INFO_BASEDN_REPLICATED_LABEL=\u5df2\u542f\u7528
INFO_SUMMARY_DELETING_EXTERNAL_DB_FILES=\u6b63\u5728\u5220\u9664\u5b89\u88c5\u8def\u5f84\u4ee5\u5916\u7684\u6570\u636e\u5e93\u6587\u4ef6...
INFO_SUMMARY_DELETING_EXTERNAL_LOG_FILES=\u6b63\u5728\u5220\u9664\u5b89\u88c5\u8def\u5f84\u4ee5\u5916\u7684\u65e5\u5fd7\u6587\u4ef6...
diff --git a/opends/src/messages/messages/admin_tool_zh_TW.properties b/opends/src/messages/messages/admin_tool_zh_TW.properties
index 66a90e3..db23620 100644
--- a/opends/src/messages/messages/admin_tool_zh_TW.properties
+++ b/opends/src/messages/messages/admin_tool_zh_TW.properties
@@ -177,7 +177,8 @@
INFO_STATUS_CLI_USAGE_DESCRIPTION=\u6b64\u516c\u7528\u7a0b\u5f0f\u53ef\u7528\u4f86\u986f\u793a\u57fa\u672c\u4f3a\u670d\u5668\u8cc7\u8a0a
INFO_STOP_BUTTON_LABEL=\u505c\u6b62
INFO_STOP_BUTTON_TOOLTIP=\u505c\u6b62\u76ee\u9304\u4f3a\u670d\u5668
-INFO_BASEDN_NOT_REPLICATED_LABEL=\u5df2\u505c\u7528
+INFO_BASEDN_NOT_REPLICATED_LABEL=
+INFO_BASEDN_DISABLED_LABEL=\u5df2\u505c\u7528
INFO_BASEDN_REPLICATED_LABEL=\u5df2\u555f\u7528
INFO_SUMMARY_DELETING_EXTERNAL_DB_FILES=\u6b63\u5728\u522a\u9664\u5b89\u88dd\u8def\u5f91\u4e4b\u5916\u7684\u8cc7\u6599\u5eab\u6a94\u6848...
INFO_SUMMARY_DELETING_EXTERNAL_LOG_FILES=\u6b63\u5728\u522a\u9664\u5b89\u88dd\u8def\u5f91\u4e4b\u5916\u7684\u8a18\u9304\u6a94...
diff --git a/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index c19f6e7..c87cc58 100644
--- a/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -7416,7 +7416,7 @@
// Replication enabled
tableBuilder.appendCell(
- Message.raw(Boolean.toString(replica.isReplicated())));
+ Message.raw(Boolean.toString(replica.isReplicationEnabled())));
// DS instance ID
tableBuilder.appendCell(
@@ -7494,8 +7494,7 @@
{
tableBuilder.appendCell(Message.raw(""));
}
- tableBuilder.appendCell(
- Message.raw(Boolean.toString(replica.isReplicated())));
+ tableBuilder.appendCell(Message.raw(""));
}
}
@@ -7522,7 +7521,7 @@
}
// Replication enabled
- tableBuilder.appendCell(Message.raw(Boolean.toString(true)));
+ tableBuilder.appendCell(Boolean.toString(true));
// DS ID
tableBuilder.appendCell(Message.raw(""));
--
Gitblit v1.10.0