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/dsml/org/opends/dsml/protocol/DSMLServlet.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLServlet.java b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
index 55b68e7..57f1537 100644
--- a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
+++ b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
@@ -66,7 +66,7 @@
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.controls.ProxiedAuthV2Control;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.asn1.ASN1Exception;
@@ -286,7 +286,7 @@
getResultCode())
{
default:
- Message m = INFO_RESULT_AUTHORIZATION_DENIED.get();
+ LocalizableMessage m = INFO_RESULT_AUTHORIZATION_DENIED.get();
throw new LDAPConnectionException(m, CLIENT_SIDE_CONNECT_ERROR,
null);
case LDAPResultCode.SUCCESS:
@@ -297,18 +297,18 @@
}
catch (LDAPException le)
{
- Message m = INFO_RESULT_CLIENT_SIDE_ENCODING_ERROR.get();
+ LocalizableMessage m = INFO_RESULT_CLIENT_SIDE_ENCODING_ERROR.get();
throw new LDAPConnectionException(m, CLIENT_SIDE_CONNECT_ERROR, null, le);
}
catch (ASN1Exception ae)
{
- Message m = INFO_RESULT_CLIENT_SIDE_ENCODING_ERROR.get();
+ LocalizableMessage m = INFO_RESULT_CLIENT_SIDE_ENCODING_ERROR.get();
throw new LDAPConnectionException(m, CLIENT_SIDE_CONNECT_ERROR, null,
ae);
}
catch (IOException ie)
{
- Message m = INFO_RESULT_CLIENT_SIDE_ENCODING_ERROR.get();
+ LocalizableMessage m = INFO_RESULT_CLIENT_SIDE_ENCODING_ERROR.get();
throw new LDAPConnectionException(m, CLIENT_SIDE_CONNECT_ERROR, null, ie);
}
}
@@ -359,7 +359,7 @@
batchResponses.add(
createErrorResponse(
new LDAPException(LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR,
- Message.raw(
+ LocalizableMessage.raw(
"Invalid SSL or TLS configuration to connect to LDAP server."))));
}
connOptions.setSSLConnectionFactory(sslConnectionFactory);
@@ -402,7 +402,7 @@
batchResponses.add(
createErrorResponse(
new LDAPException(LDAPResultCode.INVALID_CREDENTIALS,
- Message.raw(ex.getMessage()))));
+ LocalizableMessage.raw(ex.getMessage()))));
break;
}
}
@@ -427,7 +427,7 @@
batchResponses.add(
createErrorResponse(
new LDAPException(LDAPResultCode.INVALID_CREDENTIALS,
- Message.raw("Invalid configured credentials."))));
+ LocalizableMessage.raw("Invalid configured credentials."))));
}
}
else
@@ -442,7 +442,7 @@
batchResponses.add(
createErrorResponse(
new LDAPException(LDAPResultCode.INVALID_CREDENTIALS,
- Message.raw("Unable to retrieve credentials."))));
+ LocalizableMessage.raw("Unable to retrieve credentials."))));
}
}
--
Gitblit v1.10.0