From b5c2c2145e4049b490075c8a0568d06a72d9e210 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Thu, 23 May 2013 08:10:24 +0000
Subject: [PATCH] CR-1720 OPENDJ-835 Upgrade should add HTTP Connection Handler to config.ldif OPENDJ-914 Upgrade should add Based HTTP Access Logger to config.ldif - HTTP connection handler and the based HTTP access logger are now added to upgrade. - The http-config.json is added to the config file during upgrade. - Simplified UpgradeTasks.java - Added new messages. - Fixed javadoc for unit test.

---
 opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java
index 696fc18..b1d5994 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java
@@ -100,6 +100,11 @@
           + File.separator + Installation.CONFIG_PATH_RELATIVE + File.separator
           + Installation.SCHEMA_PATH_RELATIVE);
 
+  /** The template/config folder of the current installation. */
+  static final File templateConfigDirectory = new File(
+      getInstallationPath(), Installation.TEMPLATE_RELATIVE_PATH
+          + File.separator + Installation.CONFIG_PATH_RELATIVE);
+
   /**
    * Returns the path of the installation of the directory server. Note that
    * this method assumes that this code is being run locally.

--
Gitblit v1.10.0