From 7d4d2d228f709268250855b1609c8501c43c874e Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 25 Jun 2013 15:06:39 +0000
Subject: [PATCH] OPENDJ-1010 "upgrade --force" should not automatically accept the license
---
opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeCli.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeCli.java b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
index bf0cbb3..8b1d334 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
@@ -32,12 +32,7 @@
import static org.opends.server.util.StaticUtils.filterExitCode;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.SEVERE;
-import static org.opends.server.tools.upgrade.
-FormattedNotificationCallback.NOTICE_CALLBACK;
-import static org.opends.server.tools.upgrade.
-FormattedNotificationCallback.SUBTITLE_CALLBACK;
-import static org.opends.server.tools.upgrade.
-FormattedNotificationCallback.TITLE_CALLBACK;
+import static org.opends.server.tools.upgrade.FormattedNotificationCallback.*;
import static org.opends.server.tools.upgrade.Upgrade.EXIT_CODE_ERROR;
import static org.opends.server.tools.upgrade.Upgrade.EXIT_CODE_SUCCESS;
@@ -427,6 +422,12 @@
case NOTICE_CALLBACK:
println(Style.NOTICE, Message.raw(fnc.getMessage()), 1);
break;
+ case ERROR_CALLBACK:
+ println(Style.ERROR, Message.raw(fnc.getMessage()), 1);
+ break;
+ case BREAKLINE:
+ println(Style.BREAKLINE, Message.raw(fnc.getMessage()), 1);
+ break;
default:
LOG.log(SEVERE, "Unsupported message type: "
+ fnc.getMessage());
--
Gitblit v1.10.0