From 37057adc0f58b9d747ba3834180ce06d582e3f14 Mon Sep 17 00:00:00 2001
From: abobrov <abobrov@localhost>
Date: Sat, 09 Jun 2007 15:58:05 +0000
Subject: [PATCH] - [Issue 1768] Invalid fallback behavior for FS Entry Cache - [Issue 1767] Checksum error message on startup - Set eol-style to native

---
 opends/src/server/org/opends/server/messages/ExtensionsMessages.java |   31 ++++++++-----------------------
 1 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/opends/src/server/org/opends/server/messages/ExtensionsMessages.java b/opends/src/server/org/opends/server/messages/ExtensionsMessages.java
index 31ce6dd..9ad8cf2 100644
--- a/opends/src/server/org/opends/server/messages/ExtensionsMessages.java
+++ b/opends/src/server/org/opends/server/messages/ExtensionsMessages.java
@@ -5142,29 +5142,19 @@
       CATEGORY_MASK_EXTENSIONS | SEVERITY_MASK_SEVERE_ERROR | 492;
 
   /**
-   * The message ID for the message that will be used if entry cache home
-   * either cannot be created or exist but already in use by another instance
-   * This takes four arguments, which are the DN of the configuration entry,
-   * the cache-home attribute value of the configuration entry, default cache
-   * home value and a string representation of the exception that was caught.
-   */
-  public static final int MSGID_FSCACHE_INVALID_HOME =
-       CATEGORY_MASK_EXTENSIONS | SEVERITY_MASK_SEVERE_ERROR | 493;
-
-  /**
    * The message ID for the message that will be used if a fatal error occurs
    * while trying to setup the cache db environment home.  This takes one
    * argument which is a string representation of the exception that was caught.
    */
   public static final int MSGID_FSCACHE_HOMELESS =
-       CATEGORY_MASK_EXTENSIONS | SEVERITY_MASK_FATAL_ERROR | 494;
+       CATEGORY_MASK_EXTENSIONS | SEVERITY_MASK_FATAL_ERROR | 493;
 
   /**
    * The message ID of an error indicating that the file permissions for the
    * file system entry cache database directory were not set.
    */
   public static final int MSGID_FSCACHE_SET_PERMISSIONS_FAILED =
-       CATEGORY_MASK_EXTENSIONS | SEVERITY_MASK_SEVERE_WARNING | 495;
+       CATEGORY_MASK_EXTENSIONS | SEVERITY_MASK_SEVERE_WARNING | 494;
 
   /**
    * The message ID for the message that will be used if recorded offline state
@@ -5172,7 +5162,7 @@
    * argument which is the backend ID.
    */
   public static final int MSGID_FSCACHE_OFFLINE_STATE_FAIL =
-       CATEGORY_MASK_EXTENSIONS | SEVERITY_MASK_SEVERE_WARNING | 496;
+       CATEGORY_MASK_EXTENSIONS | SEVERITY_MASK_SEVERE_WARNING | 495;
 
   /**
    * The message ID for the message that will be used to report the cache
@@ -5181,7 +5171,7 @@
    * restored.
    */
   public static final int MSGID_FSCACHE_RESTORE_PROGRESS_REPORT =
-       CATEGORY_MASK_EXTENSIONS | SEVERITY_MASK_INFORMATIONAL | 497;
+       CATEGORY_MASK_EXTENSIONS | SEVERITY_MASK_INFORMATIONAL | 496;
 
   /**
    * The message ID for the message that will be used to report the cache
@@ -5190,7 +5180,7 @@
    * preserved.
    */
   public static final int MSGID_FSCACHE_SAVE_PROGRESS_REPORT =
-       CATEGORY_MASK_EXTENSIONS | SEVERITY_MASK_INFORMATIONAL | 498;
+       CATEGORY_MASK_EXTENSIONS | SEVERITY_MASK_INFORMATIONAL | 497;
 
   /**
    * The message ID for the message that will be used if an error occurs while
@@ -5198,7 +5188,7 @@
    * cache. Takes no arguments.
    */
   public static final int MSGID_FSCACHE_INDEX_NOT_FOUND =
-       CATEGORY_MASK_EXTENSIONS | SEVERITY_MASK_INFORMATIONAL | 499;
+       CATEGORY_MASK_EXTENSIONS | SEVERITY_MASK_INFORMATIONAL | 498;
 
   /**
    * The message ID for the message that will be used if persistent cache index
@@ -5206,7 +5196,7 @@
    * can detect. Takes no arguments.
    */
   public static final int MSGID_FSCACHE_INDEX_IMPAIRED =
-       CATEGORY_MASK_EXTENSIONS | SEVERITY_MASK_SEVERE_ERROR | 500;
+       CATEGORY_MASK_EXTENSIONS | SEVERITY_MASK_SEVERE_ERROR | 499;
 
 
 
@@ -7461,15 +7451,10 @@
     registerMessage(MSGID_FSCACHE_CANNOT_INITIALIZE,
                     "A fatal error occurred while trying to initialize file " +
                     "system entry cache. This cache will be disabled now");
-    registerMessage(MSGID_FSCACHE_INVALID_HOME,
-                    "The file system entry cache home specified in entry %s " +
-                    "is invalid:  %s.  The configured location of %s cannot " +
-                    "be used so the server will attempt to use the default " +
-                    "location of %s");
     registerMessage(MSGID_FSCACHE_HOMELESS,
                     "A fatal error occurred while trying to setup file " +
                     "system entry cache home. No suitable path can be found " +
-                    "to host the cache home. This cache will be disabled now");
+                    "to host the cache home");
     registerMessage(MSGID_FSCACHE_SET_PERMISSIONS_FAILED,
                     "Unable to set file permissions for the file system " +
                     "entry cache backend database directory %s");

--
Gitblit v1.10.0