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/ads/org/opends/admin/ads/ADSContext.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj3-server-dev/src/ads/org/opends/admin/ads/ADSContext.java b/opendj3-server-dev/src/ads/org/opends/admin/ads/ADSContext.java
index ef312ff..eb4adeb 100644
--- a/opendj3-server-dev/src/ads/org/opends/admin/ads/ADSContext.java
+++ b/opendj3-server-dev/src/ads/org/opends/admin/ads/ADSContext.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2013 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.admin.ads;
@@ -63,7 +63,7 @@
import javax.naming.ldap.LdapContext;
import org.opends.admin.ads.util.ConnectionUtils;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.quicksetup.Constants;
import org.opends.quicksetup.util.Utils;
import org.opends.server.schema.SchemaConstants;
@@ -2611,7 +2611,7 @@
}
catch (ADSContextException adce)
{
- Message msg = ERR_ADS_MERGE.get(
+ LocalizableMessage msg = ERR_ADS_MERGE.get(
ConnectionUtils.getHostPort(getDirContext()),
ConnectionUtils.getHostPort(adsCtx.getDirContext()),
adce.getMessageObject());
@@ -2642,7 +2642,7 @@
}
if (!notDefinedAdmins.isEmpty())
{
- Message msg = ERR_ADS_ADMINISTRATOR_MERGE.get(
+ LocalizableMessage msg = ERR_ADS_ADMINISTRATOR_MERGE.get(
ConnectionUtils.getHostPort(adsCtx.getDirContext()),
ConnectionUtils.getHostPort(getDirContext()),
Utils.getStringFromCollection(notDefinedAdmins,
--
Gitblit v1.10.0