From 1690ca6b73e677aad3500fd03ad906cf2b3446ac Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Tue, 29 May 2007 22:03:02 +0000
Subject: [PATCH] This commit addresses issue 1599 as well as introduces some other changes suggested by Brian after reviewing the SWAED guidelines:
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ExternalTools.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ExternalTools.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ExternalTools.java
index d3f64ab..7988eeb 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ExternalTools.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ExternalTools.java
@@ -80,12 +80,12 @@
* Backs up all the databases to a specified directory.
* @param source File representing the source data
* @param target File representing the target data
- * @param output File representing the output data
+ * @param otherArgs File representing the output data
* @return OperationOutput containing information about the operation
* @throws java.io.IOException if the process could not be started
* @throws InterruptedException if the process was prematurely interrupted
*/
- public OperationOutput ldifDiff(File source, File target, File output)
+ public OperationOutput ldifDiff(File source, File target, String... otherArgs)
throws IOException, InterruptedException {
String toolName = Installation.LDIF_DIFF;
List<String> args = new ArrayList<String>();
@@ -94,10 +94,11 @@
args.add(Utils.getPath(source));
args.add("-t"); // target LDIF
args.add(Utils.getPath(target));
- args.add("-o"); // output LDIF
- args.add(Utils.getPath(output));
- args.add("-O"); // overwrite
- args.add("-S"); // single-value changes
+ if (otherArgs != null) {
+ for (String otherArg : otherArgs) {
+ args.add(otherArg);
+ }
+ }
return startProcess(toolName, args);
}
--
Gitblit v1.10.0