From 5ceb2e9601d2501d021d0c61188ec913076555a0 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 26 Sep 2007 12:21:02 +0000
Subject: [PATCH] Merge branches/temp-admin@3208 onto trunk@3208.
---
opends/src/server/org/opends/server/backends/jeb/BackupManager.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/BackupManager.java b/opends/src/server/org/opends/server/backends/jeb/BackupManager.java
index 9b8f9c7..ff97b2f 100644
--- a/opends/src/server/org/opends/server/backends/jeb/BackupManager.java
+++ b/opends/src/server/org/opends/server/backends/jeb/BackupManager.java
@@ -71,7 +71,7 @@
import static org.opends.messages.JebMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
-import org.opends.server.admin.std.server.JEBackendCfg;
+import org.opends.server.admin.std.server.LocalDBBackendCfg;
/**
* A backup manager for JE backends.
@@ -143,7 +143,7 @@
* @param backupConfig The configuration to use when performing the backup.
* @throws DirectoryException If a Directory Server error occurs.
*/
- public void createBackup(JEBackendCfg cfg, BackupConfig backupConfig)
+ public void createBackup(LocalDBBackendCfg cfg, BackupConfig backupConfig)
throws DirectoryException
{
// Get the properties to use for the backup.
@@ -225,7 +225,7 @@
// If this is an incremental, determine the base backup for this backup.
HashSet<String> dependencies = new HashSet<String>();
BackupInfo baseBackup = null;
- File backendDir = getFileForPath(cfg.getBackendDirectory());
+ File backendDir = getFileForPath(cfg.getDBDirectory());
/*
FilenameFilter backupTagFilter = new FilenameFilter()
{
@@ -714,7 +714,7 @@
* @param restoreConfig The configuration to use when performing the restore.
* @throws DirectoryException If a Directory Server error occurs.
*/
- public void restoreBackup(JEBackendCfg cfg,
+ public void restoreBackup(LocalDBBackendCfg cfg,
RestoreConfig restoreConfig)
throws DirectoryException
{
@@ -727,7 +727,7 @@
// Create a restore directory with a different name to the backend
// directory.
- File currentDir = getFileForPath(cfg.getBackendDirectory());
+ File currentDir = getFileForPath(cfg.getDBDirectory());
File restoreDir = new File(currentDir.getPath() + "-restore-" + backupID);
if (!verifyOnly)
{
--
Gitblit v1.10.0