From 81d36161ce5367fa7aa9a5d99dc8b80eacfa7cdf Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 24 Jan 2014 14:43:46 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 :    Migrate I18n and logging support to i18n framework and SLF4J

---
 opendj3-server-dev/src/server/org/opends/server/extensions/SASLContext.java |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SASLContext.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SASLContext.java
index 0ea2cb3..c14c64f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SASLContext.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SASLContext.java
@@ -43,7 +43,7 @@
 import javax.security.sasl.*;
 
 import org.ietf.jgss.GSSException;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
 import org.opends.server.api.AuthenticationPolicyState;
 import org.opends.server.api.ClientConnection;
 import org.opends.server.api.IdentityMapper;
@@ -125,7 +125,7 @@
   private String userName;
 
   // Error message used by callbacks.
-  private Message cbMsg;
+  private LocalizableMessage cbMsg;
 
   // Error code used by callbacks.
   private ResultCode cbResultCode;
@@ -205,7 +205,7 @@
       }
       else
       {
-        final Message message = INFO_SASL_UNSUPPORTED_CALLBACK.get(mechanism,
+        final LocalizableMessage message = INFO_SASL_UNSUPPORTED_CALLBACK.get(mechanism,
             String.valueOf(callback));
         throw new UnsupportedCallbackException(callback, message.toString());
       }
@@ -244,7 +244,7 @@
         }
         final GSSException gex = (GSSException) ex.getCause();
 
-        final Message msg;
+        final LocalizableMessage msg;
         if (gex != null)
         {
           msg = ERR_SASL_CONTEXT_CREATE_ERROR.get(SASL_MECHANISM_GSSAPI,
@@ -313,7 +313,7 @@
         TRACER.debugCaught(DebugLogLevel.ERROR, e);
       }
 
-      final Message msg = ERR_SASL_PROTOCOL_ERROR.get(mechanism,
+      final LocalizableMessage msg = ERR_SASL_PROTOCOL_ERROR.get(mechanism,
           getExceptionMessage(e));
       handleError(msg);
       return false;
@@ -358,7 +358,7 @@
 
     if ((clientCredentials == null) || (clientCredentials.length() == 0))
     {
-      final Message msg = ERR_SASL_NO_CREDENTIALS.get(mechanism, mechanism);
+      final LocalizableMessage msg = ERR_SASL_NO_CREDENTIALS.get(mechanism, mechanism);
       handleError(msg);
       return;
     }
@@ -400,7 +400,7 @@
         TRACER.debugCaught(DebugLogLevel.ERROR, e);
       }
 
-      final Message msg = ERR_SASL_PROTOCOL_ERROR.get(mechanism,
+      final LocalizableMessage msg = ERR_SASL_PROTOCOL_ERROR.get(mechanism,
           getExceptionMessage(e));
       handleError(msg);
     }
@@ -433,7 +433,7 @@
       {
         TRACER.debugCaught(DebugLogLevel.ERROR, e);
       }
-      final Message msg = ERR_SASL_PROTOCOL_ERROR.get(mechanism,
+      final LocalizableMessage msg = ERR_SASL_PROTOCOL_ERROR.get(mechanism,
           getExceptionMessage(e));
       handleError(msg);
     }
@@ -585,7 +585,7 @@
       {
         TRACER.debugCaught(DebugLogLevel.ERROR, e);
       }
-      final Message msg = ERR_SASL_PROTOCOL_ERROR.get(mechanism,
+      final LocalizableMessage msg = ERR_SASL_PROTOCOL_ERROR.get(mechanism,
           getExceptionMessage(e));
       handleError(msg);
     }
@@ -946,7 +946,7 @@
    * @param msg
    *          The message to use if the callback message is not null.
    */
-  private void handleError(final Message msg)
+  private void handleError(final LocalizableMessage msg)
   {
     dispose();
     final ClientConnection clientConn = bindOp.getClientConnection();
@@ -1047,9 +1047,9 @@
         serverFQDN, saslProps, this);
     if (saslServer == null)
     {
-      final Message msg = ERR_SASL_CREATE_SASL_SERVER_FAILED.get(mechanism,
+      final LocalizableMessage msg = ERR_SASL_CREATE_SASL_SERVER_FAILED.get(mechanism,
           serverFQDN);
-      throw new SaslException(Message.toString(msg));
+      throw new SaslException(msg.toString());
     }
   }
 
@@ -1182,7 +1182,7 @@
 
       if (!authState.isPasswordPolicy())
       {
-        final Message message = ERR_SASL_ACCOUNT_NOT_LOCAL.get(mechanism,
+        final LocalizableMessage message = ERR_SASL_ACCOUNT_NOT_LOCAL.get(mechanism,
             String.valueOf(authEntry.getName()));
         setCallbackMsg(ResultCode.INAPPROPRIATE_AUTHENTICATION, message);
         return;
@@ -1234,7 +1234,7 @@
    * @param cbMsg
    *          The message to set the callback message to.
    */
-  private void setCallbackMsg(final Message cbMsg)
+  private void setCallbackMsg(final LocalizableMessage cbMsg)
   {
     setCallbackMsg(ResultCode.INVALID_CREDENTIALS, cbMsg);
   }
@@ -1250,7 +1250,7 @@
    *          The message.
    */
   private void setCallbackMsg(final ResultCode cbResultCode,
-      final Message cbMsg)
+      final LocalizableMessage cbMsg)
   {
     this.cbResultCode = cbResultCode;
     this.cbMsg = cbMsg;

--
Gitblit v1.10.0