Remove the dependence on AspectJ for all non method-entry and method-exit r...

boli

23.30.2007 b0a7e3cf4a65ea95c79cf002596428d0aed2e26e

 opends/src/server/org/opends/server/backends/SchemaBackend.java

@@ -116,8 +116,8 @@

import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCaught;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.server.messages.BackendMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.ServerConstants.*;
@@ -138,6 +138,12 @@
     implements ConfigurationChangeListener<SchemaBackendCfg>, AlertGenerator
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();


  /**
   * The fully-qualified name of this class.
   */
  private static final String CLASS_NAME =
@@ -389,7 +395,7 @@
      {
        if (debugEnabled())
        {
          debugCaught(DebugLogLevel.ERROR, e);
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }

        int msgID = MSGID_BACKEND_CANNOT_REGISTER_BASEDN;
@@ -500,7 +506,7 @@
    {
      if (debugEnabled())
      {
        debugCaught(DebugLogLevel.ERROR, e);
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }

      int msgID = MSGID_SCHEMA_ERROR_DETERMINING_SCHEMA_CHANGES;
@@ -541,7 +547,7 @@
      {
        if (debugEnabled())
        {
          debugCaught(DebugLogLevel.ERROR, e);
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
      }
    }
@@ -1103,7 +1109,7 @@
              {
                if (debugEnabled())
                {
                  debugCaught(DebugLogLevel.ERROR, de);
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_ATTRTYPE;
@@ -1131,7 +1137,7 @@
              {
                if (debugEnabled())
                {
                  debugCaught(DebugLogLevel.ERROR, de);
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_OBJECTCLASS;
@@ -1159,7 +1165,7 @@
              {
                if (debugEnabled())
                {
                  debugCaught(DebugLogLevel.ERROR, de);
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_NAME_FORM;
@@ -1187,7 +1193,7 @@
              {
                if (debugEnabled())
                {
                  debugCaught(DebugLogLevel.ERROR, de);
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_DCR;
@@ -1215,7 +1221,7 @@
              {
                if (debugEnabled())
                {
                  debugCaught(DebugLogLevel.ERROR, de);
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_DSR;
@@ -1243,7 +1249,7 @@
              {
                if (debugEnabled())
                {
                  debugCaught(DebugLogLevel.ERROR, de);
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_MR_USE;
@@ -1292,7 +1298,7 @@
              {
                if (debugEnabled())
                {
                  debugCaught(DebugLogLevel.ERROR, de);
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_ATTRTYPE;
@@ -1321,7 +1327,7 @@
              {
                if (debugEnabled())
                {
                  debugCaught(DebugLogLevel.ERROR, de);
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_OBJECTCLASS;
@@ -1349,7 +1355,7 @@
              {
                if (debugEnabled())
                {
                  debugCaught(DebugLogLevel.ERROR, de);
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_NAME_FORM;
@@ -1377,7 +1383,7 @@
              {
                if (debugEnabled())
                {
                  debugCaught(DebugLogLevel.ERROR, de);
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_DCR;
@@ -1406,7 +1412,7 @@
              {
                if (debugEnabled())
                {
                  debugCaught(DebugLogLevel.ERROR, de);
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_DSR;
@@ -1435,7 +1441,7 @@
              {
                if (debugEnabled())
                {
                  debugCaught(DebugLogLevel.ERROR, de);
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_MR_USE;
@@ -1499,7 +1505,7 @@
    {
      if (debugEnabled())
      {
        debugCaught(DebugLogLevel.ERROR, de);
        TRACER.debugCaught(DebugLogLevel.ERROR, de);
      }

      throw de;
@@ -1508,7 +1514,7 @@
    {
      if (debugEnabled())
      {
        debugCaught(DebugLogLevel.ERROR, e);
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_SCHEMA_MODIFY_CANNOT_WRITE_NEW_SCHEMA;
@@ -1782,7 +1788,7 @@
        {
          if (debugEnabled())
          {
            debugCaught(DebugLogLevel.ERROR, de);
            TRACER.debugCaught(DebugLogLevel.ERROR, de);
          }

          int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_ATTRTYPE;
@@ -2132,7 +2138,7 @@
        {
          if (debugEnabled())
          {
            debugCaught(DebugLogLevel.ERROR, de);
            TRACER.debugCaught(DebugLogLevel.ERROR, de);
          }

          int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_OBJECTCLASS;
@@ -2462,7 +2468,7 @@
        {
          if (debugEnabled())
          {
            debugCaught(DebugLogLevel.ERROR, de);
            TRACER.debugCaught(DebugLogLevel.ERROR, de);
          }

          int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_NAME_FORM;
@@ -3035,7 +3041,7 @@
        {
          if (debugEnabled())
          {
            debugCaught(DebugLogLevel.ERROR, de);
            TRACER.debugCaught(DebugLogLevel.ERROR, de);
          }

          int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_DSR;
@@ -3749,7 +3755,7 @@
    {
      if (debugEnabled())
      {
        debugCaught(DebugLogLevel.ERROR, e);
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }

      boolean allCleaned = true;
@@ -3769,7 +3775,7 @@
        {
          if (debugEnabled())
          {
            debugCaught(DebugLogLevel.ERROR, e2);
            TRACER.debugCaught(DebugLogLevel.ERROR, e2);
          }

          allCleaned = false;
@@ -3813,7 +3819,7 @@
    {
      if (debugEnabled())
      {
        debugCaught(DebugLogLevel.ERROR, e);
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }

      for (File f : installedFileList)
@@ -3829,7 +3835,7 @@
        {
          if (debugEnabled())
          {
            debugCaught(DebugLogLevel.ERROR, e2);
            TRACER.debugCaught(DebugLogLevel.ERROR, e2);
          }
        }
      }
@@ -3854,7 +3860,7 @@
        {
          if (debugEnabled())
          {
            debugCaught(DebugLogLevel.ERROR, e2);
            TRACER.debugCaught(DebugLogLevel.ERROR, e2);
          }

          allRestored = false;
@@ -3899,7 +3905,7 @@
      {
        if (debugEnabled())
        {
          debugCaught(DebugLogLevel.ERROR, e);
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
      }
    }
@@ -3917,7 +3923,7 @@
      {
        if (debugEnabled())
        {
          debugCaught(DebugLogLevel.ERROR, e);
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
      }
    }
@@ -3963,7 +3969,7 @@
        {
          if (debugEnabled())
          {
            debugCaught(DebugLogLevel.ERROR, e);
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
        }
      }
@@ -4004,7 +4010,7 @@
      {
        if (debugEnabled())
        {
          debugCaught(DebugLogLevel.ERROR, e);
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
      }
    }
@@ -4159,7 +4165,7 @@
    {
      if (debugEnabled())
      {
        debugCaught(DebugLogLevel.ERROR, e);
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_SCHEMA_UNABLE_TO_CREATE_LDIF_WRITER;
@@ -4179,7 +4185,7 @@
    {
      if (debugEnabled())
      {
        debugCaught(DebugLogLevel.ERROR, e);
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_SCHEMA_UNABLE_TO_EXPORT_BASE;
@@ -4197,7 +4203,7 @@
      {
        if (debugEnabled())
        {
          debugCaught(DebugLogLevel.ERROR, e);
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
      }
    }
@@ -4326,7 +4332,7 @@
        {
          if (debugEnabled())
          {
            debugCaught(DebugLogLevel.ERROR, e);
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }

          int    msgID   = MSGID_SCHEMA_BACKUP_CANNOT_GET_MAC;
@@ -4350,7 +4356,7 @@
        {
          if (debugEnabled())
          {
            debugCaught(DebugLogLevel.ERROR, e);
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }

          int    msgID   = MSGID_SCHEMA_BACKUP_CANNOT_GET_DIGEST;
@@ -4403,7 +4409,7 @@
    {
      if (debugEnabled())
      {
        debugCaught(DebugLogLevel.ERROR, e);
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_SCHEMA_BACKUP_CANNOT_CREATE_ARCHIVE_FILE;
@@ -4431,7 +4437,7 @@
      {
        if (debugEnabled())
        {
          debugCaught(DebugLogLevel.ERROR, e);
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }

        int    msgID   = MSGID_SCHEMA_BACKUP_CANNOT_GET_CIPHER;
@@ -4476,7 +4482,7 @@
    {
      if (debugEnabled())
      {
        debugCaught(DebugLogLevel.ERROR, e);
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }

      msgID   = MSGID_SCHEMA_BACKUP_CANNOT_LIST_SCHEMA_FILES;
@@ -4551,7 +4557,7 @@
      {
        if (debugEnabled())
        {
          debugCaught(DebugLogLevel.ERROR, e);
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }

        try
@@ -4582,7 +4588,7 @@
    {
      if (debugEnabled())
      {
        debugCaught(DebugLogLevel.ERROR, e);
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }

      msgID   = MSGID_SCHEMA_BACKUP_CANNOT_CLOSE_ZIP_STREAM;
@@ -4626,7 +4632,7 @@
    {
      if (debugEnabled())
      {
        debugCaught(DebugLogLevel.ERROR, e);
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }

      msgID = MSGID_SCHEMA_BACKUP_CANNOT_UPDATE_BACKUP_DESCRIPTOR;
@@ -5220,7 +5226,7 @@
    {
      if (debugEnabled())
      {
        debugCaught(DebugLogLevel.ERROR, e);
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }

      int msgID = MSGID_SCHEMA_CANNOT_DETERMINE_BASE_DN;
@@ -5268,7 +5274,7 @@
    {
      if (debugEnabled())
      {
        debugCaught(DebugLogLevel.ERROR, e);
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }

      int msgID = MSGID_CONFIG_BACKEND_ERROR_INTERACTING_WITH_BACKEND_ENTRY;
@@ -5310,7 +5316,7 @@
        {
          if (debugEnabled())
          {
            debugCaught(DebugLogLevel.ERROR, e);
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }

          int msgID = MSGID_SCHEMA_CANNOT_DEREGISTER_BASE_DN;
@@ -5333,7 +5339,7 @@
        {
          if (debugEnabled())
          {
            debugCaught(DebugLogLevel.ERROR, e);
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }

          int msgID = MSGID_SCHEMA_CANNOT_REGISTER_BASE_DN;