From 9a8d97c273430b8eb0ab9afc4209f555321da4e8 Mon Sep 17 00:00:00 2001
From: jarnou <jarnou@localhost>
Date: Mon, 09 Jul 2007 16:13:16 +0000
Subject: [PATCH] Bug: 1428 Synopsis: import-ldif could allow to write skipped entries to a specified file

---
 opends/src/server/org/opends/server/messages/ToolMessages.java |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/opends/src/server/org/opends/server/messages/ToolMessages.java b/opends/src/server/org/opends/server/messages/ToolMessages.java
index 0e309be..9b3992a 100644
--- a/opends/src/server/org/opends/server/messages/ToolMessages.java
+++ b/opends/src/server/org/opends/server/messages/ToolMessages.java
@@ -687,7 +687,7 @@
    * The message ID for the message that will be used as the description of the
    * overwriteRejects argument.  This does not take any arguments.
    */
-  public static final int MSGID_LDIFIMPORT_DESCRIPTION_OVERWRITE_REJECTS =
+  public static final int MSGID_LDIFIMPORT_DESCRIPTION_OVERWRITE =
        CATEGORY_MASK_TOOLS | SEVERITY_MASK_INFORMATIONAL | 79;
 
 
@@ -8999,6 +8999,22 @@
        CATEGORY_MASK_TOOLS | SEVERITY_MASK_INFORMATIONAL | 1196;
 
 
+  /**
+   * The message ID for the message that will be used as the description of the
+   * skipFile argument.  This does not take any arguments.
+   */
+  public static final int MSGID_LDIFIMPORT_DESCRIPTION_SKIP_FILE =
+       CATEGORY_MASK_TOOLS | SEVERITY_MASK_INFORMATIONAL | 1197;
+
+
+  /**
+   * The message ID for the message that will be used if an error occurs while
+   * trying to open the skip file.  This takes two arguments, which are the
+   * path to the skip file and a string representation of the exception that
+   * was caught.
+   */
+  public static final int MSGID_LDIFIMPORT_CANNOT_OPEN_SKIP_FILE =
+       CATEGORY_MASK_TOOLS | SEVERITY_MASK_SEVERE_ERROR | 1198;
 
   /**
    * Associates a set of generic messages with the message IDs defined in this
@@ -9245,9 +9261,14 @@
                     "import");
     registerMessage(MSGID_LDIFIMPORT_DESCRIPTION_REJECT_FILE,
                     "Write rejected entries to the specified file");
-    registerMessage(MSGID_LDIFIMPORT_DESCRIPTION_OVERWRITE_REJECTS,
-                    "Overwrite an existing rejects file rather than " +
-                    "appending to it");
+    registerMessage(MSGID_LDIFIMPORT_DESCRIPTION_SKIP_FILE,
+                    "Write skipped entries to the specified file");
+    registerMessage(MSGID_LDIFIMPORT_CANNOT_OPEN_SKIP_FILE,
+                    "An error occurred while trying to open the skip " +
+                    "file %s for writing:  %s");
+    registerMessage(MSGID_LDIFIMPORT_DESCRIPTION_OVERWRITE,
+                    "Overwrite an existing rejects and/or skip file " +
+                    "rather than appending to it");
     registerMessage(MSGID_LDIFIMPORT_DESCRIPTION_RANDOM_SEED,
                     "Seed for the MakeLDIF random number generator");
     registerMessage(MSGID_LDIFIMPORT_DESCRIPTION_SKIP_SCHEMA_VALIDATION,

--
Gitblit v1.10.0