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/StaticGroup.java |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java b/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
index 722d99b..12828ae 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
@@ -34,7 +34,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
 import org.opends.server.admin.std.server.GroupImplementationCfg;
 import org.opends.server.admin.std.server.StaticGroupImplementationCfg;
 import org.opends.server.api.Group;
@@ -186,14 +186,14 @@
     {
       if (groupEntry.hasObjectClass(groupOfNamesClass))
       {
-        Message message = ERR_STATICGROUP_INVALID_OC_COMBINATION.
+        LocalizableMessage message = ERR_STATICGROUP_INVALID_OC_COMBINATION.
             get(String.valueOf(groupEntry.getName()), OC_GROUP_OF_ENTRIES,
                 OC_GROUP_OF_NAMES);
         throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
       }
       else if (groupEntry.hasObjectClass(groupOfUniqueNamesClass))
       {
-        Message message = ERR_STATICGROUP_INVALID_OC_COMBINATION.
+        LocalizableMessage message = ERR_STATICGROUP_INVALID_OC_COMBINATION.
             get(String.valueOf(groupEntry.getName()), OC_GROUP_OF_ENTRIES,
                 OC_GROUP_OF_UNIQUE_NAMES);
         throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
@@ -206,7 +206,7 @@
     {
       if (groupEntry.hasObjectClass(groupOfUniqueNamesClass))
       {
-        Message message = ERR_STATICGROUP_INVALID_OC_COMBINATION.
+        LocalizableMessage message = ERR_STATICGROUP_INVALID_OC_COMBINATION.
             get(String.valueOf(groupEntry.getName()), OC_GROUP_OF_NAMES,
                 OC_GROUP_OF_UNIQUE_NAMES);
         throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
@@ -222,7 +222,7 @@
     }
     else
     {
-      Message message = ERR_STATICGROUP_NO_VALID_OC.
+      LocalizableMessage message = ERR_STATICGROUP_NO_VALID_OC.
           get(String.valueOf(groupEntry.getName()), OC_GROUP_OF_NAMES,
               OC_GROUP_OF_UNIQUE_NAMES);
       throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
@@ -258,7 +258,7 @@
               TRACER.debugCaught(DebugLogLevel.ERROR, de);
             }
 
-            Message message = ERR_STATICGROUP_CANNOT_DECODE_MEMBER_VALUE_AS_DN.
+            LocalizableMessage message = ERR_STATICGROUP_CANNOT_DECODE_MEMBER_VALUE_AS_DN.
                 get(v.getValue().toString(),
                     someMemberAttributeType.getNameOrOID(),
                     String.valueOf(groupEntry.getName()),
@@ -410,7 +410,7 @@
     {
       if (nestedGroups.contains(nestedGroupDN))
       {
-        Message msg = ERR_STATICGROUP_ADD_NESTED_GROUP_ALREADY_EXISTS.get(
+        LocalizableMessage msg = ERR_STATICGROUP_ADD_NESTED_GROUP_ALREADY_EXISTS.get(
                 String.valueOf(nestedGroupDN),
                 String.valueOf(groupEntryDN));
         throw new DirectoryException(
@@ -436,7 +436,7 @@
       modifyOperation.run();
       if (modifyOperation.getResultCode() != ResultCode.SUCCESS)
       {
-        Message msg = ERR_STATICGROUP_ADD_MEMBER_UPDATE_FAILED.get(
+        LocalizableMessage msg = ERR_STATICGROUP_ADD_MEMBER_UPDATE_FAILED.get(
                 String.valueOf(nestedGroupDN),
                 String.valueOf(groupEntryDN),
                 modifyOperation.getErrorMessage().toString());
@@ -681,7 +681,7 @@
 
       if (memberDNs.contains(userDNString))
       {
-        Message message = ERR_STATICGROUP_ADD_MEMBER_ALREADY_EXISTS.get(
+        LocalizableMessage message = ERR_STATICGROUP_ADD_MEMBER_ALREADY_EXISTS.get(
             String.valueOf(userDN), String.valueOf(groupEntryDN));
         throw new DirectoryException(ResultCode.ATTRIBUTE_OR_VALUE_EXISTS,
                                      message);
@@ -705,7 +705,7 @@
       modifyOperation.run();
       if (modifyOperation.getResultCode() != ResultCode.SUCCESS)
       {
-        Message message = ERR_STATICGROUP_ADD_MEMBER_UPDATE_FAILED.
+        LocalizableMessage message = ERR_STATICGROUP_ADD_MEMBER_UPDATE_FAILED.
             get(String.valueOf(userDN), String.valueOf(groupEntryDN),
                 modifyOperation.getErrorMessage().toString());
         throw new DirectoryException(modifyOperation.getResultCode(), message);
@@ -736,7 +736,7 @@
     {
       if (! memberDNs.contains(userDNString))
       {
-        Message message = ERR_STATICGROUP_REMOVE_MEMBER_NO_SUCH_MEMBER.get(
+        LocalizableMessage message = ERR_STATICGROUP_REMOVE_MEMBER_NO_SUCH_MEMBER.get(
             String.valueOf(userDN), String.valueOf(groupEntryDN));
         throw new DirectoryException(ResultCode.NO_SUCH_ATTRIBUTE, message);
       }
@@ -760,7 +760,7 @@
       modifyOperation.run();
       if (modifyOperation.getResultCode() != ResultCode.SUCCESS)
       {
-        Message message = ERR_STATICGROUP_REMOVE_MEMBER_UPDATE_FAILED.
+        LocalizableMessage message = ERR_STATICGROUP_REMOVE_MEMBER_UPDATE_FAILED.
             get(String.valueOf(userDN), String.valueOf(groupEntryDN),
                 modifyOperation.getErrorMessage().toString());
         throw new DirectoryException(modifyOperation.getResultCode(), message);

--
Gitblit v1.10.0