From ee0f6d7f8391f7b8bddbc1a77442e1e2949c78e3 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 07 Feb 2014 16:47:06 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1303 Due to change in console application, modified files to redirect errors on err stream.
---
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java
index 60da970..afde0ba 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java
@@ -106,7 +106,7 @@
argParser.addArgument(showUsage);
argParser.setUsageArgument(showUsage, getOutputStream());
} catch (ArgumentException ae) {
- println(ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage()));
+ errPrintln(ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage()));
return EXIT_CODE_FAILURE;
}
@@ -114,8 +114,8 @@
try {
argParser.parseArguments(args);
} catch (ArgumentException ae) {
- println(ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
- println(argParser.getUsageMessage());
+ errPrintln(ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
+ errPrintln(argParser.getUsageMessage());
return EXIT_CODE_FAILURE;
}
@@ -139,7 +139,7 @@
if (generator.hasWarnings()) {
for (LocalizableMessage warn : generator.getWarnings()) {
- println(warn);
+ errPrintln(warn);
}
}
@@ -147,7 +147,7 @@
try {
writer = new LDIFEntryWriter(new BufferedWriter(new FileWriter(new File(ldifFile.getValue()))));
} catch (IOException e) {
- println(ERR_MAKELDIF_UNABLE_TO_CREATE_LDIF.get(ldifFile.getValue(), e.getMessage()));
+ errPrintln(ERR_MAKELDIF_UNABLE_TO_CREATE_LDIF.get(ldifFile.getValue(), e.getMessage()));
return EXIT_CODE_FAILURE;
}
} else {
@@ -158,7 +158,7 @@
return EXIT_CODE_FAILURE;
}
- println(INFO_MAKELDIF_PROCESSING_COMPLETE.get(numberOfEntriesWritten));
+ errPrintln(INFO_MAKELDIF_PROCESSING_COMPLETE.get(numberOfEntriesWritten));
} finally {
closeIfNotNull(generator, writer);
@@ -177,7 +177,7 @@
if (resourcePath.isPresent()) {
final File resourceDir = new File(resourcePath.getValue());
if (!resourceDir.exists()) {
- println(ERR_MAKELDIF_NO_SUCH_RESOURCE_DIRECTORY.get(resourcePath.getValue()));
+ errPrintln(ERR_MAKELDIF_NO_SUCH_RESOURCE_DIRECTORY.get(resourcePath.getValue()));
generator.close();
return null;
}
@@ -188,7 +188,7 @@
try {
generator.setRandomSeed(randomSeedArg.getIntValue());
} catch (ArgumentException ae) {
- println(ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
+ errPrintln(ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
generator.close();
return null;
}
@@ -205,7 +205,7 @@
try {
generator.hasNext();
} catch (IOException e) {
- println(ERR_MAKELDIF_EXCEPTION_DURING_PARSE.get(e.getMessage()));
+ errPrintln(ERR_MAKELDIF_EXCEPTION_DURING_PARSE.get(e.getMessage()));
generator.close();
return null;
}
@@ -220,7 +220,7 @@
for (final String constant : constants.getValues()) {
final String[] chunks = constant.split("=");
if (chunks.length != 2) {
- println(ERR_CONSTANT_ARG_CANNOT_DECODE.get(constant));
+ errPrintln(ERR_CONSTANT_ARG_CANNOT_DECODE.get(constant));
return false;
}
generator.setConstant(chunks[0], chunks[1]);
@@ -239,15 +239,15 @@
try {
writer.writeEntry(entry);
} catch (IOException e) {
- println(ERR_MAKELDIF_ERROR_WRITING_LDIF.get(ldifFile.getValue(), e.getMessage()));
+ errPrintln(ERR_MAKELDIF_ERROR_WRITING_LDIF.get(ldifFile.getValue(), e.getMessage()));
return false;
}
if ((++numberOfEntriesWritten % 1000) == 0) {
- println(INFO_MAKELDIF_PROCESSED_N_ENTRIES.get(numberOfEntriesWritten));
+ errPrintln(INFO_MAKELDIF_PROCESSED_N_ENTRIES.get(numberOfEntriesWritten));
}
}
} catch (Exception e) {
- println(ERR_MAKELDIF_EXCEPTION_DURING_PROCESSING.get(e.getMessage()));
+ errPrintln(ERR_MAKELDIF_EXCEPTION_DURING_PROCESSING.get(e.getMessage()));
return false;
}
return true;
--
Gitblit v1.10.0