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/LDIFSearch.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java
index 6036b5b..be888ba 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java
@@ -157,7 +157,7 @@
argParser.setUsageArgument(showUsage, getOutputStream());
} catch (final ArgumentException ae) {
final LocalizableMessage message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
- println(message);
+ errPrintln(message);
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
@@ -172,7 +172,7 @@
}
} catch (final ArgumentException ae) {
final LocalizableMessage message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
- println(message);
+ errPrintln(message);
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
@@ -193,7 +193,7 @@
try {
filters.add(Filter.valueOf(filterString));
} catch (final LocalizedIllegalArgumentException e) {
- println(e.getMessageObject());
+ errPrintln(e.getMessageObject());
return ResultCode.CLIENT_SIDE_FILTER_ERROR.intValue();
}
}
@@ -219,10 +219,10 @@
filters.add(ldapFilter);
}
} catch (final LocalizedIllegalArgumentException e) {
- println(e.getMessageObject());
+ errPrintln(e.getMessageObject());
return ResultCode.CLIENT_SIDE_FILTER_ERROR.intValue();
} catch (final IOException e) {
- println(LocalizableMessage.raw(e.toString()));
+ errPrintln(LocalizableMessage.raw(e.toString()));
return ResultCode.CLIENT_SIDE_FILTER_ERROR.intValue();
} finally {
closeIfNotNull(in);
@@ -230,8 +230,8 @@
}
if (filters.isEmpty()) {
- println(ERR_SEARCH_NO_FILTERS.get());
- println(argParser.getUsageMessage());
+ errPrintln(ERR_SEARCH_NO_FILTERS.get());
+ errPrintln(argParser.getUsageMessage());
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
@@ -244,10 +244,10 @@
typesOnly.isPresent()).setTimeLimit(timeLimit.getIntValue())
.setSizeLimit(sizeLimit.getIntValue());
} catch (final ArgumentException e) {
- println(e.getMessageObject());
+ errPrintln(e.getMessageObject());
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
} catch (final LocalizedIllegalArgumentException e) {
- println(e.getMessageObject());
+ errPrintln(e.getMessageObject());
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
@@ -265,7 +265,7 @@
final LocalizableMessage message =
ERR_LDIF_FILE_CANNOT_OPEN_FOR_READ.get(trailingArguments.get(0), e
.getLocalizedMessage());
- println(message);
+ errPrintln(message);
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
}
@@ -278,7 +278,7 @@
final LocalizableMessage message =
ERR_LDIF_FILE_CANNOT_OPEN_FOR_WRITE.get(outputFilename.getValue(), e
.getLocalizedMessage());
- println(message);
+ errPrintln(message);
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
}
@@ -299,9 +299,9 @@
LDIF.copyTo(LDIF.search(sourceReader, search), outputWriter);
} catch (final IOException e) {
if (e instanceof LocalizableException) {
- println(ERR_LDIFSEARCH_FAILED.get(((LocalizableException) e).getMessageObject()));
+ errPrintln(ERR_LDIFSEARCH_FAILED.get(((LocalizableException) e).getMessageObject()));
} else {
- println(ERR_LDIFSEARCH_FAILED.get(e.getLocalizedMessage()));
+ errPrintln(ERR_LDIFSEARCH_FAILED.get(e.getLocalizedMessage()));
}
return ResultCode.CLIENT_SIDE_LOCAL_ERROR.intValue();
} finally {
--
Gitblit v1.10.0