From 2e08d2c0e9bede644be993ddaa28157c9f156c10 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 07 May 2013 13:50:59 +0000
Subject: [PATCH] svn merge https://svn.forgerock.org/opendj/trunk/opends@8851 https://svn.forgerock.org/opendj/branches/native-packaging@8851 .
---
opends/src/quicksetup/org/opends/quicksetup/ui/FieldName.java | 45 +++------------------------------------------
1 files changed, 3 insertions(+), 42 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/ui/FieldName.java b/opends/src/quicksetup/org/opends/quicksetup/ui/FieldName.java
index 37e3b4a..185b7b8 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/ui/FieldName.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/ui/FieldName.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS.
*/
package org.opends.quicksetup.ui;
@@ -40,18 +41,6 @@
public enum FieldName
{
/**
- * The value associated with this is a Boolean.
- * It is used by the merged installer and upgrader to know whether an upgrade
- * or an install must be performed.
- */
- IS_UPGRADE,
- /**
- * The value associated with this is a String.
- * The upgrader uses this field to indicate the
- * location of the server to upgrade.
- */
- SERVER_TO_UPGRADE_LOCATION,
- /**
* The value associated with this is a String.
* The web start installer uses this field to indicate the
* location to install the server.
@@ -90,7 +79,7 @@
*/
SECURITY_OPTIONS,
/**
- * The value associated with this is a DataOptions.Type.
+ * The value associated with this is a data options.Type.
*/
DATA_OPTIONS,
/**
@@ -174,10 +163,6 @@
/**
* The value associated with this is a Boolean.
*/
- SERVER_START_UPGRADER,
- /**
- * The value associated with this is a Boolean.
- */
ENABLE_WINDOWS_SERVICE,
/**
* The value associated with this is a Boolean.
@@ -210,29 +195,5 @@
/**
* The value associated with this is a Set of String.
*/
- EXTERNAL_LOG_FILES,
-
- /**
- * Indicates whether the upgrade will need to first download
- * an OpenDS install package (.zip) to download or the
- * upgrader will use a file that has already been
- * downloaded. The value of this field is boolean and if
- * true must be accompanied by a value for UPGRADE_BUILD_TO_DOWNLOAD.
- * If false UPGRADE_FILE must be specified.
- */
- UPGRADE_DOWNLOAD,
-
- /**
- * Display name of the build to which the upgrader
- * will upgrade the build indicated by SERVER_LOCATION.
- */
- UPGRADE_BUILD_TO_DOWNLOAD,
-
- /**
- * Local OpenDS install package (.zip) file containing
- * a build to which the build indicated by SERVER_LOCATION
- * will be upgraded.
- */
- UPGRADE_FILE
-
+ EXTERNAL_LOG_FILES
}
--
Gitblit v1.10.0