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/authorization/dseecompat/PatternDN.java | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternDN.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternDN.java
index 8e4bdcd..56bb8d5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternDN.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternDN.java
@@ -26,7 +26,7 @@
*/
package org.opends.server.authorization.dseecompat;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
@@ -427,7 +427,7 @@
}
else
{
- Message message = ERR_ATTR_SYNTAX_DN_NO_EQUAL.get(
+ LocalizableMessage message = ERR_ATTR_SYNTAX_DN_NO_EQUAL.get(
dnString, attributeName.toString(), c);
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
message);
@@ -493,7 +493,7 @@
{
// This should not happen. At any rate, it's an illegal
// character, so throw an exception.
- Message message = ERR_ATTR_SYNTAX_DN_INVALID_CHAR.get(dnString, c, pos);
+ LocalizableMessage message = ERR_ATTR_SYNTAX_DN_INVALID_CHAR.get(dnString, c, pos);
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
message);
}
@@ -522,7 +522,7 @@
// because that would be invalid.
if (pos >= length)
{
- Message message = ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME.get(
+ LocalizableMessage message = ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME.get(
dnString, attributeName.toString());
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
message);
@@ -542,7 +542,7 @@
// This means that we hit the end of the value before
// finding a '='. This is illegal because there is no
// attribute-value separator.
- Message message =
+ LocalizableMessage message =
ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME.get(dnString, name);
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
message);
@@ -562,7 +562,7 @@
}
else
{
- Message message = ERR_ATTR_SYNTAX_DN_NO_EQUAL.get(dnString, name, c);
+ LocalizableMessage message = ERR_ATTR_SYNTAX_DN_NO_EQUAL.get(dnString, name, c);
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
message);
}
@@ -630,7 +630,7 @@
{
// This should not happen. At any rate, it's an illegal
// character, so throw an exception.
- Message message =
+ LocalizableMessage message =
ERR_ATTR_SYNTAX_DN_INVALID_CHAR.get(dnString, c, pos);
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
message);
@@ -725,7 +725,7 @@
// know that there is at least one RDN component, and
// therefore the last non-space character of the DN must
// have been a comma. This is not acceptable.
- Message message = ERR_ATTR_SYNTAX_DN_END_WITH_COMMA.get(dnString);
+ LocalizableMessage message = ERR_ATTR_SYNTAX_DN_END_WITH_COMMA.get(dnString);
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
message);
}
@@ -760,7 +760,7 @@
case ')':
// None of these are allowed in an attribute name or any
// character immediately following it.
- Message message =
+ LocalizableMessage message =
ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_CHAR.get(dnString, c, pos);
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
message);
@@ -992,7 +992,7 @@
// have at least one character.
if (attributeName.length() == 0)
{
- Message message = ERR_ATTR_SYNTAX_DN_ATTR_NO_NAME.get(dnString);
+ LocalizableMessage message = ERR_ATTR_SYNTAX_DN_ATTR_NO_NAME.get(dnString);
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
message);
}
@@ -1067,7 +1067,7 @@
if (! validOID)
{
- Message message = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_PERIOD.get(
+ LocalizableMessage message = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_PERIOD.get(
dnString, attributeName.toString());
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
message);
@@ -1121,7 +1121,7 @@
StringBuilder hexString = new StringBuilder();
if ((pos+2) > length)
{
- Message message = ERR_ATTR_SYNTAX_DN_HEX_VALUE_TOO_SHORT.get(dnString);
+ LocalizableMessage message = ERR_ATTR_SYNTAX_DN_HEX_VALUE_TOO_SHORT.get(dnString);
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
message);
}
@@ -1135,7 +1135,7 @@
}
else
{
- Message message =
+ LocalizableMessage message =
ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT.get(dnString, c);
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
message);
@@ -1162,7 +1162,7 @@
}
else
{
- Message message =
+ LocalizableMessage message =
ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT.get(dnString, c);
throw new DirectoryException(
ResultCode.INVALID_DN_SYNTAX, message);
@@ -1170,7 +1170,7 @@
}
else
{
- Message message =
+ LocalizableMessage message =
ERR_ATTR_SYNTAX_DN_HEX_VALUE_TOO_SHORT.get(dnString);
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
message);
@@ -1184,7 +1184,7 @@
}
else
{
- Message message =
+ LocalizableMessage message =
ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT.get(dnString, c);
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
message);
@@ -1208,7 +1208,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.get(
+ LocalizableMessage message = ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.get(
dnString, String.valueOf(e));
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
message);
@@ -1230,7 +1230,7 @@
{
// We hit the end of the DN before the closing quote.
// That's an error.
- Message message = ERR_ATTR_SYNTAX_DN_UNMATCHED_QUOTE.get(dnString);
+ LocalizableMessage message = ERR_ATTR_SYNTAX_DN_UNMATCHED_QUOTE.get(dnString);
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
message);
}
@@ -1323,7 +1323,7 @@
// value.
if (pos >= length)
{
- Message message =
+ LocalizableMessage message =
ERR_ATTR_SYNTAX_DN_ESCAPED_HEX_VALUE_INVALID.get(dnString);
throw new DirectoryException(
ResultCode.INVALID_DN_SYNTAX, message);
@@ -1338,7 +1338,7 @@
}
else
{
- Message message =
+ LocalizableMessage message =
ERR_ATTR_SYNTAX_DN_ESCAPED_HEX_VALUE_INVALID.get(dnString);
throw new DirectoryException(
ResultCode.INVALID_DN_SYNTAX, message);
@@ -1374,7 +1374,7 @@
appendHexChars(dnString, valueString, hexChars);
if (valueString.length() == 0)
{
- Message message =
+ LocalizableMessage message =
WARN_PATTERN_DN_CONSECUTIVE_WILDCARDS_IN_VALUE.get(dnString);
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
message);
@@ -1452,7 +1452,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.get(
+ LocalizableMessage message = ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.get(
dnString, String.valueOf(e));
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
message);
--
Gitblit v1.10.0