From d9b2b9b7578edb367174b1a516f38feb6eb028ae Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 10 Nov 2006 23:45:06 +0000
Subject: [PATCH] Make a number of changes to administrative tools provided with OpenDS. These are all made under the umbrella of issue #994, but there are individual issues for each change.
---
opends/src/server/org/opends/server/tools/BackUpDB.java | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/BackUpDB.java b/opends/src/server/org/opends/server/tools/BackUpDB.java
index 6120189..e95b401 100644
--- a/opends/src/server/org/opends/server/tools/BackUpDB.java
+++ b/opends/src/server/org/opends/server/tools/BackUpDB.java
@@ -84,7 +84,6 @@
*
* @param args The command-line arguments provided to this program.
*/
-
public static void main(String[] args)
{
int retCode = mainBackUpDB(args);
@@ -121,8 +120,10 @@
// Create the command-line argument parser for use with this program.
+ String toolDescription = getMessage(MSGID_BACKUPDB_TOOL_DESCRIPTION);
ArgumentParser argParser =
- new ArgumentParser("org.opends.server.tools.BackUpDB", false);
+ new ArgumentParser("org.opends.server.tools.BackUpDB", toolDescription,
+ false);
// Initialize all the command-line argument types and register them with the
@@ -216,7 +217,7 @@
int msgID = MSGID_BACKUPDB_CANNOT_INITIALIZE_ARGS;
String message = getMessage(msgID, ae.getMessage());
- System.err.println(message);
+ System.err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
@@ -231,7 +232,7 @@
int msgID = MSGID_BACKUPDB_ERROR_PARSING_ARGS;
String message = getMessage(msgID, ae.getMessage());
- System.err.println(message);
+ System.err.println(wrapText(message, MAX_LINE_WIDTH));
System.err.println(argParser.getUsage());
return 1;
}
@@ -253,7 +254,7 @@
int msgID = MSGID_BACKUPDB_CANNOT_MIX_BACKUP_ALL_AND_BACKEND_ID;
String message = getMessage(msgID, backUpAll.getLongIdentifier(),
backendID.getLongIdentifier());
- System.err.println(message);
+ System.err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
}
@@ -262,7 +263,7 @@
int msgID = MSGID_BACKUPDB_NEED_BACKUP_ALL_OR_BACKEND_ID;
String message = getMessage(msgID, backUpAll.getLongIdentifier(),
backendID.getLongIdentifier());
- System.err.println(message);
+ System.err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
@@ -292,7 +293,7 @@
String message = getMessage(msgID,
incrementalBaseID.getLongIdentifier(),
incremental.getLongIdentifier());
- System.err.println(message);
+ System.err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
@@ -311,7 +312,7 @@
int msgID = MSGID_BACKUPDB_SIGN_REQUIRES_HASH;
String message = getMessage(msgID, signHash.getLongIdentifier(),
hash.getLongIdentifier());
- System.err.println(message);
+ System.err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
@@ -329,7 +330,7 @@
int msgID = MSGID_BACKUPDB_CANNOT_CREATE_BACKUP_DIR;
String message = getMessage(msgID, backupDirectory.getValue(),
stackTraceToSingleLineString(e));
- System.err.println(message);
+ System.err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
}
@@ -348,7 +349,7 @@
{
int msgID = MSGID_BACKUPDB_SERVER_BOOTSTRAP_ERROR;
String message = getMessage(msgID, stackTraceToSingleLineString(e));
- System.err.println(message);
+ System.err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
@@ -361,14 +362,14 @@
{
int msgID = MSGID_BACKUPDB_CANNOT_LOAD_CONFIG;
String message = getMessage(msgID, ie.getMessage());
- System.err.println(message);
+ System.err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
catch (Exception e)
{
int msgID = MSGID_BACKUPDB_CANNOT_LOAD_CONFIG;
String message = getMessage(msgID, stackTraceToSingleLineString(e));
- System.err.println(message);
+ System.err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
@@ -383,21 +384,21 @@
{
int msgID = MSGID_BACKUPDB_CANNOT_LOAD_SCHEMA;
String message = getMessage(msgID, ce.getMessage());
- System.err.println(message);
+ System.err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
catch (InitializationException ie)
{
int msgID = MSGID_BACKUPDB_CANNOT_LOAD_SCHEMA;
String message = getMessage(msgID, ie.getMessage());
- System.err.println(message);
+ System.err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
catch (Exception e)
{
int msgID = MSGID_BACKUPDB_CANNOT_LOAD_SCHEMA;
String message = getMessage(msgID, stackTraceToSingleLineString(e));
- System.err.println(message);
+ System.err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
@@ -412,21 +413,21 @@
{
int msgID = MSGID_BACKUPDB_CANNOT_INITIALIZE_CORE_CONFIG;
String message = getMessage(msgID, ce.getMessage());
- System.err.println(message);
+ System.err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
catch (InitializationException ie)
{
int msgID = MSGID_BACKUPDB_CANNOT_INITIALIZE_CORE_CONFIG;
String message = getMessage(msgID, ie.getMessage());
- System.err.println(message);
+ System.err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
catch (Exception e)
{
int msgID = MSGID_BACKUPDB_CANNOT_INITIALIZE_CORE_CONFIG;
String message = getMessage(msgID, stackTraceToSingleLineString(e));
- System.err.println(message);
+ System.err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
@@ -440,21 +441,21 @@
{
int msgID = MSGID_BACKUPDB_CANNOT_INITIALIZE_CRYPTO_MANAGER;
String message = getMessage(msgID, ce.getMessage());
- System.err.println(message);
+ System.err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
catch (InitializationException ie)
{
int msgID = MSGID_BACKUPDB_CANNOT_INITIALIZE_CRYPTO_MANAGER;
String message = getMessage(msgID, ie.getMessage());
- System.err.println(message);
+ System.err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
catch (Exception e)
{
int msgID = MSGID_BACKUPDB_CANNOT_INITIALIZE_CRYPTO_MANAGER;
String message = getMessage(msgID, stackTraceToSingleLineString(e));
- System.err.println(message);
+ System.err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
--
Gitblit v1.10.0