From aa1cb4dcb8516f159c46b219d71875e90f67a73f Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 22 May 2015 16:40:11 +0000
Subject: [PATCH] OPENDJ-1939 - rename Persistit backend to PDB backend
---
opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ID2CountTest.java | 12 ++--
opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/pdb/PDBTestCase.java | 18 +++---
opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PDBBackendConfiguration.xml | 8 +-
opendj-server-legacy/src/messages/org/opends/messages/backend.properties | 2
opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/StateTest.java | 12 ++--
opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/DN2IDTest.java | 12 ++--
opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ControlsTestCase.java | 12 ++--
opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBBackend.java | 14 ++--
opendj-maven-plugin/src/main/resources/config/stylesheets/abbreviations.xsl | 4
opendj-server-legacy/resource/schema/02-config.ldif | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeBufferImporter.java | 12 ++--
opendj-server-legacy/resource/admin/abbreviations.xsl | 4
opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java | 34 +++++-----
opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/package-info.java | 4
14 files changed, 75 insertions(+), 75 deletions(-)
diff --git a/opendj-maven-plugin/src/main/resources/config/stylesheets/abbreviations.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/abbreviations.xsl
index 8926353..341c889 100644
--- a/opendj-maven-plugin/src/main/resources/config/stylesheets/abbreviations.xsl
+++ b/opendj-maven-plugin/src/main/resources/config/stylesheets/abbreviations.xsl
@@ -22,7 +22,7 @@
!
!
! Copyright 2008-2009 Sun Microsystems, Inc.
- ! Portions copyright 2011-2013 ForgeRock AS
+ ! Portions copyright 2011-2015 ForgeRock AS
! -->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
@@ -54,7 +54,7 @@
or $value = 'des' or $value = 'aes' or $value = 'rc4'
or $value = 'db' or $value = 'snmp' or $value = 'qos'
or $value = 'ecl' or $value = 'ttl' or $value = 'jpeg'
- or $value = 'pbkdf2' or $value = 'pkcs5s2'
+ or $value = 'pbkdf2' or $value = 'pkcs5s2' or $value = 'pdb'
"/>
</xsl:template>
</xsl:stylesheet>
diff --git a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PersistitBackendConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PDBBackendConfiguration.xml
similarity index 97%
rename from opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PersistitBackendConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PDBBackendConfiguration.xml
index de91eaf..aaca5fd 100644
--- a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PersistitBackendConfiguration.xml
+++ b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PDBBackendConfiguration.xml
@@ -24,8 +24,8 @@
!
! Copyright 2014-2015 ForgeRock AS.
! -->
-<adm:managed-object name="persistit-backend"
- plural-name="persistit-backends" package="org.forgerock.opendj.server.config"
+<adm:managed-object name="pdb-backend" plural-name="pdb-backends"
+ package="org.forgerock.opendj.server.config"
extends="pluggable-backend" xmlns:adm="http://opendj.forgerock.org/admin"
xmlns:ldap="http://opendj.forgerock.org/admin-ldap"
xmlns:cli="http://opendj.forgerock.org/admin-cli">
@@ -35,7 +35,7 @@
</adm:synopsis>
<adm:profile name="ldap">
<ldap:object-class>
- <ldap:name>ds-cfg-persistit-backend</ldap:name>
+ <ldap:name>ds-cfg-pdb-backend</ldap:name>
<ldap:superior>ds-cfg-pluggable-backend</ldap:superior>
</ldap:object-class>
</adm:profile>
@@ -43,7 +43,7 @@
<adm:default-behavior>
<adm:defined>
<adm:value>
- org.opends.server.backends.persistit.PitBackend
+ org.opends.server.backends.pdb.PDBBackend
</adm:value>
</adm:defined>
</adm:default-behavior>
diff --git a/opendj-server-legacy/resource/admin/abbreviations.xsl b/opendj-server-legacy/resource/admin/abbreviations.xsl
index e4563bc..341c889 100644
--- a/opendj-server-legacy/resource/admin/abbreviations.xsl
+++ b/opendj-server-legacy/resource/admin/abbreviations.xsl
@@ -22,7 +22,7 @@
!
!
! Copyright 2008-2009 Sun Microsystems, Inc.
- ! Portions copyright 2011-2014 ForgeRock AS
+ ! Portions copyright 2011-2015 ForgeRock AS
! -->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
@@ -54,7 +54,7 @@
or $value = 'des' or $value = 'aes' or $value = 'rc4'
or $value = 'db' or $value = 'snmp' or $value = 'qos'
or $value = 'ecl' or $value = 'ttl' or $value = 'jpeg'
- or $value = 'pbkdf2' or $value = 'pkcs5s2'
+ or $value = 'pbkdf2' or $value = 'pkcs5s2' or $value = 'pdb'
"/>
</xsl:template>
</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/schema/02-config.ldif b/opendj-server-legacy/resource/schema/02-config.ldif
index 8aed135..ace6692 100644
--- a/opendj-server-legacy/resource/schema/02-config.ldif
+++ b/opendj-server-legacy/resource/schema/02-config.ldif
@@ -5755,7 +5755,7 @@
ds-cfg-index-filter-analyzer-max-filters )
X-ORIGIN 'OpenDJ Directory Server' )
objectClasses: ( 1.3.6.1.4.1.36733.2.1.2.23
- NAME 'ds-cfg-persistit-backend'
+ NAME 'ds-cfg-pdb-backend'
SUP ds-cfg-pluggable-backend
STRUCTURAL
MUST ds-cfg-db-directory
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PitBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBBackend.java
similarity index 70%
rename from opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PitBackend.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBBackend.java
index 52c0e7b..9ebcfb2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PitBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBBackend.java
@@ -24,13 +24,13 @@
* Copyright 2015 ForgeRock AS
*/
-package org.opends.server.backends.persistit;
+package org.opends.server.backends.pdb;
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.std.server.PersistitBackendCfg;
+import org.opends.server.admin.std.server.PDBBackendCfg;
import org.opends.server.backends.pluggable.BackendImpl;
import org.opends.server.backends.pluggable.spi.Storage;
import org.opends.server.core.ServerContext;
@@ -38,18 +38,18 @@
/**
* Class defined in the configuration for this backend type.
*/
-public final class PitBackend extends BackendImpl<PersistitBackendCfg>
+public final class PDBBackend extends BackendImpl<PDBBackendCfg>
{
@Override
- public boolean isConfigurationAcceptable(PersistitBackendCfg cfg, List<LocalizableMessage> unacceptableReasons,
+ public boolean isConfigurationAcceptable(PDBBackendCfg cfg, List<LocalizableMessage> unacceptableReasons,
ServerContext serverContext)
{
- return PersistItStorage.isConfigurationAcceptable(cfg, unacceptableReasons, serverContext);
+ return PDBStorage.isConfigurationAcceptable(cfg, unacceptableReasons, serverContext);
}
@Override
- protected Storage configureStorage(PersistitBackendCfg cfg, ServerContext serverContext) throws ConfigException
+ protected Storage configureStorage(PDBBackendCfg cfg, ServerContext serverContext) throws ConfigException
{
- return new PersistItStorage(cfg, serverContext);
+ return new PDBStorage(cfg, serverContext);
}
}
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/pdb/PDBStorage.java
similarity index 95%
rename from opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PersistItStorage.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java
index ee81598..647336e 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/pdb/PDBStorage.java
@@ -23,7 +23,7 @@
*
* Copyright 2014-2015 ForgeRock AS
*/
-package org.opends.server.backends.persistit;
+package org.opends.server.backends.pdb;
import static com.persistit.Transaction.CommitPolicy.*;
import static java.util.Arrays.*;
@@ -56,7 +56,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.util.Reject;
import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.PersistitBackendCfg;
+import org.opends.server.admin.std.server.PDBBackendCfg;
import org.opends.server.api.Backupable;
import org.opends.server.api.DiskSpaceMonitorHandler;
import org.opends.server.backends.pluggable.spi.Cursor;
@@ -97,7 +97,7 @@
/** PersistIt database implementation of the {@link Storage} engine. */
@SuppressWarnings("javadoc")
-public final class PersistItStorage implements Storage, Backupable, ConfigurationChangeListener<PersistitBackendCfg>,
+public final class PDBStorage implements Storage, Backupable, ConfigurationChangeListener<PDBBackendCfg>,
DiskSpaceMonitorHandler
{
private static final String VOLUME_NAME = "dj";
@@ -277,7 +277,7 @@
}
map.clear();
}
- PersistItStorage.this.close();
+ PDBStorage.this.close();
}
@Override
@@ -559,7 +559,7 @@
private final File backendDirectory;
private Persistit db;
private Volume volume;
- private PersistitBackendCfg config;
+ private PDBBackendCfg config;
private DiskSpaceMonitor diskMonitor;
private MemoryQuota memQuota;
private StorageStatus storageStatus = StorageStatus.working();
@@ -574,12 +574,12 @@
* @throws ConfigException if memory cannot be reserved
*/
// FIXME: should be package private once importer is decoupled.
- public PersistItStorage(final PersistitBackendCfg cfg, ServerContext serverContext) throws ConfigException
+ public PDBStorage(final PDBBackendCfg cfg, ServerContext serverContext) throws ConfigException
{
this.serverContext = serverContext;
backendDirectory = new File(getFileForPath(cfg.getDBDirectory()), cfg.getBackendId());
config = cfg;
- cfg.addPersistitChangeListener(this);
+ cfg.addPDBChangeListener(this);
}
private Configuration buildConfiguration(AccessMode accessMode)
@@ -633,7 +633,7 @@
{
memQuota.releaseMemory(memQuota.memPercentToBytes(config.getDBCachePercent()));
}
- config.removePersistitChangeListener(this);
+ config.removePDBChangeListener(this);
diskMonitor.deregisterMonitoredDirectory(getDirectory(), this);
}
@@ -664,7 +664,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_PDB_MEMORY_CFG, config.getBackendId(), bufferCount, BUFFER_SIZE, totalSize);
db.initialize();
volume = db.loadVolume(VOLUME_NAME);
@@ -992,7 +992,7 @@
/** {@inheritDoc} */
@Override
- public boolean isConfigurationChangeAcceptable(PersistitBackendCfg newCfg,
+ public boolean isConfigurationChangeAcceptable(PDBBackendCfg newCfg,
List<LocalizableMessage> unacceptableReasons)
{
long newSize = computeSize(newCfg);
@@ -1001,7 +1001,7 @@
&& checkConfigurationDirectories(newCfg, unacceptableReasons);
}
- private long computeSize(PersistitBackendCfg cfg)
+ private long computeSize(PDBBackendCfg cfg)
{
return cfg.getDBCacheSize() > 0 ? cfg.getDBCacheSize() : memQuota.memPercentToBytes(cfg.getDBCachePercent());
}
@@ -1013,7 +1013,7 @@
* @param context TODO
* @return true if newly created backend has a valid configuration
*/
- static boolean isConfigurationAcceptable(PersistitBackendCfg cfg, List<LocalizableMessage> unacceptableReasons,
+ static boolean isConfigurationAcceptable(PDBBackendCfg cfg, List<LocalizableMessage> unacceptableReasons,
ServerContext context)
{
if (context != null)
@@ -1035,7 +1035,7 @@
return checkConfigurationDirectories(cfg, unacceptableReasons);
}
- private static boolean checkConfigurationDirectories(PersistitBackendCfg cfg,
+ private static boolean checkConfigurationDirectories(PDBBackendCfg cfg,
List<LocalizableMessage> unacceptableReasons)
{
final ConfigChangeResult ccr = new ConfigChangeResult();
@@ -1086,7 +1086,7 @@
* @param ccr the current list of change results
* @throws forwards a file exception
*/
- private static void checkDBDirPermissions(PersistitBackendCfg cfg, ConfigChangeResult ccr)
+ private static void checkDBDirPermissions(PDBBackendCfg cfg, ConfigChangeResult ccr)
{
try
{
@@ -1111,7 +1111,7 @@
* @param backendDir the directory to setup
* @param curCfg a backend configuration
*/
- private void setDBDirPermissions(PersistitBackendCfg curCfg, File backendDir) throws ConfigException
+ private void setDBDirPermissions(PDBBackendCfg curCfg, File backendDir) throws ConfigException
{
FilePermission backendPermission = decodeDBDirPermissions(curCfg);
@@ -1130,7 +1130,7 @@
}
}
- private static FilePermission decodeDBDirPermissions(PersistitBackendCfg curCfg) throws ConfigException
+ private static FilePermission decodeDBDirPermissions(PDBBackendCfg curCfg) throws ConfigException
{
try
{
@@ -1144,7 +1144,7 @@
/** {@inheritDoc} */
@Override
- public ConfigChangeResult applyConfigurationChange(PersistitBackendCfg cfg)
+ public ConfigChangeResult applyConfigurationChange(PDBBackendCfg cfg)
{
final ConfigChangeResult ccr = new ConfigChangeResult();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/package-info.java
similarity index 92%
rename from opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/package-info.java
index 00d74b5..ee0ed53 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/package-info.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/package-info.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2014 ForgeRock AS
+ * Copyright 2014-2015 ForgeRock AS
*/
/**
@@ -30,4 +30,4 @@
*/
@org.opends.server.types.PublicAPI(
stability=org.opends.server.types.StabilityLevel.PRIVATE)
-package org.opends.server.backends.persistit;
+package org.opends.server.backends.pdb;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeBufferImporter.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeBufferImporter.java
index 4343469..3ecf080 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeBufferImporter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeBufferImporter.java
@@ -95,11 +95,11 @@
import org.forgerock.util.Utils;
import org.opends.server.admin.std.meta.BackendIndexCfgDefn.IndexType;
import org.opends.server.admin.std.server.BackendIndexCfg;
-import org.opends.server.admin.std.server.PersistitBackendCfg;
+import org.opends.server.admin.std.server.PDBBackendCfg;
import org.opends.server.admin.std.server.PluggableBackendCfg;
import org.opends.server.backends.RebuildConfig;
import org.opends.server.backends.RebuildConfig.RebuildMode;
-import org.opends.server.backends.persistit.PersistItStorage;
+import org.opends.server.backends.pdb.PDBStorage;
import org.opends.server.backends.pluggable.AttributeIndex.MatchingRuleIndex;
import org.opends.server.backends.pluggable.ImportLDIFReader.EntryInformation;
import org.opends.server.backends.pluggable.spi.Cursor;
@@ -3418,7 +3418,7 @@
try
{
returnValues.put("dn", DN.valueOf("ds-cfg-backend-id=importDNCache,cn=Backends,cn=config"));
- storage = new PersistItStorage(newPersistitBackendCfgProxy(returnValues),
+ storage = new PDBStorage(newPDBBackendCfgProxy(returnValues),
DirectoryServer.getInstance().getServerContext());
storage.open(AccessMode.READ_WRITE);
storage.write(new WriteOperation()
@@ -3436,11 +3436,11 @@
}
}
- private PersistitBackendCfg newPersistitBackendCfgProxy(Map<String, Object> returnValues)
+ private PDBBackendCfg newPDBBackendCfgProxy(Map<String, Object> returnValues)
{
- return (PersistitBackendCfg) Proxy.newProxyInstance(
+ return (PDBBackendCfg) Proxy.newProxyInstance(
getClass().getClassLoader(),
- new Class<?>[] { PersistitBackendCfg.class },
+ new Class<?>[] { PDBBackendCfg.class },
new BackendCfgHandler(returnValues));
}
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/backend.properties b/opendj-server-legacy/src/messages/org/opends/messages/backend.properties
index 54b1ecc..82db2cd 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/backend.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/backend.properties
@@ -1074,7 +1074,7 @@
down the backend to retain the existing data
ERR_DIRECTORY_INVALID_451=The backend database directory '%s' is not \
a valid directory
-NOTE_PERSISTIT_MEMORY_CFG_452=The Persistit storage for backend '%s' initialized \
+NOTE_PDB_MEMORY_CFG_452=The PDB storage for backend '%s' initialized \
to use %d buffers of %d bytes (total %dkb)
ERR_ADD_ENTRY_ALREADY_EXISTS_453=The entry '%s' cannot be added \
because an entry with that name already exists
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ControlsTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ControlsTestCase.java
index deedfd4..e71273a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ControlsTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ControlsTestCase.java
@@ -50,8 +50,8 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.std.meta.BackendVLVIndexCfgDefn.Scope;
import org.opends.server.admin.std.server.BackendVLVIndexCfg;
-import org.opends.server.admin.std.server.PersistitBackendCfg;
-import org.opends.server.backends.persistit.PitBackend;
+import org.opends.server.admin.std.server.PDBBackendCfg;
+import org.opends.server.backends.pdb.PDBBackend;
import org.opends.server.controls.ServerSideSortRequestControl;
import org.opends.server.controls.ServerSideSortResponseControl;
import org.opends.server.controls.VLVRequestControl;
@@ -120,7 +120,7 @@
/** Unindexed: ordered by {@link #SORT_ORDER_3} */
private static final List<Integer> USERS_BY_SORT_ORDER_3 = Arrays.asList(4, 6, 1, 7, 3, 8, 5, 2, 0);
- private PitBackend backend;
+ private PDBBackend backend;
@BeforeClass
public void beforeClass() throws Exception
@@ -129,7 +129,7 @@
final DN baseDN = DN.valueOf(BACKEND_BASE_DN);
- final PersistitBackendCfg backendCfg = mock(PersistitBackendCfg.class);
+ final PDBBackendCfg backendCfg = mock(PDBBackendCfg.class);
when(backendCfg.dn()).thenReturn(baseDN);
when(backendCfg.getBackendId()).thenReturn(BACKEND_NAME);
when(backendCfg.getBaseDN()).thenReturn(newSortedSet(baseDN));
@@ -144,7 +144,7 @@
createVlvIndex(baseDN, backendCfg, SORT_ORDER_1);
createVlvIndex(baseDN, backendCfg, SORT_ORDER_2);
- backend = new PitBackend();
+ backend = new PDBBackend();
backend.setBackendID(backendCfg.getBackendId());
backend.configureBackend(backendCfg, DirectoryServer.getInstance().getServerContext());
backend.openBackend();
@@ -156,7 +156,7 @@
}
}
- private void createVlvIndex(final DN baseDN, final PersistitBackendCfg backendCfg, final String sortOrder)
+ private void createVlvIndex(final DN baseDN, final PDBBackendCfg backendCfg, final String sortOrder)
throws ConfigException
{
final BackendVLVIndexCfg vlvIndexCfg = mock(BackendVLVIndexCfg.class);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/DN2IDTest.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/DN2IDTest.java
index 73b26a4..b1ab0c6 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/DN2IDTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/DN2IDTest.java
@@ -39,8 +39,8 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.std.meta.BackendIndexCfgDefn.IndexType;
import org.opends.server.admin.std.server.BackendIndexCfg;
-import org.opends.server.admin.std.server.PersistitBackendCfg;
-import org.opends.server.backends.persistit.PersistItStorage;
+import org.opends.server.admin.std.server.PDBBackendCfg;
+import org.opends.server.backends.pdb.PDBStorage;
import org.opends.server.backends.pluggable.spi.ReadOperation;
import org.opends.server.backends.pluggable.spi.ReadableTransaction;
import org.opends.server.backends.pluggable.spi.SequentialCursor;
@@ -66,7 +66,7 @@
private final TreeName dn2IDTreeName = new TreeName("base-dn", "index-id");
private DN baseDN;
private DN2ID dn2ID;
- private PersistItStorage storage;
+ private PDBStorage storage;
@BeforeClass
public void startFakeServer() throws Exception
@@ -87,7 +87,7 @@
when(serverContext.getMemoryQuota()).thenReturn(new MemoryQuota());
when(serverContext.getDiskSpaceMonitor()).thenReturn(mock(DiskSpaceMonitor.class));
- storage = new PersistItStorage(createBackendCfg(), serverContext);
+ storage = new PDBStorage(createBackendCfg(), serverContext);
try(final org.opends.server.backends.pluggable.spi.Importer importer = storage.startImport()) {
importer.createTree(dn2IDTreeName);
}
@@ -271,10 +271,10 @@
return new EntryID(id);
}
- private static PersistitBackendCfg createBackendCfg() throws ConfigException, DirectoryException
+ private static PDBBackendCfg createBackendCfg() throws ConfigException, DirectoryException
{
String homeDirName = "pdb_test";
- PersistitBackendCfg backendCfg = mock(PersistitBackendCfg.class);
+ PDBBackendCfg backendCfg = mock(PDBBackendCfg.class);
when(backendCfg.getBackendId()).thenReturn("persTest" + homeDirName);
when(backendCfg.getDBDirectory()).thenReturn(homeDirName);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ID2CountTest.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ID2CountTest.java
index 7abc0a5..7e3d311 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ID2CountTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ID2CountTest.java
@@ -41,8 +41,8 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.std.meta.BackendIndexCfgDefn.IndexType;
import org.opends.server.admin.std.server.BackendIndexCfg;
-import org.opends.server.admin.std.server.PersistitBackendCfg;
-import org.opends.server.backends.persistit.PersistItStorage;
+import org.opends.server.admin.std.server.PDBBackendCfg;
+import org.opends.server.backends.pdb.PDBStorage;
import org.opends.server.backends.pluggable.spi.ReadOperation;
import org.opends.server.backends.pluggable.spi.ReadableTransaction;
import org.opends.server.backends.pluggable.spi.Storage.AccessMode;
@@ -67,7 +67,7 @@
private final TreeName id2CountTreeName = new TreeName("base-dn", "index-id");
private ExecutorService parallelExecutor;
private ID2Count id2Count;
- private PersistItStorage storage;
+ private PDBStorage storage;
@BeforeClass
public void startFakeServer() throws Exception {
@@ -86,7 +86,7 @@
when(serverContext.getMemoryQuota()).thenReturn(new MemoryQuota());
when(serverContext.getDiskSpaceMonitor()).thenReturn(mock(DiskSpaceMonitor.class));
- storage = new PersistItStorage(createBackendCfg(), serverContext);
+ storage = new PDBStorage(createBackendCfg(), serverContext);
try(final org.opends.server.backends.pluggable.spi.Importer importer = storage.startImport()) {
importer.createTree(id2CountTreeName);
}
@@ -227,10 +227,10 @@
return new EntryID(id);
}
- private PersistitBackendCfg createBackendCfg() throws ConfigException, DirectoryException
+ private PDBBackendCfg createBackendCfg() throws ConfigException, DirectoryException
{
String homeDirName = "pdb_test";
- PersistitBackendCfg backendCfg = mock(PersistitBackendCfg.class);
+ PDBBackendCfg backendCfg = mock(PDBBackendCfg.class);
when(backendCfg.getBackendId()).thenReturn("persTest" + homeDirName);
when(backendCfg.getDBDirectory()).thenReturn(homeDirName);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/StateTest.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/StateTest.java
index 26001bd..85e71ca 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/StateTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/StateTest.java
@@ -36,8 +36,8 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.std.meta.BackendIndexCfgDefn.IndexType;
import org.opends.server.admin.std.server.BackendIndexCfg;
-import org.opends.server.admin.std.server.PersistitBackendCfg;
-import org.opends.server.backends.persistit.PersistItStorage;
+import org.opends.server.admin.std.server.PDBBackendCfg;
+import org.opends.server.backends.pdb.PDBStorage;
import org.opends.server.backends.pluggable.State.IndexFlag;
import org.opends.server.backends.pluggable.spi.ReadOperation;
import org.opends.server.backends.pluggable.spi.ReadableTransaction;
@@ -64,7 +64,7 @@
private final TreeName stateTreeName = new TreeName("base-dn", "index-id");
private TreeName indexTreeName;
- private PersistItStorage storage;
+ private PDBStorage storage;
private State state;
@BeforeClass
@@ -86,7 +86,7 @@
when(serverContext.getMemoryQuota()).thenReturn(new MemoryQuota());
when(serverContext.getDiskSpaceMonitor()).thenReturn(mock(DiskSpaceMonitor.class));
- storage = new PersistItStorage(createBackendCfg(), serverContext);
+ storage = new PDBStorage(createBackendCfg(), serverContext);
try(final org.opends.server.backends.pluggable.spi.Importer importer = storage.startImport()) {
importer.createTree(stateTreeName);
}
@@ -177,10 +177,10 @@
assertThat(getFlags()).containsExactly(COMPACTED);
}
- private PersistitBackendCfg createBackendCfg() throws ConfigException, DirectoryException
+ private PDBBackendCfg createBackendCfg() throws ConfigException, DirectoryException
{
String homeDirName = "pdb_test";
- PersistitBackendCfg backendCfg = mock(PersistitBackendCfg.class);
+ PDBBackendCfg backendCfg = mock(PDBBackendCfg.class);
when(backendCfg.getBackendId()).thenReturn("persTest" + homeDirName);
when(backendCfg.getDBDirectory()).thenReturn(homeDirName);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/persistit/PersistitTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/pdb/PDBTestCase.java
similarity index 74%
rename from opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/persistit/PersistitTestCase.java
rename to opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/pdb/PDBTestCase.java
index e5e3c79..34c3c1c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/persistit/PersistitTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/pdb/PDBTestCase.java
@@ -24,30 +24,30 @@
* Copyright 2015 ForgeRock AS
*/
-package org.opends.server.backends.pluggable.persistit;
+package org.opends.server.backends.pluggable.pdb;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.opends.server.admin.std.server.PersistitBackendCfg;
-import org.opends.server.backends.persistit.PitBackend;
+import org.opends.server.admin.std.server.PDBBackendCfg;
+import org.opends.server.backends.pdb.PDBBackend;
import org.opends.server.backends.pluggable.PluggableBackendImplTestCase;
/**
- * PersistIt Tester.
+ * PDBBackend Tester.
*/
-public class PersistitTestCase extends PluggableBackendImplTestCase<PersistitBackendCfg>
+public class PDBTestCase extends PluggableBackendImplTestCase<PDBBackendCfg>
{
@Override
- protected PitBackend createBackend()
+ protected PDBBackend createBackend()
{
- return new PitBackend();
+ return new PDBBackend();
}
@Override
- protected PersistitBackendCfg createBackendCfg()
+ protected PDBBackendCfg createBackendCfg()
{
- PersistitBackendCfg backendCfg = mock(PersistitBackendCfg.class);
+ PDBBackendCfg backendCfg = mock(PDBBackendCfg.class);
when(backendCfg.getDBDirectory()).thenReturn(backendTestName);
when(backendCfg.getDBDirectoryPermissions()).thenReturn("755");
when(backendCfg.getDBCacheSize()).thenReturn(0L);
--
Gitblit v1.10.0