From 455897cc245b67d929f409a93cfa7106e835cc1f Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Thu, 01 Mar 2007 03:27:06 +0000
Subject: [PATCH] This removes old debug logging framework method calls that are going to be automatically instrumented by AspectJ. Non instrumented debug method calls are updated to use the new debug framework methods. However, the new debug logging framework is not yet active as the Aspects are not weaved in. After this revision, debug logging will be disabled in the server until the new AOP framework is complete.
---
opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java | 57 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java b/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
index 5e0f536..f9aebd4 100644
--- a/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
+++ b/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
@@ -58,7 +58,9 @@
import org.opends.server.types.SearchScope;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.Debug.*;
+import static org.opends.server.loggers.debug.DebugLogger.debugCought;
+import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
+import org.opends.server.types.DebugLogLevel;
import static org.opends.server.messages.ExtensionsMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.StaticUtils.*;
@@ -75,11 +77,6 @@
extends CertificateMapper
implements ConfigurableComponent
{
- /**
- * The fully-qualified name of this class for debugging purposes.
- */
- private static final String CLASS_NAME =
- "org.opends.server.extensions.SubjectDNToUserAttributeCertificateMapper";
@@ -103,7 +100,6 @@
{
super();
- assert debugConstructor(CLASS_NAME);
}
@@ -114,8 +110,6 @@
public void initializeCertificateMapper(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
- assert debugEnter(CLASS_NAME, "initializeCertificateMapper",
- String.valueOf(configEntry));
this.configEntryDN = configEntry.getDN();
@@ -156,7 +150,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "initializeCertificateMapper", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
msgID = MSGID_SDTUACM_CANNOT_GET_SUBJECT_ATTR;
String message = getMessage(msgID, String.valueOf(configEntryDN),
@@ -184,7 +181,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "initializeCertificateMapper", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
msgID = MSGID_SDTUACM_CANNOT_GET_BASE_DN;
String message = getMessage(msgID, String.valueOf(configEntryDN),
@@ -202,7 +202,6 @@
*/
public void finalizeCertificateMapper()
{
- assert debugEnter(CLASS_NAME, "finalizeCertificateMapper");
DirectoryServer.deregisterConfigurableComponent(this);
}
@@ -215,8 +214,6 @@
public Entry mapCertificateToUser(Certificate[] certificateChain)
throws DirectoryException
{
- assert debugEnter(CLASS_NAME, "mapCertificateToUser",
- String.valueOf(certificateChain));
// Make sure that a peer certificate was provided.
@@ -237,7 +234,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "mapCertificateToUser", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
int msgID = MSGID_SDTUACM_PEER_CERT_NOT_X509;
String message =
@@ -310,7 +310,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
- assert debugEnter(CLASS_NAME, "getConfigurableComponentEntryDN");
return configEntryDN;
}
@@ -326,7 +325,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
- assert debugEnter(CLASS_NAME, "getConfigurationAttributes");
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
@@ -374,8 +372,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
- assert debugEnter(CLASS_NAME, "hasAcceptableConfiguration",
- String.valueOf(configEntry), "java.util.List<String>");
DN configEntryDN = configEntry.getDN();
boolean configAcceptable = true;
@@ -416,7 +412,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "hasAcceptableConfiguration", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
msgID = MSGID_SDTUACM_CANNOT_GET_SUBJECT_ATTR;
String message = getMessage(msgID, String.valueOf(configEntryDN),
@@ -438,7 +437,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "hasAcceptableConfiguration", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
msgID = MSGID_SDTUACM_CANNOT_GET_BASE_DN;
String message = getMessage(msgID, String.valueOf(configEntryDN),
@@ -476,9 +478,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
- assert debugEnter(CLASS_NAME, "applyNewConfiguration",
- String.valueOf(configEntry),
- String.valueOf(detailedResults));
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
@@ -527,7 +526,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "applyNewConfiguration", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
if (resultCode == ResultCode.SUCCESS)
{
@@ -559,7 +561,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "applyNewConfiguration", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
if (resultCode == ResultCode.SUCCESS)
{
--
Gitblit v1.10.0