From 251930b6f131025423207a8a3ea02c21b50bf400 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Thu, 30 May 2013 12:17:22 +0000
Subject: [PATCH] OPENDJ-930 setup in non-interactive mode should not accept automatically the license - added --acceptLicense to the setup command line options. - modified code for checking the license during the setup : 	- using the no-prompt option no longer bypass the license if presents. 	- displays now the license text, question and answer(yes) when used with the --acceptLicense.

---
 opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java b/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
index aaec993..cdd3871 100644
--- a/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
+++ b/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
@@ -99,6 +99,7 @@
   StringArgument    certNicknameArg;
   StringArgument    progNameArg;
   IntegerArgument   connectTimeoutArg = null;
+  BooleanArgument   acceptLicense;
 
   private static final Logger LOG = Logger.getLogger(
       InstallDSArgumentParser.class.getName());
@@ -404,6 +405,10 @@
     connectTimeoutArg.setHidden(true);
     addArgument(connectTimeoutArg);
 
+    acceptLicense = new BooleanArgument(OPTION_LONG_ACCEPT_LICENSE, null,
+        OPTION_LONG_ACCEPT_LICENSE, INFO_OPTION_ACCEPT_LICENSE.get());
+    addArgument(acceptLicense);
+
     showUsageArg = new BooleanArgument(
         OPTION_LONG_HELP.toLowerCase(), OPTION_SHORT_HELP,
         OPTION_LONG_HELP,

--
Gitblit v1.10.0