From 8bf05d16714ec5ec23bec6d169b4b8201c463ce4 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 28 Nov 2016 15:37:15 +0000
Subject: [PATCH] OPENDJ-3527 OPENDJ-3531 OPENDJ-1633 Fix tools bootstrap
---
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java | 37 -------------------------------------
1 files changed, 0 insertions(+), 37 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
index 5741fbe..b8334ca 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
@@ -66,7 +66,6 @@
import org.forgerock.opendj.ldif.EntryReader;
import org.forgerock.opendj.ldif.LDIFEntryReader;
import org.opends.server.backends.pluggable.spi.TreeName;
-import org.opends.server.tools.JavaPropertiesTool;
import org.opends.server.tools.RebuildIndex;
import org.opends.server.util.BuildVersion;
import org.opends.server.util.ChangeOperationType;
@@ -407,42 +406,6 @@
}
/**
- * Re-run the dsjavaproperties tool to rewrite the set-java-home script/batch file.
- *
- * @param summary
- * The summary of the task.
- * @return An upgrade task which runs dsjavaproperties.
- */
- static UpgradeTask rerunJavaPropertiesTool(final LocalizableMessage summary)
- {
- return new AbstractUpgradeTask()
- {
- @Override
- public void perform(UpgradeContext context) throws ClientException
- {
- logger.debug(summary);
-
- final ProgressNotificationCallback pnc = new ProgressNotificationCallback(INFORMATION, summary, 50);
- context.notifyProgress(pnc);
-
- int returnValue = JavaPropertiesTool.mainCLI("--quiet");
- context.notifyProgress(pnc.setProgress(100));
-
- if (JavaPropertiesTool.ErrorReturnCode.SUCCESSFUL.getReturnCode() != returnValue &&
- JavaPropertiesTool.ErrorReturnCode.SUCCESSFUL_NOP.getReturnCode() != returnValue) {
- throw new ClientException(ReturnCode.ERROR_UNEXPECTED, ERR_UPGRADE_DSJAVAPROPERTIES_FAILED.get());
- }
- }
-
- @Override
- public String toString()
- {
- return String.valueOf(summary);
- }
- };
- }
-
- /**
* Creates a group of tasks which will only be invoked if the current version
* is more recent than the provided version. This may be useful in cases where
* a regression was introduced in version X and resolved in a later version Y.
--
Gitblit v1.10.0