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/util/ServerConstants.java |  152 +++++++++-----------------------------------------
 1 files changed, 27 insertions(+), 125 deletions(-)

diff --git a/opends/src/server/org/opends/server/util/ServerConstants.java b/opends/src/server/org/opends/server/util/ServerConstants.java
index 3fe29f0..0b1e518 100644
--- a/opends/src/server/org/opends/server/util/ServerConstants.java
+++ b/opends/src/server/org/opends/server/util/ServerConstants.java
@@ -790,33 +790,26 @@
 
 
   /**
+   * The English name for the basic disabled log severity used for all
+   * log severities.
+   */
+  public static final String LOG_SEVERITY_DISABLED = "DISABLED";
+
+
+
+  /**
+   * The English name for the basic all log severity used for all log
+   * severities.
+   */
+  public static final String LOG_SEVERITY_ALL = "ALL";
+
+
+
+  /**
    * The English name for the debug log category used for access control
    * debugging.
    */
-  public static final String DEBUG_CATEGORY_ACCESS_CONTROL = "ACCESS_CONTROL";
-
-
-
-  /**
-   * The English name for the debug log category used for backend debugging.
-   */
-  public static final String DEBUG_CATEGORY_BACKEND = "BACKEND";
-
-
-
-  /**
-   * The English name for the debug log category used for configuration
-   * debugging.
-   */
-  public static final String DEBUG_CATEGORY_CONFIG = "CONFIG";
-
-
-
-  /**
-   * The English name for the debug log category used for connection handling
-   * debugging.
-   */
-  public static final String DEBUG_CATEGORY_CONNECTION_HANDLING = "CONNECTION";
+  public static final String DEBUG_CATEGORY_MESSAGE = "MESSAGE";
 
 
 
@@ -828,48 +821,24 @@
 
 
   /**
-   * The English name for the debug log category used for core server debugging.
-   */
-  public static final String DEBUG_CATEGORY_CORE_SERVER = "CORE";
-
-
-
-  /**
    * The English name for the debug log category used for debugging raw data
    * read.
    */
-  public static final String DEBUG_CATEGORY_DATA_READ = "DATA_READ";
-
-
-
-  /**
-   * The English name for the debug log category used for debugging raw data
-   * written.
-   */
-  public static final String DEBUG_CATEGORY_DATA_WRITE = "DATA_WRITE";
+  public static final String DEBUG_CATEGORY_DATA = "DATA";
 
 
 
   /**
    * The English name for the debug log category used for exception debugging.
    */
-  public static final String DEBUG_CATEGORY_EXCEPTION = "EXCEPTION";
+  public static final String DEBUG_CATEGORY_THROWN = "THROWN";
 
 
 
   /**
-   * The English name for the debug log category used for extended operation
-   * debugging.
+   * The English name for the debug log category used for exception debugging.
    */
-  public static final String DEBUG_CATEGORY_EXTENDED_OPERATION = "EXTENDED_OP";
-
-
-
-  /**
-   * The English name for the debug log category used for server extensions
-   * debugging.
-   */
-  public static final String DEBUG_CATEGORY_EXTENSIONS = "EXTENSIONS";
+  public static final String DEBUG_CATEGORY_COUGHT = "COUGHT";
 
 
 
@@ -882,91 +851,24 @@
 
 
   /**
-   * The English name for the debug log category used for password policy
+   * The English name for the debug log category used for method exit
    * debugging.
    */
-  public static final String DEBUG_CATEGORY_PASSWORD_POLICY = "PWPOLICY";
-
-
-
-  /**
-   * The English name for the debug log category used for plugin debugging.
-   */
-  public static final String DEBUG_CATEGORY_PLUGIN = "PLUGIN";
+  public static final String DEBUG_CATEGORY_EXIT = "EXIT";
 
 
 
   /**
    * The English name for the debug log category used for debugging protocol
-   * elements read.
+   * elements.
    */
-  public static final String DEBUG_CATEGORY_PROTOCOL_READ = "PROTOCOL_READ";
+  public static final String DEBUG_CATEGORY_PROTOCOL = "PROTOCOL";
 
 
 
   /**
-   * The English name for the debug log category used for debugging protocol
-   * elements written.
-   */
-  public static final String DEBUG_CATEGORY_PROTOCOL_WRITE = "PROTOCOL_WRITE";
-
-
-
-  /**
-   * The English name for the debug log category used for SASL debugging.
-   */
-  public static final String DEBUG_CATEGORY_SASL_MECHANISM = "SASL";
-
-
-
-  /**
-   * The English name for the debug log category used for schema debugging.
-   */
-  public static final String DEBUG_CATEGORY_SCHEMA = "SCHEMA";
-
-
-
-  /**
-   * The English name for the debug log category used for shutdown debugging.
-   */
-  public static final String DEBUG_CATEGORY_SHUTDOWN = "SHUTDOWN";
-
-
-
-  /**
-   * The English name for the debug log category used for startup debugging.
-   */
-  public static final String DEBUG_CATEGORY_STARTUP = "STARTUP";
-
-
-
-  /**
-   * The English name for the debug log category used for synchronization
-   * debugging.
-   */
-  public static final String DEBUG_CATEGORY_SYNCHRONIZATION = "SYNCH";
-
-
-
-  /**
-   * The English name for the debug log category used for raw data read
-   * from the database.
-   */
-  public static final String DEBUG_CATEGORY_DATABASE_READ = "DATABASE_READ";
-
-
-
-  /**
-   * The English name for the debug log category used for raw data written
-   * to the database.
-   */
-  public static final String DEBUG_CATEGORY_DATABASE_WRITE = "DATABASE_WRITE";
-
-
-
-  /**
-   * The English name for the debug log category used for access to the
-   * database.
+   * The English name for the debug log category used for raw data access
+   * from the JE database.
    */
   public static final String DEBUG_CATEGORY_DATABASE_ACCESS = "DATABASE_ACCESS";
 

--
Gitblit v1.10.0