From e39a001d3ba7f04212d7eb9e1e7cf5b57e6e98f7 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 01 Aug 2013 15:26:46 +0000
Subject: [PATCH] Change visibility of various classes and methods in the upgrader so that it can be used for embedded upgrades.
---
opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
index e371846..085e8aa 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
@@ -129,10 +129,10 @@
try
{
- context.notifyProgress(pnc.changeProgress(20));
+ context.notifyProgress(pnc.setProgress(20));
copy(schemaFileTemplate, configSchemaDirectory, true);
- context.notifyProgress(pnc.changeProgress(100));
+ context.notifyProgress(pnc.setProgress(100));
}
catch (final IOException e)
{
@@ -169,10 +169,10 @@
try
{
- context.notifyProgress(pnc.changeProgress(20));
+ context.notifyProgress(pnc.setProgress(20));
copy(configFile, configDirectory, true);
- context.notifyProgress(pnc.changeProgress(100));
+ context.notifyProgress(pnc.setProgress(100));
}
catch (final IOException e)
{
@@ -273,7 +273,7 @@
displayChangeCount(pathDestination.getPath(), changeCount);
- context.notifyProgress(pnc.changeProgress(100));
+ context.notifyProgress(pnc.setProgress(100));
}
catch (final IOException e)
{
@@ -319,7 +319,7 @@
final File pathDestination = new File(configSchemaDirectory, fileName);
- context.notifyProgress(pnc.changeProgress(20));
+ context.notifyProgress(pnc.setProgress(20));
try
{
@@ -329,7 +329,7 @@
displayChangeCount(pathDestination.getPath(), changeCount);
- context.notifyProgress(pnc.changeProgress(100));
+ context.notifyProgress(pnc.setProgress(100));
}
catch (final IOException e)
{
@@ -541,7 +541,7 @@
updateConfigUpgradeSchemaFile(configSchemaDirectory, String
.valueOf(context.getToVersion().getRevisionNumber()));
- context.notifyProgress(pnc.changeProgress(100));
+ context.notifyProgress(pnc.setProgress(100));
}
catch (final Exception ex)
{
@@ -584,7 +584,7 @@
+ File.separator + "opends-snmp.security");
if (oldSnmpConfig.exists())
{
- context.notifyProgress(pnc.changeProgress(20));
+ context.notifyProgress(pnc.setProgress(20));
LOG.log(Level.INFO, summary.toString());
final File snmpConfig =
@@ -593,7 +593,7 @@
FileManager.rename(oldSnmpConfig, snmpConfig);
- context.notifyProgress(pnc.changeProgress(100));
+ context.notifyProgress(pnc.setProgress(100));
}
}
catch (final Exception ex)
@@ -659,7 +659,7 @@
displayChangeCount(configFile.getPath(), changeCount);
- context.notifyProgress(pnc.changeProgress(100));
+ context.notifyProgress(pnc.setProgress(100));
}
catch (final Exception e)
{
@@ -705,7 +705,7 @@
throws ClientException
{
countErrors++;
- context.notifyProgress(pnc.changeProgress(-100));
+ context.notifyProgress(pnc.setProgress(-100));
LOG.log(Level.SEVERE, message.toString());
if (!context.isIgnoreErrorsMode())
{
@@ -764,7 +764,7 @@
displayChangeCount(configFile.getPath(), changeCount);
- context.notifyProgress(pnc.changeProgress(100));
+ context.notifyProgress(pnc.setProgress(100));
}
catch (final Exception e)
{
--
Gitblit v1.10.0