From 11ae4700b7b9bfbd0f86adc099bf8a8a10434620 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 11 Jun 2013 15:25:39 +0000
Subject: [PATCH] CR-1829 OPENDJ-982 Upgrade: SNMP Connection Handler does not start after the upgrade As suggested in CR, a new upgrade task has been created 'Rename SNMP security config file'. This task is launched if the old SNMP config file actually exists in the config/snmp/security. The task renames the file with the new opendj name.

---
 opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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 9e2ffc1..d439e78 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
@@ -97,14 +97,20 @@
   /** The template/config/schema folder of the current installation. */
   static final File templateConfigSchemaDirectory = new File(
       getInstallationPath(), Installation.TEMPLATE_RELATIVE_PATH
-          + File.separator + Installation.CONFIG_PATH_RELATIVE + File.separator
-          + Installation.SCHEMA_PATH_RELATIVE);
+          + 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);
 
+  /** The config snmp security folder of the current installation. */
+  static final File configSnmpSecurityDirectory = new File(
+      getInstallationPath(), Installation.CONFIG_PATH_RELATIVE
+      + File.separator + Installation.SNMP_PATH_RELATIVE + File.separator
+      + Installation.SECURITY_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