From 412d2a37f5783a4946bcf2a22ca0e79f95047f04 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Tue, 15 May 2007 08:10:13 +0000
Subject: [PATCH] issue 1430 fix (all utilities should provide as standard option -V/--version) to specify the LDAP protocol version number, we should use now -V/--ldapVersion to get the 'product' version --version
---
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java
index 5c0c1f2..f103a20 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java
@@ -802,8 +802,10 @@
null, null, MSGID_DESCRIPTION_CONTROLS);
argParser.addArgument(controlStr);
- version = new IntegerArgument("version", 'V', "version",
- false, false, true, "{version}", 3, null,
+ version = new IntegerArgument("version", OPTION_SHORT_PROTOCOL_VERSION,
+ OPTION_LONG_PROTOCOL_VERSION,
+ false, false, true,
+ OPTION_VALUE_PROTOCOL_VERSION, 3, null,
MSGID_DESCRIPTION_VERSION);
argParser.addArgument(version);
@@ -856,8 +858,9 @@
return 1;
}
- // If we should just display usage information, then print it and exit.
- if (argParser.usageDisplayed())
+ // If we should just display usage or version information,
+ // then print it and exit.
+ if (argParser.usageOrVersionDisplayed())
{
return 0;
}
--
Gitblit v1.10.0