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/Launcher.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/opends/src/quicksetup/org/opends/quicksetup/Launcher.java b/opends/src/quicksetup/org/opends/quicksetup/Launcher.java
index 8b3535a..d0000f1 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/Launcher.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/Launcher.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2008 Sun Microsystems, Inc.
+ *      Copyright 2008-2009 Sun Microsystems, Inc.
  */
 
 package org.opends.quicksetup;
@@ -296,9 +296,9 @@
       printUsage(true);
       System.exit(ReturnCode.USER_DATA_ERROR.getReturnCode());
     }
-    else if (returnValue.equals(ReturnCode.CANCELLED))
+    else if (returnValue.equals(ReturnCode.CANCELED))
     {
-      System.exit(ReturnCode.CANCELLED.getReturnCode());
+      System.exit(ReturnCode.CANCELED.getReturnCode());
     }
     else if (returnValue.equals(ReturnCode.USER_INPUT_ERROR))
     {

--
Gitblit v1.10.0