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/LDAPCompare.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java
index bb4fb67..5fb1de3 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java
@@ -106,15 +106,15 @@
}
} catch (final ErrorResultException ere) {
final LocalizableMessage msg = INFO_OPERATION_FAILED.get("COMPARE");
- println(msg);
+ errPrintln(msg);
final Result r = ere.getResult();
- println(ERR_TOOL_RESULT_CODE.get(r.getResultCode().intValue(), r.getResultCode()
+ errPrintln(ERR_TOOL_RESULT_CODE.get(r.getResultCode().intValue(), r.getResultCode()
.toString()));
if ((r.getDiagnosticMessage() != null) && (r.getDiagnosticMessage().length() > 0)) {
- println(LocalizableMessage.raw(r.getDiagnosticMessage()));
+ errPrintln(LocalizableMessage.raw(r.getDiagnosticMessage()));
}
if (r.getMatchedDN() != null && r.getMatchedDN().length() > 0) {
- println(ERR_TOOL_MATCHED_DN.get(r.getMatchedDN()));
+ errPrintln(ERR_TOOL_MATCHED_DN.get(r.getMatchedDN()));
}
return r.getResultCode().intValue();
}
@@ -212,7 +212,7 @@
} 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();
}
@@ -229,18 +229,18 @@
connectionFactory = connectionFactoryProvider.getAuthenticatedConnectionFactory();
} 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();
}
try {
final int versionNumber = version.getIntValue();
if (versionNumber != 2 && versionNumber != 3) {
- println(ERR_DESCRIPTION_INVALID_VERSION.get(String.valueOf(versionNumber)));
+ errPrintln(ERR_DESCRIPTION_INVALID_VERSION.get(String.valueOf(versionNumber)));
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
} catch (final ArgumentException ae) {
- println(ERR_DESCRIPTION_INVALID_VERSION.get(String.valueOf(version.getValue())));
+ errPrintln(ERR_DESCRIPTION_INVALID_VERSION.get(String.valueOf(version.getValue())));
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
@@ -249,7 +249,7 @@
if (attrAndDNStrings.isEmpty()) {
final LocalizableMessage message = ERR_LDAPCOMPARE_NO_ATTR.get();
- println(message);
+ errPrintln(message);
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
@@ -263,14 +263,14 @@
// If no DNs were provided, then exit with an error.
if (dnStrings.isEmpty() && (!filename.isPresent())) {
- println(ERR_LDAPCOMPARE_NO_DNS.get());
+ errPrintln(ERR_LDAPCOMPARE_NO_DNS.get());
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
/* If trailing DNs were provided and the filename argument was also
provided, exit with an error.*/
if (!dnStrings.isEmpty() && filename.isPresent()) {
- println(ERR_LDAPCOMPARE_FILENAME_AND_DNS.get());
+ errPrintln(ERR_LDAPCOMPARE_FILENAME_AND_DNS.get());
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
@@ -279,7 +279,7 @@
if (idx == -1) {
final LocalizableMessage message =
ERR_LDAPCOMPARE_INVALID_ATTR_STRING.get(attributeString);
- println(message);
+ errPrintln(message);
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
final String attributeType = attributeString.substring(0, idx);
@@ -292,7 +292,7 @@
try {
attributeVal = ByteString.valueOfBase64(base64);
} catch (final LocalizedIllegalArgumentException e) {
- println(INFO_COMPARE_CANNOT_BASE64_DECODE_ASSERTION_VALUE.get());
+ errPrintln(INFO_COMPARE_CANNOT_BASE64_DECODE_ASSERTION_VALUE.get());
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
} else if (nextChar == '<') {
@@ -300,7 +300,7 @@
final String filePath = remainder.substring(1, remainder.length());
attributeVal = ByteString.wrap(readBytesFromFile(filePath));
} catch (final Exception e) {
- println(INFO_COMPARE_CANNOT_READ_ASSERTION_VALUE_FROM_FILE.get(String
+ errPrintln(INFO_COMPARE_CANNOT_READ_ASSERTION_VALUE_FROM_FILE.get(String
.valueOf(e)));
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
@@ -321,7 +321,7 @@
} catch (final DecodeException de) {
final LocalizableMessage message =
ERR_TOOL_INVALID_CONTROL_STRING.get(ctrlString);
- println(message);
+ errPrintln(message);
ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
}
@@ -346,7 +346,7 @@
} catch (final LocalizedIllegalArgumentException le) {
final LocalizableMessage message =
ERR_LDAP_ASSERTION_INVALID_FILTER.get(le.getMessage());
- println(message);
+ errPrintln(message);
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
}
@@ -359,7 +359,7 @@
try {
rdr = new BufferedReader(new FileReader(filename.getValue()));
} catch (final FileNotFoundException t) {
- println(ERR_LDAPCOMPARE_ERROR_READING_FILE.get(filename.getValue(), t.toString()));
+ errPrintln(ERR_LDAPCOMPARE_ERROR_READING_FILE.get(filename.getValue(), t.toString()));
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
}
@@ -369,7 +369,7 @@
try {
connection = connectionFactory.getConnection();
} catch (final ErrorResultException ere) {
- println(LocalizableMessage.raw(ere.getMessage()));
+ errPrintln(LocalizableMessage.raw(ere.getMessage()));
return ere.getResult().getResultCode().intValue();
}
}
@@ -395,7 +395,7 @@
}
}
} catch (final IOException ioe) {
- println(ERR_LDAPCOMPARE_ERROR_READING_FILE.get(filename.getValue(), ioe
+ errPrintln(ERR_LDAPCOMPARE_ERROR_READING_FILE.get(filename.getValue(), ioe
.toString()));
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
--
Gitblit v1.10.0