From f2ed2687b95fc639e35208731e0968957b9204f6 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 09 Jun 2015 17:12:59 +0000
Subject: [PATCH] OPENDJ-2054: Remove dsframework tool during 2.6.x to 2.8.0 upgrade

---
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
index aca4732..78b1221 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
@@ -51,6 +51,8 @@
 import static org.opends.server.tools.upgrade.FormattedNotificationCallback.*;
 import static org.opends.server.tools.upgrade.LicenseFile.*;
 import static org.opends.server.tools.upgrade.UpgradeTasks.*;
+import static org.opends.server.tools.upgrade.UpgradeUtils.batDirectory;
+import static org.opends.server.tools.upgrade.UpgradeUtils.binDirectory;
 
 /**
  * This class contains the table of upgrade tasks that need performing when
@@ -398,6 +400,11 @@
             "(objectclass=ds-cfg-root-config)",
             "delete: ds-cfg-entry-cache-preload"));
 
+    /** See OPENDJ-2054 */
+    register("2.8.0.12451",
+        deleteFile(new File(binDirectory, "dsframework")),
+        deleteFile(new File(batDirectory, "dsframework.bat")));
+
     /*
      * All upgrades will refresh the server configuration schema and generate
      * a new upgrade folder.

--
Gitblit v1.10.0