From e1e9596f6ae81d9aeb74177cf2792533966f45eb Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Mon, 23 Jul 2007 18:25:05 +0000
Subject: [PATCH] This commit does some initial work in anticipation of the reverter tool:
---
opends/src/server/org/opends/server/messages/ToolMessages.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/opends/src/server/org/opends/server/messages/ToolMessages.java b/opends/src/server/org/opends/server/messages/ToolMessages.java
index 615a0b2..a59cc29 100644
--- a/opends/src/server/org/opends/server/messages/ToolMessages.java
+++ b/opends/src/server/org/opends/server/messages/ToolMessages.java
@@ -9181,6 +9181,13 @@
public static final int MSGID_CLI_HEADING_PROPERTY_DEFAULT_VALUE =
CATEGORY_MASK_TOOLS | SEVERITY_MASK_INFORMATIONAL | 1215;
+<<<<<<< .mine
+ /**
+ * Message ID for reverter tool's directory option.
+ */
+ public static final int MSGID_REVERT_DESCRIPTION_DIRECTORY =
+ CATEGORY_MASK_TOOLS | SEVERITY_MASK_INFORMATIONAL | 1216;
+=======
/**
* The message ID for the message that will be used as the
* description of the advanced mode argument in get-xxx-prop
@@ -9189,8 +9196,29 @@
*/
public static final int MSGID_DSCFG_DESCRIPTION_ADVANCED_GET =
CATEGORY_MASK_TOOLS | SEVERITY_MASK_INFORMATIONAL | 1216;
+>>>>>>> .r2457
/**
+<<<<<<< .mine
+ * Message ID for reverter tool's directory option.
+ */
+ public static final int MSGID_REVERT_DESCRIPTION_RECENT =
+ CATEGORY_MASK_TOOLS | SEVERITY_MASK_INFORMATIONAL | 1217;
+
+ /**
+ * Message ID for reverter tool's directory option.
+ */
+ public static final int MSGID_REVERT_DESCRIPTION_INTERACTIVE =
+ CATEGORY_MASK_TOOLS | SEVERITY_MASK_INFORMATIONAL | 1218;
+
+ /**
+ * Message ID for reverter tool's directory option.
+ */
+ public static final int MSGID_REVERT_DESCRIPTION_SILENT =
+ CATEGORY_MASK_TOOLS | SEVERITY_MASK_INFORMATIONAL | 1219;
+
+ /**
+=======
* The message ID for the message that will be used as the
* description of the advanced mode argument in create-xxx and
* set-xxx-prop sub-commands. This takes no arguments.
@@ -9208,6 +9236,7 @@
/**
+>>>>>>> .r2457
* Associates a set of generic messages with the message IDs defined in this
* class.
*/
@@ -12181,6 +12210,18 @@
"invalid");
registerMessage(MSGID_CLI_HEADING_PROPERTY_DEFAULT_VALUE,
"Default value");
+ registerMessage(MSGID_REVERT_DESCRIPTION_DIRECTORY,
+ "Directory where reversion files are stored. This " +
+ "should be one of the child directories of the 'history' " +
+ "directory that is created when the upgrade tool is run");
+ registerMessage(MSGID_REVERT_DESCRIPTION_RECENT,
+ "Indicates that the installation will be reverted to the " +
+ "state before the most recent upgrade");
+ registerMessage(MSGID_REVERT_DESCRIPTION_INTERACTIVE,
+ "Prompt for any required information rather than fail");
+ registerMessage(MSGID_REVERT_DESCRIPTION_SILENT,
+ "Perform a silent reversion");
+
}
}
--
Gitblit v1.10.0