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/StaticGroup.java | 39 +++++++--------------------------------
1 files changed, 7 insertions(+), 32 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/StaticGroup.java b/opends/src/server/org/opends/server/extensions/StaticGroup.java
index 1f7a590..95907a0 100644
--- a/opends/src/server/org/opends/server/extensions/StaticGroup.java
+++ b/opends/src/server/org/opends/server/extensions/StaticGroup.java
@@ -57,7 +57,9 @@
import org.opends.server.types.SearchFilter;
import org.opends.server.types.SearchScope;
-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.loggers.Error.*;
import static org.opends.server.messages.ExtensionsMessages.*;
import static org.opends.server.messages.MessageHandler.*;
@@ -77,11 +79,6 @@
public class StaticGroup
extends Group
{
- /**
- * The fully-qualified name of this class for debugging purposes.
- */
- private static final String CLASS_NAME =
- "org.opends.server.extensions.StaticGroup";
@@ -104,7 +101,6 @@
{
super();
- assert debugConstructor(CLASS_NAME);
// No initialization is required here.
}
@@ -126,9 +122,6 @@
{
super();
- assert debugConstructor(CLASS_NAME, String.valueOf(groupEntryDN),
- String.valueOf(memberAttributeType),
- String.valueOf(memberDNs));
ensureNotNull(groupEntryDN, memberAttributeType, memberDNs);
@@ -146,8 +139,6 @@
public void initializeGroupImplementation(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
- assert debugEnter(CLASS_NAME, "initializeGroupImplementation",
- String.valueOf(configEntry));
// No additional initialization is required.
}
@@ -162,7 +153,6 @@
public StaticGroup newInstance(Entry groupEntry)
throws DirectoryException
{
- assert debugEnter(CLASS_NAME, "newInstance", String.valueOf(groupEntry));
ensureNotNull(groupEntry);
@@ -219,7 +209,10 @@
}
catch (DirectoryException de)
{
- assert debugException(CLASS_NAME, "newInstance", de);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, de);
+ }
int msgID = MSGID_STATICGROUP_CANNOT_DECODE_MEMBER_VALUE_AS_DN;
String message =
@@ -247,7 +240,6 @@
public SearchFilter getGroupDefinitionFilter()
throws DirectoryException
{
- assert debugEnter(CLASS_NAME, "getGroupDefinitionFilter");
// FIXME -- This needs to exclude enhanced groups once we have support for
// them.
@@ -264,7 +256,6 @@
@Override()
public boolean isGroupDefinition(Entry entry)
{
- assert debugEnter(CLASS_NAME, "isGroupDefinition", String.valueOf(entry));
ensureNotNull(entry);
// FIXME -- This needs to exclude enhanced groups once we have support for
@@ -300,7 +291,6 @@
@Override()
public DN getGroupDN()
{
- assert debugEnter(CLASS_NAME, "getGroupDN");
return groupEntryDN;
}
@@ -313,7 +303,6 @@
@Override()
public boolean supportsNestedGroups()
{
- assert debugEnter(CLASS_NAME, "supportsNestedGroups");
// FIXME -- We should add support for nested groups.
return false;
@@ -327,7 +316,6 @@
@Override()
public List<DN> getNestedGroupDNs()
{
- assert debugEnter(CLASS_NAME, "getNestedGroupDNs");
// FIXME -- We should add support for nested groups.
return Collections.<DN>emptyList();
@@ -342,8 +330,6 @@
public void addNestedGroup(DN nestedGroupDN)
throws UnsupportedOperationException, DirectoryException
{
- assert debugEnter(CLASS_NAME, "addNestedGroup",
- String.valueOf(nestedGroupDN));
// FIXME -- We should add support for nested groups.
throw new UnsupportedOperationException();
@@ -358,8 +344,6 @@
public void removeNestedGroup(DN nestedGroupDN)
throws UnsupportedOperationException, DirectoryException
{
- assert debugEnter(CLASS_NAME, "removeNestedGroup",
- String.valueOf(nestedGroupDN));
// FIXME -- We should add support for nested groups.
throw new UnsupportedOperationException();
@@ -374,7 +358,6 @@
public boolean isMember(DN userDN)
throws DirectoryException
{
- assert debugEnter(CLASS_NAME, "isMember", String.valueOf(userDN));
return memberDNs.contains(userDN);
}
@@ -388,7 +371,6 @@
public boolean isMember(Entry userEntry)
throws DirectoryException
{
- assert debugEnter(CLASS_NAME, "isMember", String.valueOf(userEntry));
return memberDNs.contains(userEntry.getDN());
}
@@ -402,7 +384,6 @@
public MemberList getMembers()
throws DirectoryException
{
- assert debugEnter(CLASS_NAME, "getMembers");
return new SimpleStaticGroupMemberList(groupEntryDN, memberDNs);
}
@@ -417,8 +398,6 @@
SearchFilter filter)
throws DirectoryException
{
- assert debugEnter(CLASS_NAME, "getMembers", String.valueOf(baseDN),
- String.valueOf(scope), String.valueOf(filter));
if ((baseDN == null) && (filter == null))
{
@@ -439,7 +418,6 @@
@Override()
public boolean mayAlterMemberList()
{
- assert debugEnter(CLASS_NAME, "mayAlterMemberList");
return true;
}
@@ -453,7 +431,6 @@
public void addMember(Entry userEntry)
throws UnsupportedOperationException, DirectoryException
{
- assert debugEnter(CLASS_NAME, "addMember", String.valueOf(userEntry));
ensureNotNull(userEntry);
@@ -519,7 +496,6 @@
public void removeMember(DN userDN)
throws UnsupportedOperationException, DirectoryException
{
- assert debugEnter(CLASS_NAME, "removeMember", String.valueOf(userDN));
ensureNotNull(userDN);
@@ -582,7 +558,6 @@
@Override()
public void toString(StringBuilder buffer)
{
- assert debugEnter(CLASS_NAME, "toString", "java.lang.StringBuilder");
buffer.append("StaticGroup(");
buffer.append(groupEntryDN);
--
Gitblit v1.10.0