From 2ad60cfec2ff93847fc648a335a9a8dced5060cd Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 17 Jul 2009 00:45:21 +0000
Subject: [PATCH] Update some messages to avoid using the term 'OpenDS'. This helps to make productization easier. Change the name of the return code CANCELLED to CANCELED to be consistent with the rest of the code.. When we start the server, use the administration port to connect to the server instead of the LDAP port, since we know that there is always an administration port but not necessarily an LDAP port.
---
opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
index 4370d35..d5a2231 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
@@ -851,7 +851,7 @@
|| (response.toLowerCase().equals(no.toLowerCase()))
|| (response.length() == 0))
{
- System.exit(ReturnCode.CANCELLED.getReturnCode());
+ System.exit(ReturnCode.CANCELED.getReturnCode());
}
else if (response.toLowerCase().equals(yes.toLowerCase()))
{
@@ -1317,7 +1317,7 @@
// We don't consider a user cancelation exception
// to be an error.
- if (ae.getType() != ReturnCode.CANCELLED) {
+ if (ae.getType() != ReturnCode.CANCELED) {
this.runError = ae;
} else {
this.abort = true;
@@ -1497,7 +1497,7 @@
*/
public void checkAbort() throws ApplicationException {
if (abort) throw new ApplicationException(
- ReturnCode.CANCELLED,
+ ReturnCode.CANCELED,
INFO_UPGRADE_CANCELED.get(), null);
}
--
Gitblit v1.10.0