From 7dffdf519d734020d9266099d584c70b423caa78 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 21 Jan 2015 16:07:11 +0000
Subject: [PATCH] OPENDJ-1358 Backup task logs path in ID field, and ID in path field
---
opendj3-server-dev/src/messages/messages/jeb_zh_CN.properties | 1
opendj3-server-dev/src/server/org/opends/server/backends/pluggable/BackupManager.java | 36 +++++++++--------
opendj3-server-dev/src/messages/messages/jeb.properties | 2 -
opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java | 36 +++++++++--------
opendj3-server-dev/src/messages/messages/jeb_de.properties | 1
opendj3-server-dev/src/messages/messages/jeb_es.properties | 1
opendj3-server-dev/src/messages/messages/jeb_fr.properties | 1
opendj3-server-dev/src/messages/messages/jeb_ko.properties | 1
opendj3-server-dev/src/messages/messages/jeb_ja.properties | 1
opendj3-server-dev/src/messages/messages/jeb_zh_TW.properties | 1
10 files changed, 38 insertions(+), 43 deletions(-)
diff --git a/opendj3-server-dev/src/messages/messages/jeb.properties b/opendj3-server-dev/src/messages/messages/jeb.properties
index e1a891b..e3ed3a8 100644
--- a/opendj3-server-dev/src/messages/messages/jeb.properties
+++ b/opendj3-server-dev/src/messages/messages/jeb.properties
@@ -146,8 +146,6 @@
not be created in %s
ERR_JEB_BACKUP_CANNOT_RESTORE_78=An error occurred while attempting to \
restore the files from backup %s: %s
-ERR_JEB_BACKUP_MISSING_BACKUPID_79=The information for backup %s could \
- not be found in the backup directory %s
NOTE_JEB_BACKUP_FILE_UNCHANGED_82=Not changed: %s
NOTE_JEB_BACKUP_CLEANER_ACTIVITY_83=Including %s additional log file(s) due \
to cleaner activity
diff --git a/opendj3-server-dev/src/messages/messages/jeb_de.properties b/opendj3-server-dev/src/messages/messages/jeb_de.properties
index 2f1c4b4..74c55c3 100644
--- a/opendj3-server-dev/src/messages/messages/jeb_de.properties
+++ b/opendj3-server-dev/src/messages/messages/jeb_de.properties
@@ -95,7 +95,6 @@
ERR_JEB_INCR_BACKUP_FROM_WRONG_BASE_76=Es muss eine der folgenden Basis-Sicherungs-IDs f\u00fcr die inkrementelle Sicherung spezifiziert werden: %s
ERR_JEB_CANNOT_CREATE_BACKUP_TAG_FILE_77=Die Sicherungs-Tag-Datei %s konnnte nicht in %s erstellt werden
ERR_JEB_BACKUP_CANNOT_RESTORE_78=Fehler beim Versuch, die Dateien der Sicherung %s wiederherzustellen: %s
-ERR_JEB_BACKUP_MISSING_BACKUPID_79=Die Informationen f\u00fcr die Sicherung %s konnten nicht in dem Sicherungsverzeichnis %s gefunden werden
NOTE_JEB_BACKUP_FILE_UNCHANGED_82=Nicht ge\u00e4ndert: %s
NOTE_JEB_BACKUP_CLEANER_ACTIVITY_83=Aufgrund von Bereinigungsaktivit\u00e4ten werden %s zus\u00e4tzliche Protokolldatei(en) eingeschlossen
NOTE_JEB_BACKUP_VERIFY_FILE_84=\u00dcberpr\u00fcfung: %s
diff --git a/opendj3-server-dev/src/messages/messages/jeb_es.properties b/opendj3-server-dev/src/messages/messages/jeb_es.properties
index 2cff609..2ff3f39 100644
--- a/opendj3-server-dev/src/messages/messages/jeb_es.properties
+++ b/opendj3-server-dev/src/messages/messages/jeb_es.properties
@@ -95,7 +95,6 @@
ERR_JEB_INCR_BACKUP_FROM_WRONG_BASE_76=Debe especificarse uno de los siguientes Id. de copia de seguridad de base para la copia de seguridad incremental: %s
ERR_JEB_CANNOT_CREATE_BACKUP_TAG_FILE_77=No pudo crearse el archivo de etiqueta de copia de seguridad %s en %s
ERR_JEB_BACKUP_CANNOT_RESTORE_78=Se ha producido un error al tratar de restaurar los archivos desde la copia de seguridad %s: %s
-ERR_JEB_BACKUP_MISSING_BACKUPID_79=No pudo encontrarse la informaci\u00f3n para la copia de seguridad %s en el directorio de copia de seguridad %s
NOTE_JEB_BACKUP_FILE_UNCHANGED_82=Sin cambios: %s
NOTE_JEB_BACKUP_CLEANER_ACTIVITY_83=Incluyendo %s archivo(s) de registro adicional(es) debido a la actividad del depurador
NOTE_JEB_BACKUP_VERIFY_FILE_84=Verificando: %s
diff --git a/opendj3-server-dev/src/messages/messages/jeb_fr.properties b/opendj3-server-dev/src/messages/messages/jeb_fr.properties
index b8c77cc..ce1155b 100644
--- a/opendj3-server-dev/src/messages/messages/jeb_fr.properties
+++ b/opendj3-server-dev/src/messages/messages/jeb_fr.properties
@@ -95,7 +95,6 @@
ERR_JEB_INCR_BACKUP_FROM_WRONG_BASE_76=L'un des ID de sauvegarde de base suivants doit \u00eatre sp\u00e9cifi\u00e9 pour la sauvegarde incr\u00e9mentielle\u00a0: %s
ERR_JEB_CANNOT_CREATE_BACKUP_TAG_FILE_77=Impossible de cr\u00e9er le fichier de balises de sauvegarde %s dans %s
ERR_JEB_BACKUP_CANNOT_RESTORE_78=Une erreur s'est produite lors de la tentative de restauration des fichiers depuis la sauvegarde %s\u00a0: %s
-ERR_JEB_BACKUP_MISSING_BACKUPID_79=Les informations de la sauvegarde %s sont introuvables dans le r\u00e9pertoire de sauvegarde %s
NOTE_JEB_BACKUP_FILE_UNCHANGED_82=Inchang\u00e9\u00a0: %s
NOTE_JEB_BACKUP_CLEANER_ACTIVITY_83=Incluant %s fichiers journaux suppl\u00e9mentaires en raison de l'activit\u00e9 de nettoyage
NOTE_JEB_BACKUP_VERIFY_FILE_84=V\u00e9rification\u00a0: %s
diff --git a/opendj3-server-dev/src/messages/messages/jeb_ja.properties b/opendj3-server-dev/src/messages/messages/jeb_ja.properties
index 5c75db3..876db88 100644
--- a/opendj3-server-dev/src/messages/messages/jeb_ja.properties
+++ b/opendj3-server-dev/src/messages/messages/jeb_ja.properties
@@ -95,7 +95,6 @@
ERR_JEB_INCR_BACKUP_FROM_WRONG_BASE_76=\u5897\u5206\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u306b\u306f\u6b21\u306e\u30d9\u30fc\u30b9\u30d0\u30c3\u30af\u30a2\u30c3\u30d7 ID \u306e\u3044\u305a\u308c\u304b\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059: %s
ERR_JEB_CANNOT_CREATE_BACKUP_TAG_FILE_77=\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u30bf\u30b0\u30d5\u30a1\u30a4\u30eb %s \u3092 %s \u5185\u306b\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
ERR_JEB_BACKUP_CANNOT_RESTORE_78=\u30d0\u30c3\u30af\u30a2\u30c3\u30d7 %s \u304b\u3089\u30d5\u30a1\u30a4\u30eb\u3092\u5fa9\u5143\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
-ERR_JEB_BACKUP_MISSING_BACKUPID_79=\u30d0\u30c3\u30af\u30a2\u30c3\u30d7 %s \u306e\u60c5\u5831\u304c\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u30c7\u30a3\u30ec\u30af\u30c8\u30ea %s \u5185\u306b\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
NOTE_JEB_BACKUP_FILE_UNCHANGED_82=\u5909\u66f4\u3055\u308c\u3066\u3044\u307e\u305b\u3093: %s
NOTE_JEB_BACKUP_CLEANER_ACTIVITY_83=\u30af\u30ea\u30fc\u30ca\u306e\u52d5\u4f5c\u306b\u3088\u308a\u3001%s \u306e\u8ffd\u52a0\u30ed\u30b0\u30d5\u30a1\u30a4\u30eb\u3092\u542b\u3081\u3066\u3044\u307e\u3059
NOTE_JEB_BACKUP_VERIFY_FILE_84=\u691c\u8a3c\u3057\u3066\u3044\u307e\u3059: %s
diff --git a/opendj3-server-dev/src/messages/messages/jeb_ko.properties b/opendj3-server-dev/src/messages/messages/jeb_ko.properties
index 7e140ad..50cbd27 100644
--- a/opendj3-server-dev/src/messages/messages/jeb_ko.properties
+++ b/opendj3-server-dev/src/messages/messages/jeb_ko.properties
@@ -94,7 +94,6 @@
ERR_JEB_INCR_BACKUP_FROM_WRONG_BASE_76=\uc99d\ubd84 \ubc31\uc5c5\uc5d0 \ub300\ud574 \ub2e4\uc74c \uae30\ubcf8 \ubc31\uc5c5 \uc544\uc774\ub514 \uc911 \ud558\ub098\ub97c \uc9c0\uc815\ud574\uc57c \ud569\ub2c8\ub2e4: %s
ERR_JEB_CANNOT_CREATE_BACKUP_TAG_FILE_77=\ubc31\uc5c5 \ud0dc\uadf8 \ud30c\uc77c %s\uc744(\ub97c) %s\uc5d0\uc11c \ub9cc\ub4e4\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4.
ERR_JEB_BACKUP_CANNOT_RESTORE_78=%s \ubc31\uc5c5\uc5d0\uc11c \ud30c\uc77c\uc744 \ubcf5\uc6d0\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
-ERR_JEB_BACKUP_MISSING_BACKUPID_79=%s \ubc31\uc5c5\uc5d0 \ub300\ud55c \uc815\ubcf4\ub97c \ubc31\uc5c5 \ub514\ub809\ud1a0\ub9ac %s\uc5d0\uc11c \ucc3e\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4.
NOTE_JEB_BACKUP_FILE_UNCHANGED_82=\ubcc0\uacbd\ub418\uc9c0 \uc54a\uc74c: %s
NOTE_JEB_BACKUP_CLEANER_ACTIVITY_83=\ud074\ub9ac\ub108 \uc791\uc5c5\uc73c\ub85c \uc778\ud574 %s \ucd94\uac00 \ub85c\uadf8 \ud30c\uc77c\uc744 \ud3ec\ud568\ud569\ub2c8\ub2e4.
NOTE_JEB_BACKUP_VERIFY_FILE_84=\ud655\uc778 \uc911: %s
diff --git a/opendj3-server-dev/src/messages/messages/jeb_zh_CN.properties b/opendj3-server-dev/src/messages/messages/jeb_zh_CN.properties
index a4d6892..b382304 100644
--- a/opendj3-server-dev/src/messages/messages/jeb_zh_CN.properties
+++ b/opendj3-server-dev/src/messages/messages/jeb_zh_CN.properties
@@ -95,7 +95,6 @@
ERR_JEB_INCR_BACKUP_FROM_WRONG_BASE_76=\u5fc5\u987b\u4e3a\u589e\u91cf\u5907\u4efd\u6307\u5b9a\u4ee5\u4e0b\u67d0\u4e2a\u57fa\u5907\u4efd ID: %s
ERR_JEB_CANNOT_CREATE_BACKUP_TAG_FILE_77=\u5907\u4efd\u6807\u8bb0\u6587\u4ef6 %s \u65e0\u6cd5\u5728 %s \u4e2d\u521b\u5efa
ERR_JEB_BACKUP_CANNOT_RESTORE_78=\u5728\u5c1d\u8bd5\u4ece\u5907\u4efd %s \u4e2d\u6062\u590d\u6587\u4ef6\u65f6\u51fa\u73b0\u9519\u8bef: %s
-ERR_JEB_BACKUP_MISSING_BACKUPID_79=\u5907\u4efd\u76ee\u5f55 %2$s \u4e2d\u627e\u4e0d\u5230\u5907\u4efd %1$s \u7684\u4fe1\u606f
NOTE_JEB_BACKUP_FILE_UNCHANGED_82=\u672a\u66f4\u6539: %s
NOTE_JEB_BACKUP_CLEANER_ACTIVITY_83=\u7531\u4e8e\u6e05\u7406\u5668\u6d3b\u52a8\u800c\u5305\u62ec %s \u4e2a\u989d\u5916\u7684\u65e5\u5fd7\u6587\u4ef6
NOTE_JEB_BACKUP_VERIFY_FILE_84=\u6b63\u5728\u9a8c\u8bc1: %s
diff --git a/opendj3-server-dev/src/messages/messages/jeb_zh_TW.properties b/opendj3-server-dev/src/messages/messages/jeb_zh_TW.properties
index 487c0b8..32e472d 100644
--- a/opendj3-server-dev/src/messages/messages/jeb_zh_TW.properties
+++ b/opendj3-server-dev/src/messages/messages/jeb_zh_TW.properties
@@ -94,7 +94,6 @@
ERR_JEB_INCR_BACKUP_FROM_WRONG_BASE_76=\u5c0d\u65bc\u589e\u91cf\u5099\u4efd\u5fc5\u9808\u6307\u5b9a\u4e0b\u5217\u5176\u4e2d\u4e00\u500b\u57fa\u5e95\u5099\u4efd ID: %s
ERR_JEB_CANNOT_CREATE_BACKUP_TAG_FILE_77=\u7121\u6cd5\u5728 %2$s \u4e2d\u5efa\u7acb\u5099\u4efd\u6a19\u8a18\u6a94\u6848 %1$s
ERR_JEB_BACKUP_CANNOT_RESTORE_78=\u5617\u8a66\u5f9e\u5099\u4efd %s \u5fa9\u539f\u6a94\u6848\u6642\u767c\u751f\u932f\u8aa4: %s
-ERR_JEB_BACKUP_MISSING_BACKUPID_79=\u5728\u5099\u4efd\u76ee\u9304 %2$s \u4e2d\u627e\u4e0d\u5230\u5099\u4efd %1$s \u7684\u8cc7\u8a0a
NOTE_JEB_BACKUP_FILE_UNCHANGED_82=\u672a\u8b8a\u66f4: %s
NOTE_JEB_BACKUP_CLEANER_ACTIVITY_83=\u56e0\u6e05\u9664\u7a0b\u5f0f\u6d3b\u52d5\u800c\u5305\u542b %s \u500b\u984d\u5916\u7684\u8a18\u9304\u6a94
NOTE_JEB_BACKUP_VERIFY_FILE_84=\u6b63\u5728\u9a57\u8b49: %s
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java
index f37011d..dd6490f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java
@@ -22,26 +22,24 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.backends.jeb;
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.core.DirectoryServer;
-import org.opends.server.util.DynamicConstants;
-import org.opends.server.util.StaticUtils;
-import org.opends.server.types.CryptoManagerException;
-import javax.crypto.Mac;
+import static org.opends.messages.BackendMessages.*;
+import static org.opends.messages.JebMessages.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FilenameFilter;
+import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
@@ -52,11 +50,15 @@
import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;
-import org.opends.server.types.*;
+import javax.crypto.Mac;
+
+import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.messages.JebMessages.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
+import org.forgerock.opendj.config.server.ConfigException;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.types.*;
+import org.opends.server.util.DynamicConstants;
+import org.opends.server.util.StaticUtils;
/**
* A backup manager for JE backends.
@@ -322,6 +324,7 @@
// Get a list of all the log files comprising the database.
FilenameFilter filenameFilter = new FilenameFilter()
{
+ @Override
public boolean accept(File d, String name)
{
return name.endsWith(".jdb");
@@ -1224,10 +1227,8 @@
BackupInfo backupInfo = backupDir.getBackupInfo(backupID);
if (backupInfo == null)
{
- LocalizableMessage message =
- ERR_JEB_BACKUP_MISSING_BACKUPID.get(backupDir.getPath(), backupID);
- throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
- message);
+ LocalizableMessage message = ERR_BACKUP_MISSING_BACKUPID.get(backupID, backupDir.getPath());
+ throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
}
return backupInfo;
}
@@ -1245,6 +1246,7 @@
this.latestSize = latestSize;
}
+ @Override
public boolean accept(File d, String name)
{
if (!name.endsWith(".jdb")) return false;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/BackupManager.java b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/BackupManager.java
index 0e22e78..ad28264 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/BackupManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/BackupManager.java
@@ -22,26 +22,24 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.backends.pluggable;
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.core.DirectoryServer;
-import org.opends.server.util.DynamicConstants;
-import org.opends.server.util.StaticUtils;
-import org.opends.server.types.CryptoManagerException;
-import javax.crypto.Mac;
+import static org.opends.messages.BackendMessages.*;
+import static org.opends.messages.JebMessages.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FilenameFilter;
+import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
@@ -52,11 +50,15 @@
import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;
-import org.opends.server.types.*;
+import javax.crypto.Mac;
+
+import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.messages.JebMessages.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
+import org.forgerock.opendj.config.server.ConfigException;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.types.*;
+import org.opends.server.util.DynamicConstants;
+import org.opends.server.util.StaticUtils;
/**
* A backup manager for JE backends.
@@ -322,6 +324,7 @@
// Get a list of all the log files comprising the database.
FilenameFilter filenameFilter = new FilenameFilter()
{
+ @Override
public boolean accept(File d, String name)
{
return name.endsWith(".jdb");
@@ -1224,10 +1227,8 @@
BackupInfo backupInfo = backupDir.getBackupInfo(backupID);
if (backupInfo == null)
{
- LocalizableMessage message =
- ERR_JEB_BACKUP_MISSING_BACKUPID.get(backupDir.getPath(), backupID);
- throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
- message);
+ LocalizableMessage message = ERR_BACKUP_MISSING_BACKUPID.get(backupID, backupDir.getPath());
+ throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
}
return backupInfo;
}
@@ -1245,6 +1246,7 @@
this.latestSize = latestSize;
}
+ @Override
public boolean accept(File d, String name)
{
if (!name.endsWith(".jdb")) return false;
--
Gitblit v1.10.0