Consistent version number output. Reviewed by neil_a_wilson.

coulbeck

16.31.2006 fefff7ca06c138c234c440b4a480842900389f68

Consistent version number output.  Reviewed by neil_a_wilson.

 opends/src/server/org/opends/server/core/DirectoryServer.java

@@ -7121,7 +7121,15 @@
    buffer.append(MAJOR_VERSION);
    buffer.append(".");
    buffer.append(MINOR_VERSION);
    buffer.append(VERSION_QUALIFIER);
    if ((VERSION_QUALIFIER == null) || (VERSION_QUALIFIER.length() == 0))
    {
      buffer.append(".");
      buffer.append(POINT_VERSION);
    }
    else
    {
      buffer.append(VERSION_QUALIFIER);
    }
    return buffer.toString();
  }


 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)
    {