From 64e093aac5d5b7af23e735820aab9069ef7d7d0d Mon Sep 17 00:00:00 2001
From: Nemanja Lukic <nemanja.lukic@forgerock.com>
Date: Wed, 09 Nov 2011 18:40:38 +0000
Subject: [PATCH] Fix for OPENDJ-231.  Setup process should ignore 'tools.properties', hence the argument '--noPropertiesFile' is added to the invocation of 'import-ldif' tool.

---
 opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index 7f7f989..00a3650 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -1425,6 +1425,9 @@
       argList.add("--skipFile");
       argList.add(skippedFile);
     }
+
+    argList.add("--noPropertiesFile");
+
     final String[] args = new String[argList.size()];
     argList.toArray(args);
 
@@ -1541,6 +1544,8 @@
 
     argList.add("-F");
 
+    argList.add("--noPropertiesFile");
+
     final String[] args = new String[argList.size()];
     argList.toArray(args);
 

--
Gitblit v1.10.0