From 55d393312460ce9ff84895cabb2ffaa60a035343 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Sat, 14 Oct 2006 00:50:40 +0000
Subject: [PATCH] Move the ConfigFileHandler from the config package to the extensions package. This is more in-line with the rest of the code conventions that we use, and it makes it easier to include the config package in what we consider to be our public API.
---
opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackupTests.java | 10 +-
opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureDS.java | 2
opendj-sdk/opends/resource/bin/makeldif.bat | 2
opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendStartupTests.java | 2
opendj-sdk/opends/src/server/org/opends/server/tools/BackUpDB.java | 2
opendj-sdk/opends/tests/integration-tests-testng/build.xml | 2
opendj-sdk/opends/resource/bin/backup.sh | 2
opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests.java | 28 ++++----
opendj-sdk/opends/src/server/org/opends/server/tools/EncodePassword.java | 2
opendj-sdk/opends/resource/bin/export-ldif.sh | 2
opendj-sdk/opends/resource/setup.bat | 4
opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTests.java | 4
opendj-sdk/opends/resource/bin/restore.bat | 2
opendj-sdk/opends/resource/config/config.ldif | 2
opendj-sdk/opends/resource/bin/verify-index.bat | 2
opendj-sdk/opends/src/server/org/opends/server/tools/LDIFSearch.java | 2
opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTests.java | 30 +++++-----
opendj-sdk/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java | 7 +
opendj-sdk/opends/resource/bin/verify-index.sh | 2
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java | 2
opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java | 2
opendj-sdk/opends/src/server/org/opends/server/tools/LDIFModify.java | 2
opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java | 2
opendj-sdk/opends/src/server/org/opends/server/tools/VerifyIndex.java | 2
opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java | 2
opendj-sdk/opends/resource/bin/import-ldif.sh | 2
opendj-sdk/opends/resource/bin/configure-ds.sh | 2
opendj-sdk/opends/resource/bin/backup.bat | 2
opendj-sdk/opends/resource/bin/configure-ds.bat | 2
opendj-sdk/opends/resource/bin/start-ds.bat | 2
opendj-sdk/opends/src/server/org/opends/server/tools/LDIFDiff.java | 2
opendj-sdk/opends/resource/bin/start-ds.sh | 4
opendj-sdk/opends/resource/bin/import-ldif.bat | 2
opendj-sdk/opends/resource/bin/restore.sh | 2
opendj-sdk/opends/resource/bin/encode-password.sh | 2
opendj-sdk/opends/resource/bin/export-ldif.bat | 2
opendj-sdk/opends/resource/bin/encode-password.bat | 2
opendj-sdk/opends/resource/bin/makeldif.sh | 2
opendj-sdk/opends/resource/setup.sh | 2
opendj-sdk/opends/src/server/org/opends/server/tools/RestoreDB.java | 2
opendj-sdk/opends/src/server/org/opends/server/messages/ToolMessages.java | 2
opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java | 2
42 files changed, 80 insertions(+), 77 deletions(-)
diff --git a/opendj-sdk/opends/resource/bin/backup.bat b/opendj-sdk/opends/resource/bin/backup.bat
index 30ea80b..b01fbbb 100644
--- a/opendj-sdk/opends/resource/bin/backup.bat
+++ b/opendj-sdk/opends/resource/bin/backup.bat
@@ -50,7 +50,7 @@
cd %DIR_HOME%
-%JAVA_BIN% %JAVA_ARGS% -classpath "%CLASSPATH%" org.opends.server.tools.BackUpDB --configClass org.opends.server.config.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %*
+%JAVA_BIN% %JAVA_ARGS% -classpath "%CLASSPATH%" org.opends.server.tools.BackUpDB --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %*
:end
diff --git a/opendj-sdk/opends/resource/bin/backup.sh b/opendj-sdk/opends/resource/bin/backup.sh
index 1feaecb..8625e4d 100755
--- a/opendj-sdk/opends/resource/bin/backup.sh
+++ b/opendj-sdk/opends/resource/bin/backup.sh
@@ -70,5 +70,5 @@
${JAVA_BIN} ${JAVA_ARGS} org.opends.server.tools.BackUpDB \
- --configClass org.opends.server.config.ConfigFileHandler \
+ --configClass org.opends.server.extensions.ConfigFileHandler \
--configFile ${INSTANCE_ROOT}/config/config.ldif "${@}"
diff --git a/opendj-sdk/opends/resource/bin/configure-ds.bat b/opendj-sdk/opends/resource/bin/configure-ds.bat
index 764631b..b26808c 100755
--- a/opendj-sdk/opends/resource/bin/configure-ds.bat
+++ b/opendj-sdk/opends/resource/bin/configure-ds.bat
@@ -49,7 +49,7 @@
cd %DIR_HOME%
-%JAVA_BIN% %JAVA_ARGS% -classpath "%CLASSPATH%" org.opends.server.tools.ConfigureDS --configClass org.opends.server.config.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %*
+%JAVA_BIN% %JAVA_ARGS% -classpath "%CLASSPATH%" org.opends.server.tools.ConfigureDS --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %*
:end
diff --git a/opendj-sdk/opends/resource/bin/configure-ds.sh b/opendj-sdk/opends/resource/bin/configure-ds.sh
index 33505e0..2cde0d8 100755
--- a/opendj-sdk/opends/resource/bin/configure-ds.sh
+++ b/opendj-sdk/opends/resource/bin/configure-ds.sh
@@ -70,5 +70,5 @@
${JAVA_BIN} ${JAVA_ARGS} org.opends.server.tools.ConfigureDS \
- --configClass org.opends.server.config.ConfigFileHandler \
+ --configClass org.opends.server.extensions.ConfigFileHandler \
--configFile ${INSTANCE_ROOT}/config/config.ldif "${@}"
diff --git a/opendj-sdk/opends/resource/bin/encode-password.bat b/opendj-sdk/opends/resource/bin/encode-password.bat
index a651d4e..2fecaea 100755
--- a/opendj-sdk/opends/resource/bin/encode-password.bat
+++ b/opendj-sdk/opends/resource/bin/encode-password.bat
@@ -49,7 +49,7 @@
cd %DIR_HOME%
-%JAVA_BIN% %JAVA_ARGS% -classpath "%CLASSPATH%" org.opends.server.tools.EncodePassword --configClass org.opends.server.config.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %*
+%JAVA_BIN% %JAVA_ARGS% -classpath "%CLASSPATH%" org.opends.server.tools.EncodePassword --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %*
:end
diff --git a/opendj-sdk/opends/resource/bin/encode-password.sh b/opendj-sdk/opends/resource/bin/encode-password.sh
index 994a862..8a2b24a 100755
--- a/opendj-sdk/opends/resource/bin/encode-password.sh
+++ b/opendj-sdk/opends/resource/bin/encode-password.sh
@@ -70,5 +70,5 @@
${JAVA_BIN} ${JAVA_ARGS} org.opends.server.tools.EncodePassword \
- --configClass org.opends.server.config.ConfigFileHandler \
+ --configClass org.opends.server.extensions.ConfigFileHandler \
--configFile ${INSTANCE_ROOT}/config/config.ldif "${@}"
diff --git a/opendj-sdk/opends/resource/bin/export-ldif.bat b/opendj-sdk/opends/resource/bin/export-ldif.bat
index ee15d11..9b8f924 100755
--- a/opendj-sdk/opends/resource/bin/export-ldif.bat
+++ b/opendj-sdk/opends/resource/bin/export-ldif.bat
@@ -50,7 +50,7 @@
cd %DIR_HOME%
-%JAVA_BIN% %JAVA_ARGS% -classpath "%CLASSPATH%" org.opends.server.tools.ExportLDIF --configClass org.opends.server.config.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %*
+%JAVA_BIN% %JAVA_ARGS% -classpath "%CLASSPATH%" org.opends.server.tools.ExportLDIF --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %*
:end
diff --git a/opendj-sdk/opends/resource/bin/export-ldif.sh b/opendj-sdk/opends/resource/bin/export-ldif.sh
index 745971f..8d83ddc 100755
--- a/opendj-sdk/opends/resource/bin/export-ldif.sh
+++ b/opendj-sdk/opends/resource/bin/export-ldif.sh
@@ -70,5 +70,5 @@
${JAVA_BIN} ${JAVA_ARGS} org.opends.server.tools.ExportLDIF \
- --configClass org.opends.server.config.ConfigFileHandler \
+ --configClass org.opends.server.extensions.ConfigFileHandler \
--configFile ${INSTANCE_ROOT}/config/config.ldif "${@}"
diff --git a/opendj-sdk/opends/resource/bin/import-ldif.bat b/opendj-sdk/opends/resource/bin/import-ldif.bat
index bde9401..648b6bb 100755
--- a/opendj-sdk/opends/resource/bin/import-ldif.bat
+++ b/opendj-sdk/opends/resource/bin/import-ldif.bat
@@ -50,7 +50,7 @@
cd %DIR_HOME%
-%JAVA_BIN% %JAVA_ARGS% -classpath "%CLASSPATH%" org.opends.server.tools.ImportLDIF --configClass org.opends.server.config.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %*
+%JAVA_BIN% %JAVA_ARGS% -classpath "%CLASSPATH%" org.opends.server.tools.ImportLDIF --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %*
:end
diff --git a/opendj-sdk/opends/resource/bin/import-ldif.sh b/opendj-sdk/opends/resource/bin/import-ldif.sh
index c3eaa27..ea31d43 100755
--- a/opendj-sdk/opends/resource/bin/import-ldif.sh
+++ b/opendj-sdk/opends/resource/bin/import-ldif.sh
@@ -70,5 +70,5 @@
${JAVA_BIN} ${JAVA_ARGS} org.opends.server.tools.ImportLDIF \
- --configClass org.opends.server.config.ConfigFileHandler \
+ --configClass org.opends.server.extensions.ConfigFileHandler \
--configFile ${INSTANCE_ROOT}/config/config.ldif "${@}"
diff --git a/opendj-sdk/opends/resource/bin/makeldif.bat b/opendj-sdk/opends/resource/bin/makeldif.bat
index af16937..73054df 100755
--- a/opendj-sdk/opends/resource/bin/makeldif.bat
+++ b/opendj-sdk/opends/resource/bin/makeldif.bat
@@ -50,7 +50,7 @@
cd %DIR_HOME%
-%JAVA_BIN% %JAVA_ARGS% -classpath "%CLASSPATH%" org.opends.server.tools.makeldif.MakeLDIF --configClass org.opends.server.config.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" --resourcePath "%DIR_HOME%\config\MakeLDIF" %*
+%JAVA_BIN% %JAVA_ARGS% -classpath "%CLASSPATH%" org.opends.server.tools.makeldif.MakeLDIF --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" --resourcePath "%DIR_HOME%\config\MakeLDIF" %*
:end
diff --git a/opendj-sdk/opends/resource/bin/makeldif.sh b/opendj-sdk/opends/resource/bin/makeldif.sh
index 53f665d..447b7de 100755
--- a/opendj-sdk/opends/resource/bin/makeldif.sh
+++ b/opendj-sdk/opends/resource/bin/makeldif.sh
@@ -70,6 +70,6 @@
${JAVA_BIN} ${JAVA_ARGS} org.opends.server.tools.makeldif.MakeLDIF \
- --configClass org.opends.server.config.ConfigFileHandler \
+ --configClass org.opends.server.extensions.ConfigFileHandler \
--configFile ${INSTANCE_ROOT}/config/config.ldif \
--resourcePath ${INSTANCE_ROOT}/config/MakeLDIF "${@}"
diff --git a/opendj-sdk/opends/resource/bin/restore.bat b/opendj-sdk/opends/resource/bin/restore.bat
index 1bf045a..738db37 100644
--- a/opendj-sdk/opends/resource/bin/restore.bat
+++ b/opendj-sdk/opends/resource/bin/restore.bat
@@ -50,7 +50,7 @@
cd %DIR_HOME%
-%JAVA_BIN% %JAVA_ARGS% -classpath "%CLASSPATH%" org.opends.server.tools.RestoreDB --configClass org.opends.server.config.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %*
+%JAVA_BIN% %JAVA_ARGS% -classpath "%CLASSPATH%" org.opends.server.tools.RestoreDB --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %*
:end
diff --git a/opendj-sdk/opends/resource/bin/restore.sh b/opendj-sdk/opends/resource/bin/restore.sh
index ec9e57c..7df0aaf 100755
--- a/opendj-sdk/opends/resource/bin/restore.sh
+++ b/opendj-sdk/opends/resource/bin/restore.sh
@@ -70,5 +70,5 @@
${JAVA_BIN} ${JAVA_ARGS} org.opends.server.tools.RestoreDB \
- --configClass org.opends.server.config.ConfigFileHandler \
+ --configClass org.opends.server.extensions.ConfigFileHandler \
--configFile ${INSTANCE_ROOT}/config/config.ldif "${@}"
diff --git a/opendj-sdk/opends/resource/bin/start-ds.bat b/opendj-sdk/opends/resource/bin/start-ds.bat
index 7f54881..95808d5 100755
--- a/opendj-sdk/opends/resource/bin/start-ds.bat
+++ b/opendj-sdk/opends/resource/bin/start-ds.bat
@@ -50,7 +50,7 @@
cd %DIR_HOME%
-%JAVA_BIN% %JAVA_ARGS% -classpath "%CLASSPATH%" org.opends.server.core.DirectoryServer --configClass org.opends.server.config.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %*
+%JAVA_BIN% %JAVA_ARGS% -classpath "%CLASSPATH%" org.opends.server.core.DirectoryServer --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %*
:end
diff --git a/opendj-sdk/opends/resource/bin/start-ds.sh b/opendj-sdk/opends/resource/bin/start-ds.sh
index b812052..53a7c45 100755
--- a/opendj-sdk/opends/resource/bin/start-ds.sh
+++ b/opendj-sdk/opends/resource/bin/start-ds.sh
@@ -77,13 +77,13 @@
shift
${JAVA_BIN} ${JAVA_ARGS} \
org.opends.server.core.DirectoryServer \
- --configClass org.opends.server.config.ConfigFileHandler \
+ --configClass org.opends.server.extensions.ConfigFileHandler \
--configFile ${INSTANCE_ROOT}/config/config.ldif \
"$@" 2>&1 | tee -i -a ${INSTANCE_ROOT}/logs/server.out
else
nohup ${JAVA_BIN} ${JAVA_ARGS} \
org.opends.server.core.DirectoryServer \
- --configClass org.opends.server.config.ConfigFileHandler \
+ --configClass org.opends.server.extensions.ConfigFileHandler \
--configFile ${INSTANCE_ROOT}/config/config.ldif \
"$@" >> ${INSTANCE_ROOT}/logs/server.out 2>&1 &
fi
diff --git a/opendj-sdk/opends/resource/bin/verify-index.bat b/opendj-sdk/opends/resource/bin/verify-index.bat
index ece031c..ea25a23 100644
--- a/opendj-sdk/opends/resource/bin/verify-index.bat
+++ b/opendj-sdk/opends/resource/bin/verify-index.bat
@@ -50,7 +50,7 @@
cd %DIR_HOME%
-%JAVA_BIN% %JAVA_ARGS% -classpath "%CLASSPATH%" org.opends.server.tools.VerifyIndex --configClass org.opends.server.config.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %*
+%JAVA_BIN% %JAVA_ARGS% -classpath "%CLASSPATH%" org.opends.server.tools.VerifyIndex --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %*
:end
diff --git a/opendj-sdk/opends/resource/bin/verify-index.sh b/opendj-sdk/opends/resource/bin/verify-index.sh
index 703e3c8..a28caf9 100644
--- a/opendj-sdk/opends/resource/bin/verify-index.sh
+++ b/opendj-sdk/opends/resource/bin/verify-index.sh
@@ -70,5 +70,5 @@
${JAVA_BIN} ${JAVA_ARGS} org.opends.server.tools.VerifyIndex \
- --configClass org.opends.server.config.ConfigFileHandler \
+ --configClass org.opends.server.extensions.ConfigFileHandler \
--configFile ${INSTANCE_ROOT}/config/config.ldif "${@}"
diff --git a/opendj-sdk/opends/resource/config/config.ldif b/opendj-sdk/opends/resource/config/config.ldif
index e105985..2dbd6fa 100644
--- a/opendj-sdk/opends/resource/config/config.ldif
+++ b/opendj-sdk/opends/resource/config/config.ldif
@@ -219,7 +219,7 @@
objectClass: top
objectClass: ds-cfg-backend
ds-cfg-backend-enabled: true
-ds-cfg-backend-class: org.opends.server.config.ConfigFileHandler
+ds-cfg-backend-class: org.opends.server.extensions.ConfigFileHandler
ds-cfg-backend-id: config
ds-cfg-backend-writability-mode: enabled
ds-cfg-backend-base-dn: cn=config
diff --git a/opendj-sdk/opends/resource/setup.bat b/opendj-sdk/opends/resource/setup.bat
index 8bc6272..710f470 100644
--- a/opendj-sdk/opends/resource/setup.bat
+++ b/opendj-sdk/opends/resource/setup.bat
@@ -45,11 +45,11 @@
:setClassPath
-FOR %%x in (%DIR_HOME%\lib\*.jar) DO call "%DIR_HOME%\bin\setcp.bat" %%x
+FOR %%x in ("%DIR_HOME%\lib\*.jar") DO call "%DIR_HOME%\bin\setcp.bat" %%x
cd %DIR_HOME%
-%JAVA_BIN% %JAVA_ARGS% -classpath "%CLASSPATH%" org.opends.server.tools.InstallDS --configClass org.opends.server.config.ConfigFileHandler --configFile %DIR_HOME%\config\config.ldif -P setup.bat %*
+%JAVA_BIN% %JAVA_ARGS% -classpath "%CLASSPATH%" org.opends.server.tools.InstallDS --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" -P setup.bat %*
:end
diff --git a/opendj-sdk/opends/resource/setup.sh b/opendj-sdk/opends/resource/setup.sh
index c058c76..90a3487 100755
--- a/opendj-sdk/opends/resource/setup.sh
+++ b/opendj-sdk/opends/resource/setup.sh
@@ -96,6 +96,6 @@
${JAVA_BIN} ${JAVA_ARGS} org.opends.server.tools.InstallDS \
- --configClass org.opends.server.config.ConfigFileHandler \
+ --configClass org.opends.server.extensions.ConfigFileHandler \
--configFile ${INSTANCE_ROOT}/config/config.ldif -P ${0} "${@}"
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java b/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
index d2be582..e2c0e13 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -79,9 +79,9 @@
import org.opends.server.backends.RootDSEBackend;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
-import org.opends.server.config.ConfigFileHandler;
import org.opends.server.config.StringConfigAttribute;
import org.opends.server.config.JMXMBean;
+import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.extensions.JMXAlertHandler;
import org.opends.server.loggers.StartupDebugLogger;
import org.opends.server.loggers.StartupErrorLogger;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/ConfigFileHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
similarity index 99%
rename from opendj-sdk/opends/src/server/org/opends/server/config/ConfigFileHandler.java
rename to opendj-sdk/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
index a2dca3f..9e045a1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/ConfigFileHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006 Sun Microsystems, Inc.
*/
-package org.opends.server.config;
+package org.opends.server.extensions;
@@ -61,6 +61,9 @@
import org.opends.server.api.ConfigDeleteListener;
import org.opends.server.api.ConfigHandler;
import org.opends.server.api.ConfigurableComponent;
+import org.opends.server.config.ConfigEntry;
+import org.opends.server.config.ConfigException;
+import org.opends.server.config.JMXMBean;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
@@ -114,7 +117,7 @@
* The fully-qualified name of this class for debugging purposes.
*/
private static final String CLASS_NAME =
- "org.opends.server.config.ConfigFileHandler";
+ "org.opends.server.extensions.ConfigFileHandler";
diff --git a/opendj-sdk/opends/src/server/org/opends/server/messages/ToolMessages.java b/opendj-sdk/opends/src/server/org/opends/server/messages/ToolMessages.java
index 545d0c9..97c9ca2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/messages/ToolMessages.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/messages/ToolMessages.java
@@ -28,7 +28,7 @@
-import org.opends.server.config.ConfigFileHandler;
+import org.opends.server.extensions.ConfigFileHandler;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.tools.ToolConstants.*;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/BackUpDB.java b/opendj-sdk/opends/src/server/org/opends/server/tools/BackUpDB.java
index 1839f1c..8304ed0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/BackUpDB.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/BackUpDB.java
@@ -40,12 +40,12 @@
import org.opends.server.api.Backend;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
-import org.opends.server.config.ConfigFileHandler;
import org.opends.server.config.DNConfigAttribute;
import org.opends.server.config.StringConfigAttribute;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
+import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.loggers.StartupErrorLogger;
import org.opends.server.types.BackupConfig;
import org.opends.server.types.BackupDirectory;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureDS.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureDS.java
index 9e95008..8ec5e5d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureDS.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureDS.java
@@ -32,12 +32,12 @@
import org.opends.server.api.ConfigHandler;
import org.opends.server.config.ConfigEntry;
-import org.opends.server.config.ConfigFileHandler;
import org.opends.server.config.DNConfigAttribute;
import org.opends.server.config.IntegerConfigAttribute;
import org.opends.server.config.StringConfigAttribute;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
+import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.extensions.SaltedSHA512PasswordStorageScheme;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/EncodePassword.java b/opendj-sdk/opends/src/server/org/opends/server/tools/EncodePassword.java
index a29a2e6..7a864c6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/EncodePassword.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/EncodePassword.java
@@ -34,10 +34,10 @@
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
-import org.opends.server.config.ConfigFileHandler;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.PasswordStorageSchemeConfigManager;
+import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.schema.AuthPasswordSyntax;
import org.opends.server.types.ByteString;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java
index 5e4ec3e..2dbc3fc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java
@@ -36,12 +36,12 @@
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
-import org.opends.server.config.ConfigFileHandler;
import org.opends.server.config.DNConfigAttribute;
import org.opends.server.config.StringConfigAttribute;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
+import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.loggers.StartupErrorLogger;
import org.opends.server.types.AttributeType;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java
index c4a44c2..a40cfb1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java
@@ -38,12 +38,12 @@
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
-import org.opends.server.config.ConfigFileHandler;
import org.opends.server.config.DNConfigAttribute;
import org.opends.server.config.StringConfigAttribute;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
+import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.loggers.StartupErrorLogger;
import org.opends.server.tools.makeldif.TemplateFile;
import org.opends.server.types.AttributeType;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
index b739659..bd5545f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
@@ -36,8 +36,8 @@
import java.util.Arrays;
import java.util.LinkedList;
-import org.opends.server.config.ConfigFileHandler;
import org.opends.server.core.DirectoryServer;
+import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.types.DN;
import org.opends.server.types.ExistingFileBehavior;
import org.opends.server.types.LDIFExportConfig;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFDiff.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFDiff.java
index abe843c..50ff1d2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFDiff.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFDiff.java
@@ -35,8 +35,8 @@
import java.util.List;
import java.util.TreeMap;
-import org.opends.server.config.ConfigFileHandler;
import org.opends.server.core.DirectoryServer;
+import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFModify.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFModify.java
index 55cde7f..425219d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFModify.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFModify.java
@@ -37,8 +37,8 @@
import java.util.Map;
import java.util.TreeMap;
-import org.opends.server.config.ConfigFileHandler;
import org.opends.server.core.DirectoryServer;
+import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.protocols.ldap.LDAPException;
import org.opends.server.protocols.ldap.LDAPModification;
import org.opends.server.protocols.ldap.LDAPResultCode;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFSearch.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFSearch.java
index 77e0c54..ae48bb6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFSearch.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFSearch.java
@@ -33,8 +33,8 @@
import java.util.LinkedHashSet;
import java.util.LinkedList;
-import org.opends.server.config.ConfigFileHandler;
import org.opends.server.core.DirectoryServer;
+import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.AttributeType;
import org.opends.server.types.DN;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/RestoreDB.java b/opendj-sdk/opends/src/server/org/opends/server/tools/RestoreDB.java
index 84c0672..bd55839 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/RestoreDB.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/RestoreDB.java
@@ -38,12 +38,12 @@
import org.opends.server.api.Backend;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
-import org.opends.server.config.ConfigFileHandler;
import org.opends.server.config.DNConfigAttribute;
import org.opends.server.config.StringConfigAttribute;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
+import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.loggers.StartupErrorLogger;
import org.opends.server.types.BackupDirectory;
import org.opends.server.types.BackupInfo;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/VerifyIndex.java b/opendj-sdk/opends/src/server/org/opends/server/tools/VerifyIndex.java
index e04f1a0..26c0c9f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/VerifyIndex.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/VerifyIndex.java
@@ -33,12 +33,12 @@
import org.opends.server.backends.jeb.VerifyConfig;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
-import org.opends.server.config.ConfigFileHandler;
import org.opends.server.config.DNConfigAttribute;
import org.opends.server.config.StringConfigAttribute;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
+import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.loggers.StartupErrorLogger;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/build.xml b/opendj-sdk/opends/tests/integration-tests-testng/build.xml
index e6b57a3..67eea5f 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/build.xml
+++ b/opendj-sdk/opends/tests/integration-tests-testng/build.xml
@@ -201,7 +201,7 @@
<!-- provide the arguments here -->
<arg value="--configClass" />
- <arg value="org.opends.server.config.ConfigFileHandler" />
+ <arg value="org.opends.server.extensions.ConfigFileHandler" />
<arg value="--configFile" />
<arg value="${full.install.dir}/config/config.ldif" />
<arg line="-p ${port.ldap}" />
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendStartupTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendStartupTests.java
index af3f897..0cf7b20 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendStartupTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendStartupTests.java
@@ -80,7 +80,7 @@
System.out.println("*********************************************");
System.out.println("Backend Startup test 1");
String datafile = integration_test_home + "/backend/data/backend_start.ldif";
- String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile};
+ String import_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile};
stopOpenDS(dsee_home, port);
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackupTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackupTests.java
index 3ceb28a..f1dbcee 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackupTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackupTests.java
@@ -83,7 +83,7 @@
System.out.println("*********************************************");
System.out.println("Backup Test 1");
String datafile = backupDir + "/backup1";
- String backup_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--backupDirectory", datafile};
+ String backup_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--backupDirectory", datafile};
ds_output.redirectOutput(logDir, "BackupTest1.txt");
int retCode = BackUpDB.mainBackUpDB(backup_args);
@@ -137,7 +137,7 @@
ds_output.resetOutput();
datafile = backupDir + "/backup1";
- String backup_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--backupDirectory", datafile, "--incremental"};
+ String backup_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--backupDirectory", datafile, "--incremental"};
ds_output.redirectOutput(logDir, "BackupTest2.txt");
int retCode = BackUpDB.mainBackUpDB(backup_args);
@@ -181,7 +181,7 @@
GregorianCalendar cal = new GregorianCalendar();
backup_id = Integer.toString(cal.get(Calendar.MILLISECOND));
String datafile = backupDir + "/backup2";
- String backup_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--backupDirectory", datafile, "--backupID", backup_id};
+ String backup_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--backupDirectory", datafile, "--backupID", backup_id};
ds_output.redirectOutput(logDir, "BackupTest3.txt");
int retCode = BackUpDB.mainBackUpDB(backup_args);
@@ -238,7 +238,7 @@
ds_output.resetOutput();
datafile = backupDir + "/backup2";
- String backup_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--backupDirectory", datafile, "--incremental", "--incrementalBaseID", backup_id};
+ String backup_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--backupDirectory", datafile, "--incremental", "--incrementalBaseID", backup_id};
ds_output.redirectOutput(logDir, "BackupTest4.txt");
int retCode = BackUpDB.mainBackUpDB(backup_args);
@@ -280,7 +280,7 @@
System.out.println("*********************************************");
System.out.println("Backup Test 5");
String datafile = backupDir + "/backup1";
- String backup_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--backupDirectory", datafile, "--compress"};
+ String backup_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--backupDirectory", datafile, "--compress"};
ds_output.redirectOutput(logDir, "BackupTest5.txt");
int retCode = BackUpDB.mainBackUpDB(backup_args);
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTests.java
index 425a9bd..9edde53 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTests.java
@@ -83,7 +83,7 @@
{
System.out.println("*********************************************");
System.out.println("Export Test 1");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_1_and_2.out"};
+ String export_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_1_and_2.out"};
ds_output.redirectOutput(logDir, "ExportTest1.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -129,7 +129,7 @@
{
System.out.println("*********************************************");
System.out.println("Export Test 2");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_1_and_2.out", "--appendToLDIF"};
+ String export_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_1_and_2.out", "--appendToLDIF"};
ds_output.redirectOutput(logDir, "ExportTest2.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -175,7 +175,7 @@
{
System.out.println("*********************************************");
System.out.println("Export Test 3");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_3.out", "--includeAttribute", "telephoneNumber"};
+ String export_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_3.out", "--includeAttribute", "telephoneNumber"};
ds_output.redirectOutput(logDir, "ExportTest3.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -221,7 +221,7 @@
{
System.out.println("*********************************************");
System.out.println("Export Test 4");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_4.out", "--includeAttribute", "telephonenumber", "--includeAttribute", "mail", "--includeAttribute", "roomnumber"};
+ String export_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_4.out", "--includeAttribute", "telephonenumber", "--includeAttribute", "mail", "--includeAttribute", "roomnumber"};
ds_output.redirectOutput(logDir, "ExportTest4.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -267,7 +267,7 @@
{
System.out.println("*********************************************");
System.out.println("Export Test 5");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_5.out", "--excludeAttribute", "telephonenumber"};
+ String export_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_5.out", "--excludeAttribute", "telephonenumber"};
ds_output.redirectOutput(logDir, "ExportTest5.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -313,7 +313,7 @@
{
System.out.println("*********************************************");
System.out.println("Export Test 6");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_6.out", "--excludeAttribute", "telephonenumber", "--excludeAttribute", "mail", "--excludeAttribute", "roomnumber"};
+ String export_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_6.out", "--excludeAttribute", "telephonenumber", "--excludeAttribute", "mail", "--excludeAttribute", "roomnumber"};
ds_output.redirectOutput(logDir, "ExportTest6.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -359,7 +359,7 @@
{
System.out.println("*********************************************");
System.out.println("Export Test 7");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_7.out", "--includeFilter", "(&(uid=jwalker)(roomnumber=*))"};
+ String export_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_7.out", "--includeFilter", "(&(uid=jwalker)(roomnumber=*))"};
ds_output.redirectOutput(logDir, "ExportTest7.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -405,7 +405,7 @@
{
System.out.println("*********************************************");
System.out.println("Export Test 8");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_8.out", "--includeFilter", "(&(uid=jwalker)(roomnumber=*))", "--includeFilter", "(&(uid=jwalker)(l=Cupertino))", "--includeFilter", "(&(uid=jwallace)(roomnumber=*))"};
+ String export_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_8.out", "--includeFilter", "(&(uid=jwalker)(roomnumber=*))", "--includeFilter", "(&(uid=jwalker)(l=Cupertino))", "--includeFilter", "(&(uid=jwallace)(roomnumber=*))"};
ds_output.redirectOutput(logDir, "ExportTest8.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -451,7 +451,7 @@
{
System.out.println("*********************************************");
System.out.println("Export Test 9");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_9.out", "--excludeFilter", "(&(uid=jwalker)(roomnumber=*))"};
+ String export_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_9.out", "--excludeFilter", "(&(uid=jwalker)(roomnumber=*))"};
ds_output.redirectOutput(logDir, "ExportTest9.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -497,7 +497,7 @@
{
System.out.println("*********************************************");
System.out.println("Export Test 10");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "//export_test_10.out", "--excludeFilter", "(&(uid=jwalker)(roomnumber=*))", "--excludeFilter", "(&(uid=jwalker)(l=Cupertino))", "--excludeFilter", "(&(uid=jwallace)(roomnumber=*))"};
+ String export_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "//export_test_10.out", "--excludeFilter", "(&(uid=jwalker)(roomnumber=*))", "--excludeFilter", "(&(uid=jwalker)(l=Cupertino))", "--excludeFilter", "(&(uid=jwallace)(roomnumber=*))"};
ds_output.redirectOutput(logDir, "ExportTest10.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -543,7 +543,7 @@
{
System.out.println("*********************************************");
System.out.println("Export Test 11");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_11.out", "--includeBranch", "o=backend tests,dc=example,dc=com"};
+ String export_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_11.out", "--includeBranch", "o=backend tests,dc=example,dc=com"};
ds_output.redirectOutput(logDir, "ExportTest11.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -589,7 +589,7 @@
{
System.out.println("*********************************************");
System.out.println("Export Test 12");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_12.out", "--excludeBranch", "ou=People,o=backend tests,dc=example,dc=com"};
+ String export_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_12.out", "--excludeBranch", "ou=People,o=backend tests,dc=example,dc=com"};
ds_output.redirectOutput(logDir, "ExportTest12.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -637,7 +637,7 @@
{
System.out.println("*********************************************");
System.out.println("Export Test 13");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_13.out", "--excludeFilter", "(&(uid=jwalker)(roomnumber=*))", "--includeAttribute", "telephonenumber", "--includeBranch", "o=backend tests,dc=example,dc=com"};
+ String export_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_13.out", "--excludeFilter", "(&(uid=jwalker)(roomnumber=*))", "--includeAttribute", "telephonenumber", "--includeBranch", "o=backend tests,dc=example,dc=com"};
ds_output.redirectOutput(logDir, "ExportTest13.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -685,7 +685,7 @@
{
System.out.println("*********************************************");
System.out.println("Export Test 14");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_14.out", "--includeFilter", "(&(uid=jwalker)(roomnumber=*))", "--excludeAttribute", "telephonenumber", "--excludeBranch", "ou=groups,o=backend tests,dc=example,dc=com"};
+ String export_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_14.out", "--includeFilter", "(&(uid=jwalker)(roomnumber=*))", "--excludeAttribute", "telephonenumber", "--excludeBranch", "ou=groups,o=backend tests,dc=example,dc=com"};
ds_output.redirectOutput(logDir, "ExportTest14.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -731,7 +731,7 @@
{
System.out.println("*********************************************");
System.out.println("Export Test 15");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_15.out", "--compressLDIF"};
+ String export_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_15.out", "--compressLDIF"};
ds_output.redirectOutput(logDir, "ExportTest15.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests.java
index f5415a3..73f5173 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests.java
@@ -81,7 +81,7 @@
System.out.println("*********************************************");
System.out.println("Import Test 1");
String datafile = integration_test_home + "/backend/data/import.ldif.01";
- String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile};
+ String import_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile};
stopOpenDS(dsee_home, port);
@@ -220,7 +220,7 @@
System.out.println("*********************************************");
System.out.println("Import Test 2");
String datafile = integration_test_home + "/backend/data/import.ldif.02";
- String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--append"};
+ String import_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--append"};
stopOpenDS(dsee_home, port);
ds_output.redirectOutput(logDir, "ImportTest2.txt");
@@ -359,7 +359,7 @@
System.out.println("*********************************************");
System.out.println("Import Test 3");
String datafile = integration_test_home + "/backend/data/import.ldif.03";
- String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--includeAttribute", "sn", "--includeAttribute", "cn", "--includeAttribute", "ou", "--append"};
+ String import_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--includeAttribute", "sn", "--includeAttribute", "cn", "--includeAttribute", "ou", "--append"};
stopOpenDS(dsee_home, port);
@@ -499,7 +499,7 @@
System.out.println("*********************************************");
System.out.println("Import Test 4");
String datafile = integration_test_home + "/backend/data/import.ldif.04";
- String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--excludeAttribute", "telephonenumber", "--append"};
+ String import_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--excludeAttribute", "telephonenumber", "--append"};
stopOpenDS(dsee_home, port);
@@ -639,7 +639,7 @@
System.out.println("*********************************************");
System.out.println("Import Test 5");
String datafile = integration_test_home + "/backend/data/import.ldif.05";
- String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--excludeAttribute", "telephonenumber", "--excludeAttribute", "mail", "--excludeAttribute", "roomnumber", "--append"};
+ String import_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--excludeAttribute", "telephonenumber", "--excludeAttribute", "mail", "--excludeAttribute", "roomnumber", "--append"};
stopOpenDS(dsee_home, port);
@@ -779,7 +779,7 @@
System.out.println("*********************************************");
System.out.println("Import Test 6");
String datafile = integration_test_home + "/backend/data/import.ldif.06";
- String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--includeFilter", "(&(uid=prigden6)(telephonenumber=*))", "--append"};
+ String import_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--includeFilter", "(&(uid=prigden6)(telephonenumber=*))", "--append"};
stopOpenDS(dsee_home, port);
@@ -920,7 +920,7 @@
System.out.println("*********************************************");
System.out.println("Import Test 7");
String datafile = integration_test_home + "/backend/data/import.ldif.07";
- String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--includeFilter", "(&(uid=prigden7)(telephonenumber=*))", "--includeFilter", "(&(uid=prigden7)(l=Sunnyvale))", "--includeFilter", "(&(uid=brigden7)(roomnumber=*))", "--append"};
+ String import_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--includeFilter", "(&(uid=prigden7)(telephonenumber=*))", "--includeFilter", "(&(uid=prigden7)(l=Sunnyvale))", "--includeFilter", "(&(uid=brigden7)(roomnumber=*))", "--append"};
stopOpenDS(dsee_home, port);
@@ -1061,7 +1061,7 @@
System.out.println("*********************************************");
System.out.println("Import Test 8");
String datafile = integration_test_home + "/backend/data/import.ldif.08";
- String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--excludeFilter", "(&(uid=prigden8)(telephonenumber=*))", "--append"};
+ String import_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--excludeFilter", "(&(uid=prigden8)(telephonenumber=*))", "--append"};
stopOpenDS(dsee_home, port);
@@ -1202,7 +1202,7 @@
System.out.println("*********************************************");
System.out.println("Import Test 9");
String datafile = integration_test_home + "/backend/data/import.ldif.09";
- String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--excludeFilter", "(&(uid=prigden9)(telephonenumber=*))", "--excludeFilter", "(&(uid=prigden9)(l=Sunnyvale))", "--excludeFilter", "(&(uid=brigden9)(roomnumber=*))", "--append"};
+ String import_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--excludeFilter", "(&(uid=prigden9)(telephonenumber=*))", "--excludeFilter", "(&(uid=prigden9)(l=Sunnyvale))", "--excludeFilter", "(&(uid=brigden9)(roomnumber=*))", "--append"};
stopOpenDS(dsee_home, port);
@@ -1388,7 +1388,7 @@
System.out.println("Import Test 10");
String datafile = integration_test_home + "/backend/data/import.ldif.10";
String branch = "o=branch test two, o=import tests, dc=example,dc=com";
- String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--includeBranch", branch, "--append"};
+ String import_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--includeBranch", branch, "--append"};
stopOpenDS(dsee_home, port);
@@ -1530,7 +1530,7 @@
System.out.println("Import Test 11");
String datafile = integration_test_home + "/backend/data/import.ldif.11";
String branch = "o=branch test four, o=import tests, dc=example,dc=com";
- String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--excludeBranch", branch, "--append"};
+ String import_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--excludeBranch", branch, "--append"};
stopOpenDS(dsee_home, port);
@@ -1673,7 +1673,7 @@
System.out.println("Import Test 12");
String datafile = integration_test_home + "/backend/data/import.ldif.12";
String branch = "o=branch test six, o=import tests, dc=example,dc=com";
- String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--excludeFilter", "(&(uid=prigden)(roomnumber=*))", "--excludeAttribute", "telephonenumber", "--includeBranch", branch, "--append"};
+ String import_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--excludeFilter", "(&(uid=prigden)(roomnumber=*))", "--excludeAttribute", "telephonenumber", "--includeBranch", branch, "--append"};
stopOpenDS(dsee_home, port);
@@ -1867,7 +1867,7 @@
datafile = integration_test_home + "/backend/data/import.ldif.13";
String branch = "o=branch test eight, o=import tests, dc=example,dc=com";
- String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--includeFilter", "(&(uid=prigden)(roomnumber=*))", "--excludeAttribute", "telephonenumber", "--excludeBranch", branch, "--append"};
+ String import_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--includeFilter", "(&(uid=prigden)(roomnumber=*))", "--excludeAttribute", "telephonenumber", "--excludeBranch", branch, "--append"};
stopOpenDS(dsee_home, port);
ds_output.redirectOutput(logDir, "ImportTest13.txt");
@@ -2050,7 +2050,7 @@
System.out.println("*********************************************");
System.out.println("Import Test 14");
String datafile = integration_test_home + "/backend/data/import.compressed.ldif";
- String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--isCompressed", "--append"};
+ String import_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--isCompressed", "--append"};
stopOpenDS(dsee_home, port);
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTests.java
index 5b37bf1..b23b6e6 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTests.java
@@ -83,7 +83,7 @@
System.out.println("*********************************************");
System.out.println("Restore Test 1");
String datafile = integration_test_home + "/backend/data/restore";
- String restore_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backupDirectory", datafile};
+ String restore_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backupDirectory", datafile};
stopOpenDS(dsee_home, port);
@@ -138,7 +138,7 @@
System.out.println("*********************************************");
System.out.println("Restore Test 2");
String datafile = integration_test_home + "/backend/data/restore.compressed";
- String restore_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backupDirectory", datafile};
+ String restore_args[] = {"--configClass", "org.opends.server.extensions.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backupDirectory", datafile};
stopOpenDS(dsee_home, port);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
index b402f99..95108a9 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
@@ -40,10 +40,10 @@
import org.opends.server.backends.MemoryBackend;
import org.opends.server.backends.jeb.BackendImpl;
import org.opends.server.config.ConfigException;
-import org.opends.server.config.ConfigFileHandler;
import org.opends.server.config.ConfigEntry;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
+import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.loggers.Error;
import org.opends.server.loggers.Debug;
import org.opends.server.plugins.InvocationCounterPlugin;
--
Gitblit v1.10.0