From 4783adc14c2d6b96260052d3b634eafa500c6ddf 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. 

---
 opendj-sdk/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java |   39 ++++++++++++---------------------------
 1 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java
index 3a96055..f544902 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
@@ -49,8 +49,10 @@
 import org.opends.server.types.ErrorLogSeverity;
 import org.opends.server.types.ResultCode;
 
-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 static org.opends.server.loggers.Error.*;
+import org.opends.server.types.DebugLogLevel;
 import static org.opends.server.messages.MessageHandler.*;
 import static org.opends.server.messages.SchemaMessages.*;
 import static org.opends.server.schema.SchemaConstants.*;
@@ -69,11 +71,6 @@
 public class UTCTimeSyntax
        extends AttributeSyntax
 {
-  /**
-   * The fully-qualified name of this class for debugging purposes.
-   */
-  private static final String CLASS_NAME =
-       "org.opends.server.schema.UTCTimeSyntax";
 
 
 
@@ -129,7 +126,6 @@
   {
     super();
 
-    assert debugConstructor(CLASS_NAME);
   }
 
 
@@ -147,8 +143,6 @@
   public void initializeSyntax(ConfigEntry configEntry)
          throws ConfigException
   {
-    assert debugEnter(CLASS_NAME, "initializeSyntax",
-                      String.valueOf(configEntry));
 
     defaultEqualityMatchingRule =
          DirectoryServer.getEqualityMatchingRule(EMR_GENERALIZED_TIME_OID);
@@ -187,7 +181,6 @@
    */
   public String getSyntaxName()
   {
-    assert debugEnter(CLASS_NAME, "getSyntaxName");
 
     return SYNTAX_UTC_TIME_NAME;
   }
@@ -201,7 +194,6 @@
    */
   public String getOID()
   {
-    assert debugEnter(CLASS_NAME, "getOID");
 
     return SYNTAX_UTC_TIME_OID;
   }
@@ -215,7 +207,6 @@
    */
   public String getDescription()
   {
-    assert debugEnter(CLASS_NAME, "getDescription");
 
     return SYNTAX_UTC_TIME_DESCRIPTION;
   }
@@ -232,7 +223,6 @@
    */
   public EqualityMatchingRule getEqualityMatchingRule()
   {
-    assert debugEnter(CLASS_NAME, "getEqualityMatchingRule");
 
     return defaultEqualityMatchingRule;
   }
@@ -249,7 +239,6 @@
    */
   public OrderingMatchingRule getOrderingMatchingRule()
   {
-    assert debugEnter(CLASS_NAME, "getOrderingMatchingRule");
 
     return defaultOrderingMatchingRule;
   }
@@ -266,7 +255,6 @@
    */
   public SubstringMatchingRule getSubstringMatchingRule()
   {
-    assert debugEnter(CLASS_NAME, "getSubstringMatchingRule");
 
     return defaultSubstringMatchingRule;
   }
@@ -283,7 +271,6 @@
    */
   public ApproximateMatchingRule getApproximateMatchingRule()
   {
-    assert debugEnter(CLASS_NAME, "getApproximateMatchingRule");
 
     // Approximate matching will not be allowed by default.
     return null;
@@ -306,8 +293,6 @@
   public boolean valueIsAcceptable(ByteString value,
                                    StringBuilder invalidReason)
   {
-    assert debugEnter(CLASS_NAME, "valueIsAcceptable", String.valueOf(value),
-                      "java.lang.StringBuilder");
 
 
     // Get the value as a string and verify that it is at least long enough for
@@ -770,8 +755,6 @@
   private boolean hasValidOffset(String value, int startPos,
                                  StringBuilder invalidReason)
   {
-    assert debugEnter(CLASS_NAME, "hasValidOffset", String.valueOf(value),
-                      String.valueOf(startPos), "java.lang.StringBuilder");
 
 
     int offsetLength = value.length() - startPos;
@@ -899,8 +882,6 @@
    */
   public static AttributeValue createUTCTimeValue(Date d)
   {
-    assert debugEnter(CLASS_NAME, "createUTCTimeValue",
-                      String.valueOf(d));
 
     String valueString;
 
@@ -912,7 +893,10 @@
     }
     catch (Exception e)
     {
-      assert debugException(CLASS_NAME, "createUTCTimevalue", e);
+      if (debugEnabled())
+      {
+        debugCought(DebugLogLevel.ERROR, e);
+      }
 
       // This should never happen.
       valueString = null;
@@ -944,8 +928,6 @@
   public static Date decodeUTCTimeValue(ByteString normalizedValue)
          throws DirectoryException
   {
-    assert debugEnter(CLASS_NAME, "decodeUTCTimeValue",
-                      String.valueOf(normalizedValue));
 
     String valueString = normalizedValue.stringValue();
     try
@@ -968,7 +950,10 @@
     }
     catch (Exception e)
     {
-      assert debugException(CLASS_NAME, "decodeUTCTimeValue", e);
+      if (debugEnabled())
+      {
+        debugCought(DebugLogLevel.ERROR, e);
+      }
 
       int    msgID   = MSGID_ATTR_SYNTAX_UTC_TIME_CANNOT_PARSE;
       String message = getMessage(msgID, valueString, String.valueOf(e));

--
Gitblit v1.10.0