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/server/org/opends/server/tools/upgrade/package-info.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/package-info.java b/opends/src/server/org/opends/server/tools/upgrade/package-info.java
similarity index 70%
rename from opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/package-info.java
rename to opends/src/server/org/opends/server/tools/upgrade/package-info.java
index ad3fefb..bb942f6 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/package-info.java
+++ b/opends/src/server/org/opends/server/tools/upgrade/package-info.java
@@ -22,12 +22,16 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2008 Sun Microsystems, Inc.
+ *      Copyright 2013 ForgeRock SAS
  */
 
-
 /**
- * Defines the specific graphical classes for the upgrader.  These classes are
- * basically the different panels that are displayed in the upgrader.
+ * Defines the specific classes that are used by the upgrade tool.
+ * This includes CLI, engine and several helper classes
+ * which are used to perform the full strategy of the upgrade
+ * of the OpenDJ server.
  */
-package org.opends.quicksetup.upgrader.ui;
+@org.opends.server.types.PublicAPI(
+    stability = org.opends.server.types.StabilityLevel.PRIVATE)
+package org.opends.server.tools.upgrade;
+

--
Gitblit v1.10.0