From feb5d90ec016c99712f19c5485cf7633cd38f111 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 23 Mar 2007 14:26:04 +0000
Subject: [PATCH] Merge admin framework from config-prototype-branch onto trunk.

---
 opends/src/server/org/opends/server/messages/ProtocolMessages.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/opends/src/server/org/opends/server/messages/ProtocolMessages.java b/opends/src/server/org/opends/server/messages/ProtocolMessages.java
index 09c2150..cb18329 100644
--- a/opends/src/server/org/opends/server/messages/ProtocolMessages.java
+++ b/opends/src/server/org/opends/server/messages/ProtocolMessages.java
@@ -4331,7 +4331,7 @@
    * arguments, which are the DN of the configuration entry and the provided key
    * manager provider DN.
    */
-  public static final int MSGID_JMX_CONNHANDLER_INVALID_KEY_MANAGER_DN =
+  public static final int MSGID_JMX_CONNHANDLER_INVALID_KEYMANAGER_DN =
        CATEGORY_MASK_PROTOCOL | SEVERITY_MASK_SEVERE_ERROR | 399;
 
 
@@ -6132,7 +6132,7 @@
             "connections or performing StartTLS negotiation.  " +
             "Changes to this configuration attribute will take effect " +
             "immediately.");
-    registerMessage(MSGID_JMX_CONNHANDLER_INVALID_KEY_MANAGER_DN,
+    registerMessage(MSGID_JMX_CONNHANDLER_INVALID_KEYMANAGER_DN,
             "An error occurred while processing the " + ATTR_KEYMANAGER_DN +
             " attribute in configuration entry %s, because the provided " +
             "key manager DN %s does not refer to an enabled key manager " +

--
Gitblit v1.10.0