From 80c58327faaa4873369f6bb949e62792c2f708e0 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 15 Aug 2007 21:34:53 +0000
Subject: [PATCH] This commit is a step toward getting OpenDS internationalized. There are still issues to be resolved before we can declare that we are internationalized but this commit covers the bulk of changes needed at this time.
---
opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java | 56 +++++++++++++++++++++++++-------------------------------
1 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java b/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
index 9c317ff..2cb3990 100644
--- a/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
+++ b/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
@@ -25,6 +25,7 @@
* Portions Copyright 2007 Sun Microsystems, Inc.
*/
package org.opends.server.extensions;
+import org.opends.messages.Message;
@@ -59,8 +60,8 @@
import org.opends.server.types.SearchScope;
import static org.opends.server.loggers.debug.DebugLogger.*;
-import static org.opends.server.messages.ExtensionsMessages.*;
-import static org.opends.server.messages.MessageHandler.*;
+import static org.opends.messages.ExtensionMessages.*;
+
import static org.opends.server.util.StaticUtils.*;
@@ -125,10 +126,9 @@
DirectoryServer.getAttributeType(toLowerCase(attrName), false);
if (subjectAttributeType == null)
{
- int msgID = MSGID_SDTUACM_NO_SUCH_ATTR;
- String message = getMessage(msgID, String.valueOf(configEntryDN),
- attrName);
- throw new ConfigException(msgID, message);
+ Message message =
+ ERR_SDTUACM_NO_SUCH_ATTR.get(String.valueOf(configEntryDN), attrName);
+ throw new ConfigException(message);
}
}
@@ -158,10 +158,8 @@
// Make sure that a peer certificate was provided.
if ((certificateChain == null) || (certificateChain.length == 0))
{
- int msgID = MSGID_SDTUACM_NO_PEER_CERTIFICATE;
- String message = getMessage(msgID);
- throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message,
- msgID);
+ Message message = ERR_SDTUACM_NO_PEER_CERTIFICATE.get();
+ throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
}
@@ -178,11 +176,9 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = MSGID_SDTUACM_PEER_CERT_NOT_X509;
- String message =
- getMessage(msgID, String.valueOf(certificateChain[0].getType()));
- throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message,
- msgID);
+ Message message = ERR_SDTUACM_PEER_CERT_NOT_X509.get(
+ String.valueOf(certificateChain[0].getType()));
+ throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
}
@@ -221,12 +217,10 @@
}
else
{
- int msgID = MSGID_SDTUACM_MULTIPLE_MATCHING_ENTRIES;
- String message = getMessage(msgID, peerName,
- String.valueOf(userEntry.getDN()),
- String.valueOf(entry.getDN()));
- throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message,
- msgID);
+ Message message = ERR_SDTUACM_MULTIPLE_MATCHING_ENTRIES.
+ get(peerName, String.valueOf(userEntry.getDN()),
+ String.valueOf(entry.getDN()));
+ throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
}
}
}
@@ -244,7 +238,7 @@
*/
@Override()
public boolean isConfigurationAcceptable(CertificateMapperCfg configuration,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
SubjectDNToUserAttributeCertificateMapperCfg config =
(SubjectDNToUserAttributeCertificateMapperCfg) configuration;
@@ -259,7 +253,7 @@
public boolean isConfigurationChangeAcceptable(
SubjectDNToUserAttributeCertificateMapperCfg
configuration,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
boolean configAcceptable = true;
DN cfgEntryDN = configuration.dn();
@@ -271,9 +265,9 @@
false);
if (newSubjectType == null)
{
- unacceptableReasons.add(getMessage(MSGID_SDTUACM_NO_SUCH_ATTR,
- String.valueOf(cfgEntryDN),
- attrName));
+ unacceptableReasons.add(ERR_SDTUACM_NO_SUCH_ATTR.get(
+ String.valueOf(cfgEntryDN),
+ attrName));
configAcceptable = false;
}
@@ -290,9 +284,9 @@
SubjectDNToUserAttributeCertificateMapperCfg
configuration)
{
- ResultCode resultCode = ResultCode.SUCCESS;
- boolean adminActionRequired = false;
- ArrayList<String> messages = new ArrayList<String>();
+ ResultCode resultCode = ResultCode.SUCCESS;
+ boolean adminActionRequired = false;
+ ArrayList<Message> messages = new ArrayList<Message>();
// Make sure that the fingerprint attribute is defined in the server schema.
@@ -307,8 +301,8 @@
resultCode = ResultCode.NO_SUCH_ATTRIBUTE;
}
- messages.add(getMessage(MSGID_SDTUACM_NO_SUCH_ATTR,
- String.valueOf(configEntryDN), attrName));
+ messages.add(ERR_SDTUACM_NO_SUCH_ATTR.get(
+ String.valueOf(configEntryDN), attrName));
}
--
Gitblit v1.10.0