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/schema/CertificateExactMatchingRule.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java
index 31c901d..9dede52 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java
@@ -44,7 +44,7 @@
import java.util.Collection;
import java.util.Collections;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.ErrorLogger;
@@ -202,7 +202,7 @@
catch (CertificateException ce)
{
// There seems to be a problem while parsing the certificate.
- Message message = WARN_CERTIFICATE_MATCH_PARSE_ERROR.get(ce.getMessage());
+ LocalizableMessage message = WARN_CERTIFICATE_MATCH_PARSE_ERROR.get(ce.getMessage());
if (debugEnabled())
{
TRACER.debugWarning(message.toString());
@@ -228,7 +228,7 @@
// We couldn't normalize the DN for some reason. If we're supposed to use
// strict syntax enforcement, then throw an exception. Otherwise, log a
// message and just try our best.
- Message message = ERR_CERTIFICATE_MATCH_INVALID_DN.get(
+ LocalizableMessage message = ERR_CERTIFICATE_MATCH_INVALID_DN.get(
dnstring, getExceptionMessage(e));
switch (DirectoryServer.getSyntaxEnforcementPolicy())
@@ -294,7 +294,7 @@
identifier = parser.nextNamedValueIdentifier();
if (!identifier.equals(GSER_ID_SERIALNUMBER))
{
- Message message = ERR_CERTIFICATE_MATCH_IDENTIFIER_NOT_FOUND
+ LocalizableMessage message = ERR_CERTIFICATE_MATCH_IDENTIFIER_NOT_FOUND
.get(GSER_ID_SERIALNUMBER);
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
message);
@@ -310,7 +310,7 @@
identifier = parser.nextNamedValueIdentifier();
if (!identifier.equals(GSER_ID_ISSUER))
{
- Message message = ERR_CERTIFICATE_MATCH_IDENTIFIER_NOT_FOUND
+ LocalizableMessage message = ERR_CERTIFICATE_MATCH_IDENTIFIER_NOT_FOUND
.get(GSER_ID_ISSUER);
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
message);
@@ -320,7 +320,7 @@
identifier = parser.nextChoiceValueIdentifier();
if (!identifier.equals(GSER_ID_RDNSEQUENCE))
{
- Message message = ERR_CERTIFICATE_MATCH_IDENTIFIER_NOT_FOUND
+ LocalizableMessage message = ERR_CERTIFICATE_MATCH_IDENTIFIER_NOT_FOUND
.get(GSER_ID_RDNSEQUENCE);
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
message);
@@ -335,7 +335,7 @@
// There should not be additional characters
if (parser.hasNext())
{
- Message message = ERR_CERTIFICATE_MATCH_EXPECTED_END.get();
+ LocalizableMessage message = ERR_CERTIFICATE_MATCH_EXPECTED_END.get();
switch (DirectoryServer.getSyntaxEnforcementPolicy())
{
case REJECT:
@@ -349,7 +349,7 @@
}
catch (GSERException e)
{
- Message message = ERR_CERTIFICATE_MATCH_GSER_INVALID.get(
+ LocalizableMessage message = ERR_CERTIFICATE_MATCH_GSER_INVALID.get(
getExceptionMessage(e));
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
message);
@@ -371,7 +371,7 @@
// We couldn't normalize the DN for some reason. If we're supposed to use
// strict syntax enforcement, then throw an exception. Otherwise, log a
// message and just try our best.
- Message message = ERR_CERTIFICATE_MATCH_INVALID_DN.get(
+ LocalizableMessage message = ERR_CERTIFICATE_MATCH_INVALID_DN.get(
dnstring, getExceptionMessage(e));
switch (DirectoryServer.getSyntaxEnforcementPolicy())
--
Gitblit v1.10.0