From 6bd59b09d5d26852c652720c16371fe140890574 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 19 Nov 2007 14:43:25 +0000
Subject: [PATCH] Include some description modifications as proposed by Lana.
---
opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/PreExternalInitializationUserData.java | 10 ++--
opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java | 28 +++++++-------
opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliArgumentParser.java | 22 +++++-----
opendj-sdk/opends/src/messages/messages/admin_tool.properties | 19 ++++-----
4 files changed, 39 insertions(+), 40 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/PreExternalInitializationUserData.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/PreExternalInitializationUserData.java
index f71b72f..9000cd2 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/PreExternalInitializationUserData.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/PreExternalInitializationUserData.java
@@ -36,16 +36,16 @@
*/
class PreExternalInitializationUserData extends MonoServerReplicationUserData
{
- private boolean onlyLocal;
+ private boolean localOnly;
/**
* Whether the operation must be applied only on the local server or not.
* @return <CODE>true</CODE> if the operation must be applied only on the
* local server and <CODE>false</CODE> otherwise.
*/
- public boolean isOnlyLocal()
+ public boolean isLocalOnly()
{
- return onlyLocal;
+ return localOnly;
}
/**
@@ -53,9 +53,9 @@
* @param onlyLocal whether the operation must be applied only on the local
* server or not.
*/
- public void setOnlyLocal(boolean onlyLocal)
+ public void setLocalOnly(boolean onlyLocal)
{
- this.onlyLocal = onlyLocal;
+ this.localOnly = onlyLocal;
}
}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliArgumentParser.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliArgumentParser.java
index 3598135..1437ee3 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliArgumentParser.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliArgumentParser.java
@@ -224,7 +224,7 @@
* The argument that specifies if the external initialization will be
* performed only on this server.
*/
- private BooleanArgument externalInitializationOnlyInLocalArg;
+ private BooleanArgument externalInitializationLocalOnlyArg;
/**
* The 'quiet' argument.
@@ -731,17 +731,17 @@
INFO_DESCRIPTION_SUBCMD_PRE_EXTERNAL_INITIALIZATION.get(
POST_EXTERNAL_INITIALIZATION_SUBCMD_NAME));
secureArgsList.hostNameArg.setDefaultValue(getDefaultHostValue());
- externalInitializationOnlyInLocalArg = new BooleanArgument(
- "only-local",
+ externalInitializationLocalOnlyArg = new BooleanArgument(
+ "local-only",
'l',
- "only-local",
+ "local-only",
INFO_DESCRIPTION_EXTERNAL_INITIALIZATION_LOCAL.get());
- externalInitializationOnlyInLocalArg.setPropertyName(
- externalInitializationOnlyInLocalArg.getLongIdentifier());
+ externalInitializationLocalOnlyArg.setPropertyName(
+ externalInitializationLocalOnlyArg.getLongIdentifier());
Argument[] argsToAdd = { secureArgsList.hostNameArg,
secureArgsList.portArg, secureArgsList.useSSLArg,
secureArgsList.useStartTLSArg,
- externalInitializationOnlyInLocalArg};
+ externalInitializationLocalOnlyArg};
for (int i=0; i<argsToAdd.length; i++)
{
@@ -764,8 +764,8 @@
INFO_DESCRIPTION_SUBCMD_POST_EXTERNAL_INITIALIZATION.get(
PRE_EXTERNAL_INITIALIZATION_SUBCMD_NAME));
secureArgsList.hostNameArg.setDefaultValue(getDefaultHostValue());
- externalInitializationOnlyInLocalArg.setPropertyName(
- externalInitializationOnlyInLocalArg.getLongIdentifier());
+ externalInitializationLocalOnlyArg.setPropertyName(
+ externalInitializationLocalOnlyArg.getLongIdentifier());
Argument[] argsToAdd = { secureArgsList.hostNameArg,
secureArgsList.portArg, secureArgsList.useSSLArg,
secureArgsList.useStartTLSArg};
@@ -1954,9 +1954,9 @@
* external initialization operations only on the local server and
* <CODE>false</CODE> otherwise.
*/
- public boolean isExternalInitializationOnlyInLocal()
+ public boolean isExternalInitializationLocalOnly()
{
- return externalInitializationOnlyInLocalArg.isPresent();
+ return externalInitializationLocalOnlyArg.isPresent();
}
/**
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java
index 198c5b8..4d88682 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java
@@ -1426,19 +1426,19 @@
}
if (!cancelled)
{
- boolean onlyLocal = false;
- if (!argParser.isExternalInitializationOnlyInLocal())
+ boolean localOnly = false;
+ if (!argParser.isExternalInitializationLocalOnly())
{
println();
- onlyLocal = askConfirmation(
+ localOnly = askConfirmation(
INFO_REPLICATION_PRE_EXTERNAL_INITIALIZATION_LOCAL_PROMPT.get(
ConnectionUtils.getHostPort(ctx)), false, LOG);
}
else
{
- onlyLocal = true;
+ localOnly = true;
}
- uData.setOnlyLocal(onlyLocal);
+ uData.setLocalOnly(localOnly);
uData.setHostName(host);
uData.setPort(port);
@@ -2157,7 +2157,7 @@
uData.setPort(port);
uData.setUseSSL(argParser.useSSLToInitializeAll());
uData.setUseStartTLS(argParser.useStartTLSToInitializeAll());
- uData.setOnlyLocal(argParser.isExternalInitializationOnlyInLocal());
+ uData.setLocalOnly(argParser.isExternalInitializationLocalOnly());
}
/**
@@ -3231,7 +3231,7 @@
Message msg = formatter.getFormattedWithPoints(
INFO_PROGRESS_PRE_EXTERNAL_INITIALIZATION.get(baseDN));
printProgress(msg);
- preExternalInitialization(baseDN, ctx, uData.isOnlyLocal(), false);
+ preExternalInitialization(baseDN, ctx, uData.isLocalOnly(), false);
printProgress(formatter.getFormattedDone());
printlnProgress();
}
@@ -3243,7 +3243,7 @@
LOG.log(Level.SEVERE, "Complete error stack:", rce);
}
}
- if (uData.isOnlyLocal())
+ if (uData.isLocalOnly())
{
printlnProgress();
printProgress(
@@ -5610,16 +5610,16 @@
* connection on a given base DN.
* @param baseDN the base DN that we want to reset.
* @param ctx the connection to the server.
- * @param onlyLocal whether the resetting internal operations must only apply
+ * @param localOnly whether the resetting internal operations must only apply
* to the server to which we are connected.
* @param displayProgress whether to display operation progress or not.
* @throws ReplicationCliException if there is an error performing the
* operation.
*/
private void preExternalInitialization(String baseDN, InitialLdapContext ctx,
- boolean onlyLocal, boolean displayProgress) throws ReplicationCliException
+ boolean localOnly, boolean displayProgress) throws ReplicationCliException
{
- postPreExternalInitialization(baseDN, ctx, onlyLocal, displayProgress,
+ postPreExternalInitialization(baseDN, ctx, localOnly, displayProgress,
true);
}
@@ -5643,7 +5643,7 @@
* provided connection on a given base DN.
* @param baseDN the base DN that we want to reset.
* @param ctx the connection to the server.
- * @param onlyLocal whether the resetting internal operations must only apply
+ * @param localOnly whether the resetting internal operations must only apply
* to the server to which we are connected.
* @param displayProgress whether to display operation progress or not.
* @param isPre whether this is the pre operation or the post operation.
@@ -5651,7 +5651,7 @@
* operation.
*/
private void postPreExternalInitialization(String baseDN,
- InitialLdapContext ctx, boolean onlyLocal, boolean displayProgress,
+ InitialLdapContext ctx, boolean localOnly, boolean displayProgress,
boolean isPre) throws ReplicationCliException
{
boolean taskCreated = false;
@@ -5668,7 +5668,7 @@
"org.opends.server.tasks.SetGenerationIdTask");
if (isPre)
{
- if (!onlyLocal)
+ if (!localOnly)
{
attrs.put("ds-task-reset-generation-id-new-value", "-1");
}
diff --git a/opendj-sdk/opends/src/messages/messages/admin_tool.properties b/opendj-sdk/opends/src/messages/messages/admin_tool.properties
index b41bcb8..22dec52 100644
--- a/opendj-sdk/opends/src/messages/messages/admin_tool.properties
+++ b/opendj-sdk/opends/src/messages/messages/admin_tool.properties
@@ -470,8 +470,8 @@
secure communication with the destination server
INFO_DESCRIPTION_INITIALIZE_REPLICATION_STARTTLS_DESTINATION=Use \
StartTLS to secure communication with the destination server
-INFO_DESCRIPTION_EXTERNAL_INITIALIZATION_LOCAL=Use this option when only the \
- contents of the specified directory server will be initialized with an \
+INFO_DESCRIPTION_EXTERNAL_INITIALIZATION_LOCAL=Use this option when the \
+ contents of only the specified directory server will be initialized with an \
external method (import-ldif command or binary copy)
INFO_REPLICATION_TOOL_DESCRIPTION=This utility may be used to configure \
replication between servers so that the data of the servers is synchronized.\
@@ -497,17 +497,16 @@
applied to each server can also be used for this purpose).
INFO_DESCRIPTION_SUBCMD_PRE_EXTERNAL_INITIALIZATION=This subcommand must be \
called before initializing the contents of all the replicated servers using \
- the tool import-ldif or the binary copy method for replication to work. You \
- must specify the list of Base DNs that will be initialized and you must \
- provide the credentials of any of the servers that is being replicated. \
- After calling this subcommand, you must initialize the contents \
- of all the servers in the topology and after the initialization is over you \
- must call the subcommand {%s}.
+ the tool import-ldif or the binary copy method. You must specify the list of \
+ Base DNs that will be initialized and you must \
+ provide the credentials of any of the servers that are being replicated. \
+ After calling this subcommand, initialize the contents of all the servers in \
+ the topology, then call the subcommand {%s}.
INFO_DESCRIPTION_SUBCMD_POST_EXTERNAL_INITIALIZATION=This subcommand must be \
called after initializing the contents of all the replicated servers using \
- the tool import-ldif or the binary copy method for replication to work. You \
+ the tool import-ldif or the binary copy method. You \
must specify the list of Base DNs that have been initialized and you must \
- provide the credentials of any of the servers that is being replicated. See \
+ provide the credentials of any of the servers that are being replicated. See \
the usage of the subcommand {%s} for more information.
INFO_DESCRIPTION_SUBCMD_ENABLE_REPLICATION=Updates the configuration of the \
servers to replicate the data under the specified Base DN. If one of the \
--
Gitblit v1.10.0