From 1a5d79b573ef70d1438c71e344e949388ffec480 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Thu, 09 Nov 2006 17:17:39 +0000
Subject: [PATCH] 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.
---
opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java | 23 -----------------------
opendj-sdk/opends/resource/DynamicConstants.java.stubs | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/opendj-sdk/opends/resource/DynamicConstants.java.stubs b/opendj-sdk/opends/resource/DynamicConstants.java.stubs
index 2f89e22..7c371cb 100644
--- a/opendj-sdk/opends/resource/DynamicConstants.java.stubs
+++ b/opendj-sdk/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);
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java b/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
index c0ca1dc..caf5bb0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opendj-sdk/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.
--
Gitblit v1.10.0