From 6df6635f1250c399a2f39d87d0534301ce4c22d7 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Fri, 31 Aug 2007 15:43:58 +0000
Subject: [PATCH] Exposes the reversion functionality of the upgrader (issue 2169). Originally it was intended to be exposed as a new script but in order to avoid the negativity of having a command devoted to undoing the upgrade and to avoid more scripts in the top-level directory, I've exposed the functionality as 2 new options in the existing upgrade script. I will update the Wiki with documentation for these new options soon.
---
opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java b/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
index fe56f11..edc2f11 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
@@ -40,7 +40,7 @@
import javax.naming.ldap.InitialLdapContext;
import org.opends.quicksetup.ApplicationException;
-import org.opends.quicksetup.ApplicationReturnCode;
+import org.opends.quicksetup.ReturnCode;
import static org.opends.quicksetup.util.Utils.*;
import org.opends.server.admin.DefaultBehaviorException;
import org.opends.server.admin.ManagedObjectNotFoundException;
@@ -133,7 +133,7 @@
break;
default:
throw new ApplicationException(
- ApplicationReturnCode.ReturnCode.WINDOWS_SERVICE_ERROR,
+ ReturnCode.WINDOWS_SERVICE_ERROR,
errorMessage, null);
}
}
@@ -148,7 +148,7 @@
if (code == ConfigureWindowsService.SERVICE_DISABLE_ERROR) {
throw new ApplicationException(
// TODO: fix this message's format string
- ApplicationReturnCode.ReturnCode.WINDOWS_SERVICE_ERROR,
+ ReturnCode.WINDOWS_SERVICE_ERROR,
INFO_ERROR_DISABLING_WINDOWS_SERVICE.get(""), null);
}
}
@@ -172,7 +172,7 @@
Message failedMsg =
getThrowableMsg(INFO_ERROR_CREATING_TEMP_FILE.get(), ioe);
throw new ApplicationException(
- ApplicationReturnCode.ReturnCode.FILE_SYSTEM_ACCESS_ERROR,
+ ReturnCode.FILE_SYSTEM_ACCESS_ERROR,
failedMsg, ioe);
}
@@ -190,19 +190,19 @@
writer.close();
} catch (DirectoryException de) {
throw new ApplicationException(
- ApplicationReturnCode.ReturnCode.CONFIGURATION_ERROR,
+ ReturnCode.CONFIGURATION_ERROR,
getThrowableMsg(INFO_ERROR_IMPORTING_LDIF.get(), de), de);
} catch (LDIFException le) {
throw new ApplicationException(
- ApplicationReturnCode.ReturnCode.CONFIGURATION_ERROR,
+ ReturnCode.CONFIGURATION_ERROR,
getThrowableMsg(INFO_ERROR_IMPORTING_LDIF.get(), le), le);
} catch (IOException ioe) {
throw new ApplicationException(
- ApplicationReturnCode.ReturnCode.CONFIGURATION_ERROR,
+ ReturnCode.CONFIGURATION_ERROR,
getThrowableMsg(INFO_ERROR_IMPORTING_LDIF.get(), ioe), ioe);
} catch (Throwable t) {
throw new ApplicationException(
- ApplicationReturnCode.ReturnCode.BUG, getThrowableMsg(
+ ReturnCode.BUG, getThrowableMsg(
INFO_BUG_MSG.get(), t), t);
}
return ldifFile;
@@ -398,7 +398,7 @@
Message errorMessage = INFO_ERROR_CONFIGURING_REMOTE_GENERIC.get(
serverDisplay, t.toString());
throw new ApplicationException(
- ApplicationReturnCode.ReturnCode.CONFIGURATION_ERROR, errorMessage,
+ ReturnCode.CONFIGURATION_ERROR, errorMessage,
t);
}
}
@@ -502,7 +502,7 @@
Message errorMessage = INFO_ERROR_CONFIGURING_REMOTE_GENERIC.get(
serverDisplay, t.toString());
throw new ApplicationException(
- ApplicationReturnCode.ReturnCode.CONFIGURATION_ERROR, errorMessage,
+ ReturnCode.CONFIGURATION_ERROR, errorMessage,
t);
}
}
--
Gitblit v1.10.0