Move the logic that was just added in DirectoryServer.getCompactVerisonStri...

neil_a_wilson

09.17.2006 e8461f5a27650a2bf1807063a6c3646232b5898e

Move the logic that was just added in DirectoryServer.getCompactVerisonString
into the DynamicConstants class as a COMPACT_VERSION_STRING constant.  A
FULL_VERSION_STRING constant has also been added.

 opends/resource/DynamicConstants.java.stubs

@@ -110,4 +110,23 @@
   * versions.
   */
  public static final boolean DEBUG_BUILD = ${DEBUG_BUILD};

  /**
   * A compact version string for this product, suitable for use in path
   * names and similar cases.
   */
  public static final String COMPACT_VERSION_STRING =
       SHORT_NAME + "-" + MAJOR_VERSION + "." + MINOR_VERSION +
       (((VERSION_QUALIFIER != null) && (VERSION_QUALIFIER.length() > 0))
        ? VERSION_QUALIFIER
        : "");

  /**
   * A full version string for this product.
   */
  public static final String FULL_VERSION_STRING =
       PRODUCT_NAME + " " + MAJOR_VERSION + "." + MINOR_VERSION +
       (((VERSION_QUALIFIER != null) && (VERSION_QUALIFIER.length() > 0))
        ? VERSION_QUALIFIER
        : "." + POINT_VERSION);
}

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

@@ -7118,29 +7118,6 @@


  /**
   * Retrieves a compact version string for the Directory Server, which may be
   * used in elements like path names.
   *
   * @return  A compact version string for the Directory Server.
   */
  public static String getCompactVersionString()
  {
    StringBuilder buffer = new StringBuilder();
    buffer.append(SHORT_NAME);
    buffer.append("-");
    buffer.append(MAJOR_VERSION);
    buffer.append(".");
    buffer.append(MINOR_VERSION);
    if ((VERSION_QUALIFIER != null) && (VERSION_QUALIFIER.length() > 0))
    {
      buffer.append(VERSION_QUALIFIER);
    }
    return buffer.toString();
  }



  /**
   * Retrieves the full version string for the Directory Server.
   *
   * @return  The full version string for the Directory Server.