From f0a048d41a13eca4cba405da9403c2469ca3d1ea Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Tue, 05 May 2015 14:18:24 +0000
Subject: [PATCH] OPENDJ-1849 CR-6835 Remove references to JE from pluggable backend
---
opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PersistItStorage.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PersistItStorage.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PersistItStorage.java
index c1e9d80..6e30db1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PersistItStorage.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PersistItStorage.java
@@ -30,7 +30,6 @@
import static org.opends.messages.BackendMessages.*;
import static org.opends.messages.ConfigMessages.*;
-import static org.opends.messages.JebMessages.*;
import static org.opends.messages.UtilityMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -657,8 +656,7 @@
final long bufferCount = getBufferPoolCfg(dbCfg).computeBufferCount(db.getAvailableHeap());
final long totalSize = bufferCount * BUFFER_SIZE / 1024;
- logger.info(NOTE_PERSISTIT_MEMORY_CFG, config.getBackendId(),
- bufferCount, BUFFER_SIZE, totalSize);
+ logger.info(NOTE_PERSISTIT_MEMORY_CFG, config.getBackendId(), bufferCount, BUFFER_SIZE, totalSize);
db.initialize();
volume = db.loadVolume(VOLUME_NAME);
@@ -1021,7 +1019,7 @@
{
if(!backendDir.mkdirs())
{
- addErrorMessage(ccr, ERR_JEB_CREATE_FAIL.get(backendDir.getPath()));
+ addErrorMessage(ccr, ERR_CREATE_FAIL.get(backendDir.getPath()));
}
if (cleanup)
{
@@ -1030,7 +1028,7 @@
}
else if (!backendDir.isDirectory())
{
- addErrorMessage(ccr, ERR_JEB_DIRECTORY_INVALID.get(backendDir.getPath()));
+ addErrorMessage(ccr, ERR_DIRECTORY_INVALID.get(backendDir.getPath()));
}
}
@@ -1076,13 +1074,13 @@
{
if(!FilePermission.setPermissions(backendDir, backendPermission))
{
- logger.warn(WARN_JEB_UNABLE_SET_PERMISSIONS, backendPermission, backendDir);
+ logger.warn(WARN_UNABLE_SET_PERMISSIONS, backendPermission, backendDir);
}
}
catch(Exception e)
{
// Log an warning that the permissions were not set.
- logger.warn(WARN_JEB_SET_PERMISSIONS_FAILED, backendDir, e);
+ logger.warn(WARN_SET_PERMISSIONS_FAILED, backendDir, e);
}
}
@@ -1119,8 +1117,7 @@
}
ccr.setAdminActionRequired(true);
- ccr.addMessage(NOTE_JEB_CONFIG_DB_DIR_REQUIRES_RESTART.get(config.getDBDirectory(),
- cfg.getDBDirectory()));
+ ccr.addMessage(NOTE_CONFIG_DB_DIR_REQUIRES_RESTART.get(config.getDBDirectory(), cfg.getDBDirectory()));
}
if (!cfg.getDBDirectoryPermissions().equalsIgnoreCase(config.getDBDirectoryPermissions())
@@ -1182,8 +1179,7 @@
if (!backendDirectory.isDirectory())
{
- LocalizableMessage msg = ERR_JEB_DIRECTORY_INVALID.get(backendDirectory.getPath());
- throw new StorageRuntimeException(msg.toString());
+ throw new StorageRuntimeException(ERR_DIRECTORY_INVALID.get(backendDirectory.getPath()).toString());
}
try
@@ -1197,8 +1193,7 @@
catch (Exception e)
{
logger.traceException(e);
- LocalizableMessage message = ERR_JEB_REMOVE_FAIL.get(e.getMessage());
- throw new StorageRuntimeException(message.toString(), e);
+ throw new StorageRuntimeException(ERR_REMOVE_FAIL.get(e.getMessage()).toString(), e);
}
}
--
Gitblit v1.10.0