From fefff7ca06c138c234c440b4a480842900389f68 Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Mon, 16 Oct 2006 15:31:51 +0000
Subject: [PATCH] Consistent version number output. Reviewed by neil_a_wilson.
---
opends/src/server/org/opends/server/tools/InstallDS.java | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/InstallDS.java b/opends/src/server/org/opends/server/tools/InstallDS.java
index bd5545f..742179c 100644
--- a/opends/src/server/org/opends/server/tools/InstallDS.java
+++ b/opends/src/server/org/opends/server/tools/InstallDS.java
@@ -52,7 +52,6 @@
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.ToolMessages.*;
-import static org.opends.server.util.DynamicConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -94,14 +93,14 @@
/**
* The version string for the server.
*/
- private static String versionString = "OpenDS Directory Service";
+ private static String versionString;
/**
* The name of the program used to launch this installation process.
*/
- private static String programName = "setup";
+ private static String programName;
@@ -142,15 +141,7 @@
// Construct the product version string and the setup filename.
- versionString = PRODUCT_NAME + " " + MAJOR_VERSION + "." + MINOR_VERSION;
- if ((VERSION_QUALIFIER == null) || (VERSION_QUALIFIER.length() == 0))
- {
- versionString += "." + POINT_VERSION;
- }
- else
- {
- versionString += VERSION_QUALIFIER;
- }
+ versionString = DirectoryServer.getVersionString();
if (isWindows)
{
--
Gitblit v1.10.0