From 6f877b5157e5000638bfc7112632b5aa6e85596f Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 25 Jan 2008 13:10:53 +0000
Subject: [PATCH] Fix for 2872 (Simplify and improve usage of dsjavaproperties)
---
opendj-sdk/opends/src/messages/messages/tools.properties | 18 ++++++++++--------
opendj-sdk/opends/src/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java | 9 ++++-----
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/opendj-sdk/opends/src/messages/messages/tools.properties b/opendj-sdk/opends/src/messages/messages/tools.properties
index aa170fd..5f5e32b 100644
--- a/opendj-sdk/opends/src/messages/messages/tools.properties
+++ b/opendj-sdk/opends/src/messages/messages/tools.properties
@@ -2193,11 +2193,13 @@
INFO_INSTALLDS_PROMPT_SKIPPED_FILE_1484=Write skipped entries to file:
SEVERE_ERR_INSTALLDS_TOO_MANY_KEYSTORE_PASSWORD_TRIES_1485=The maximum number \
of tries to provide the certificate key store PIN is %s. Install canceled
-INFO_JAVAPROPERTIES_TOOL_DESCRIPTION_1486=Updates the script files to use the \
- java binary and java arguments specified in the properties file (%s by \
- default). To specify the java binary and the java arguments that must be \
- used to run the different command-lines (or the server in the case of the %s \
- command-line) you must edit the properties file
+INFO_JAVAPROPERTIES_TOOL_DESCRIPTION_1486=This utility can be used to change \
+ the java arguments and java home that are used by the different OpenDS \
+ commands.%n%nBefore launching the command, edit the properties file located \
+ in %s to specify the java arguments and java home. When you have edited the \
+ properties file, run this command for the changes to be taken into account.\
+ %n%nNote that the changes will only apply to this OpenDS installation. No \
+ modifications will be made to your environment variables
INFO_JAVAPROPERTIES_DESCRIPTION_SILENT_1487=Run the tool in quiet mode. Quiet \
mode will not output progress information to standard output
INFO_JAVAPROPERTIES_DESCRIPTION_PROPERTIES_FILE_1488=The properties file to \
@@ -2215,9 +2217,9 @@
INFO_JAVAPROPERTIES_SUCCESSFUL_NON_DEFAULT_1494=The script file %s was \
successfully created. For the command-lines to use the java properties \
specified on %s you must copy the created script file to %s
-INFO_JAVAPROPERTIES_SUCCESSFUL_1495=The script files were successfully \
- updated. The OpenDS command-line utilities will use the java properties \
- specified in the properties file %s
+INFO_JAVAPROPERTIES_SUCCESSFUL_1495=The operation was successful. The OpenDS \
+ commands will use the java arguments and java home specified in the \
+ properties file located in %s
INFO_DESCRIPTION_TEST_IF_OFFLINE_1496=When this is set test if the command \
must be run in offline or online mode, returning the appropriate error code
SEVERE_ERR_BACKUPDB_REPEATED_BACKEND_ID_1497=The backend ID '%s' has been \
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java b/opendj-sdk/opends/src/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java
index 0f33b2a..2254876 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2007 Sun Microsystems, Inc.
+ * Portions Copyright 2007-2008 Sun Microsystems, Inc.
*/
package org.opends.server.tools;
@@ -63,10 +63,7 @@
public JavaPropertiesToolArgumentParser(String mainClassName)
{
super(mainClassName,
- INFO_JAVAPROPERTIES_TOOL_DESCRIPTION.get(getDefaultPropertiesValue(),
- Utils.isWindows() ?
- Installation.WINDOWS_START_FILE_NAME :
- Installation.UNIX_START_FILE_NAME),
+ INFO_JAVAPROPERTIES_TOOL_DESCRIPTION.get(getDefaultPropertiesValue()),
false);
}
@@ -90,6 +87,7 @@
"propertiesFile",
INFO_JAVAPROPERTIES_DESCRIPTION_PROPERTIES_FILE.get(
getDefaultPropertiesValue()));
+ propertiesFileArg.setHidden(true);
addArgument(propertiesFileArg);
destinationFileArg = new StringArgument("destinationFile",
@@ -98,6 +96,7 @@
"destinationFile",
INFO_JAVAPROPERTIES_DESCRIPTION_DESTINATION_FILE.get(
getDefaultDestinationValue()));
+ destinationFileArg.setHidden(true);
addArgument(destinationFileArg);
showUsageArg = new BooleanArgument("help", OPTION_SHORT_HELP,
--
Gitblit v1.10.0