From 00d37e85955e374be365f1c34de5af1f69a6476c 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 .

---
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserData.java |   55 +------------------------------------------------------
 1 files changed, 1 insertions(+), 54 deletions(-)

diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserData.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserData.java
index 305be5f..13641c4 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserData.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserData.java
@@ -23,7 +23,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions copyright 2011 ForgeRock AS.
+ *      Portions copyright 2011-2013 ForgeRock AS.
  */
 
 package org.opends.quicksetup;
@@ -45,9 +45,6 @@
 /**
  * This class is used to provide a data model for the different parameters
  * that the user can provide in the installation wizard.
- *
- * @see org.opends.quicksetup.DataOptions
- *
  */
 public class UserData
 {
@@ -95,10 +92,6 @@
 
   private boolean forceOnError;
 
-  private String configurationFile;
-
-  private String configurationClass;
-
   private Map<String, JavaArguments> hmJavaArguments;
   private Map<String, JavaArguments> hmDefaultJavaArguments;
 
@@ -563,16 +556,6 @@
   }
 
   /**
-   * Sets whether or not this session should solicite feedback from the user
-   * for missing information.
-   * @param interactive boolean where true indicates this application
-   *        should NOT solicite feedback from the user
-   */
-  public void setInteractive(boolean interactive) {
-    this.interactive = interactive;
-  }
-
-  /**
    * Indicates whether or not the user has requested interactive mode.
    * <p>
    * Interactive mode in the CLI means that the CLI will prompt the user
@@ -851,42 +834,6 @@
   }
 
   /**
-   * Returns the configuration file to be used.
-   * @return the configuration file to be used.
-   */
-  public String getConfigurationFile()
-  {
-    return configurationFile;
-  }
-
-  /**
-   * Sets the configuration file to be used.
-   * @param configurationFile the configuration file to be used.
-   */
-  public void setConfigurationFile(String configurationFile)
-  {
-    this.configurationFile = configurationFile;
-  }
-
-  /**
-   * Returns the configuration class to be used.
-   * @return the configuration class to be used.
-   */
-  public String getConfigurationClassName()
-  {
-    return configurationClass;
-  }
-
-  /**
-   * Sets the configuration class to be used.
-   * @param configurationClass the configuration class to be used.
-   */
-  public void setConfigurationClassName(String configurationClass)
-  {
-    this.configurationClass = configurationClass;
-  }
-
-  /**
    * Returns the different script names for which there are java arguments.
    * @return the different script names for which there are java arguments.
    */

--
Gitblit v1.10.0