OPENDJ-1936 - move DBTest tool and JE DB environment monitor into JEB backe...

Matthew Swift

20.53.2015 0a41cf1cdbdb5b54dc045982c71a1386bd4c2ed1

OPENDJ-1936 - move DBTest tool and JE DB environment monitor into JEB backend package

This change makes it easier to package the JE backend and changelog as an extension since all JE dependent functionality is now isolated in only two packages.

 opendj-server-legacy/pom.xml

@@ -1583,7 +1583,7 @@

                    <tool>
                     <name>dbtest</name>
                     <application>org.opends.server.tools.DBTest</application>
                     <application>org.opends.server.backends.jeb.DBTest</application>
                     <trailingSectionPaths>
                       <trailingSectionPath>exit-codes-0-gt0.xml</trailingSectionPath>
                       <trailingSectionPath>dbtest-examples.xml</trailingSectionPath>

 opendj-server-legacy/resource/bin/dbtest

@@ -23,11 +23,11 @@
#
#
#      Copyright 2006-2008 Sun Microsystems, Inc.
#      Portions Copyright 2011 ForgeRock AS
#      Portions Copyright 2011-2015 ForgeRock AS


# This script may be used to debug JE backends in the Directory Server.
OPENDJ_INVOKE_CLASS="org.opends.server.tools.DBTest"
OPENDJ_INVOKE_CLASS="org.opends.server.backends.jeb.DBTest"
export OPENDJ_INVOKE_CLASS

SCRIPT_NAME="dbtest"

 opendj-server-legacy/resource/bin/dbtest.bat

@@ -23,11 +23,11 @@
rem
rem
rem      Copyright 2006-2008 Sun Microsystems, Inc.
rem      Portions Copyright 2011 ForgeRock AS
rem      Portions Copyright 2011-2015 ForgeRock AS

setlocal

set OPENDJ_INVOKE_CLASS="org.opends.server.tools.DBTest"
set OPENDJ_INVOKE_CLASS="org.opends.server.backends.jeb.DBTest"
set SCRIPT_NAME=dbtest
for %%i in (%~sf0) do call "%%~dPsi\..\lib\_server-script.bat" %*


 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/AttributeIndex.java

@@ -51,7 +51,6 @@
import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn.IndexType;
import org.opends.server.admin.std.server.LocalDBIndexCfg;
import org.opends.server.core.DirectoryServer;
import org.opends.server.monitors.DatabaseEnvironmentMonitor;
import org.opends.server.types.*;
import org.opends.server.util.StaticUtils;


 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DBTest.java

File was renamed from opendj-server-legacy/src/main/java/org/opends/server/tools/DBTest.java
@@ -24,11 +24,10 @@
 *      Copyright 2006-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2013-2015 ForgeRock AS.
 */
package org.opends.server.tools;
package org.opends.server.backends.jeb;

import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.cli.Utils.*;

import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.StaticUtils.*;

@@ -51,25 +50,13 @@
import org.opends.server.admin.std.server.BackendCfg;
import org.opends.server.admin.std.server.LocalDBBackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.backends.jeb.BackendImpl;
import org.opends.server.backends.jeb.DN2ID;
import org.opends.server.backends.jeb.DN2URI;
import org.opends.server.backends.jeb.DatabaseContainer;
import org.opends.server.backends.jeb.EntryContainer;
import org.opends.server.backends.jeb.EntryID;
import org.opends.server.backends.jeb.EntryIDSet;
import org.opends.server.backends.jeb.ID2Entry;
import org.opends.server.backends.jeb.Index;
import org.opends.server.backends.jeb.JebFormat;
import org.opends.server.backends.jeb.RootContainer;
import org.opends.server.backends.jeb.SortValuesSet;
import org.opends.server.backends.jeb.VLVIndex;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler;
import org.opends.server.core.LockFileManager;
import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.loggers.JDKLogging;
import org.opends.server.tools.BackendToolUtils;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;

 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DatabaseEnvironmentMonitor.java

File was renamed from opendj-server-legacy/src/main/java/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
@@ -24,7 +24,7 @@
 *      Copyright 2006-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2014-2015 ForgeRock AS
 */
package org.opends.server.monitors;
package org.opends.server.backends.jeb;

import java.lang.reflect.Method;
import java.util.*;
@@ -36,10 +36,6 @@
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.MonitorProvider;
import org.opends.server.backends.jeb.DatabaseContainer;
import org.opends.server.backends.jeb.EntryContainer;
import org.opends.server.backends.jeb.Index;
import org.opends.server.backends.jeb.RootContainer;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
import org.opends.server.util.TimeThread;
@@ -55,7 +51,7 @@
 * It uses reflection on the environment statistics object
 * so that we don't need to keep a list of all the stats.
 */
public class DatabaseEnvironmentMonitor
final class DatabaseEnvironmentMonitor
       extends MonitorProvider<MonitorProviderCfg>
{
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();

 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexFilter.java

@@ -33,7 +33,6 @@

import org.opends.server.backends.jeb.AttributeIndex.IndexFilterType;
import org.opends.server.core.SearchOperation;
import org.opends.server.monitors.DatabaseEnvironmentMonitor;
import org.opends.server.types.AttributeType;
import org.opends.server.types.FilterType;
import org.opends.server.types.SearchFilter;

 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/RootContainer.java

@@ -38,7 +38,6 @@
import org.opends.server.admin.std.server.LocalDBBackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.core.DirectoryServer;
import org.opends.server.monitors.DatabaseEnvironmentMonitor;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.FilePermission;

 opendj-server-legacy/src/main/java/org/opends/server/util/RuntimeInformation.java

@@ -38,8 +38,6 @@

import org.opends.server.core.DirectoryServer;

import com.sleepycat.je.JEVersion;

import static org.opends.messages.CoreMessages.*;
import static org.opends.messages.RuntimeMessages.*;
import static org.opends.server.util.DynamicConstants.*;
@@ -124,7 +122,6 @@
             NOTE_JAVA_HOME.get(System.getProperty("java.home")));
     System.out.println(
             NOTE_JAVA_CLASSPATH.get(System.getProperty("java.class.path")));
     System.out.println(NOTE_JE_VERSION.get(JEVersion.CURRENT_VERSION));
     System.out.println(
             NOTE_CURRENT_DIRECTORY.get(System.getProperty("user.dir")));
     String installDir = toCanonicalPath(DirectoryServer.getServerRoot());