From 59019c5bebf449083561385fe95d92cf0c6e62d5 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 13 Jan 2015 13:34:56 +0000
Subject: [PATCH] Removed now duplicate class.
---
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java | 2
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java | 30 -
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectDeleteListener.java | 11
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/MonitorBackend.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/DefaultEntryCache.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/ConfigAddListener.java | 15
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java | 1
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidator.java | 16
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java | 6
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java | 6
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java | 6
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/ConfigDeleteListener.java | 7
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectChangeListenerAdaptor.java | 21
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkQueue.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java | 5
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java | 5
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java | 4
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DummyAlertHandler.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectAddListenerAdaptor.java | 10
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigAddListenerAdaptor.java | 23
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigurationChangeListener.java | 12
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplicationServerListener.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 1
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ListenerTest.java | 8
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/BackendImpl.java | 19
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/ChangeNumberControlPlugin.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/WorkQueueConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java | 1
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/LastModPlugin.java | 6
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java | 1
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/SevenBitCleanPlugin.java | 19
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/AttributeIndex.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/CryptPasswordStorageScheme.java | 3
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/CertificateMapperConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java | 17
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/AggregationPropertyDefinition.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/ConfigChangeListener.java | 7
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java | 1
opendj-sdk/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/LogRotationPolicyConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationConnector.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TraceSettings.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/LDAPADListPlugin.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/CoreConfigManager.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java | 14
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ExternalChangelogDomain.java | 4
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FIFOEntryCache.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VLVIndex.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectAddListener.java | 11
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java | 4
opendj-sdk/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java | 5
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigurationDeleteListener.java | 10
opendj-sdk/opendj3-server-dev/resource/admin/example-plugin/ExamplePlugin.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/RandomPasswordGenerator.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/LoggerConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectChangeListener.java | 14
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AlertHandlerConfigManager.java | 4
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java | 30 -
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/SASLConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidator.java | 13
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/RootDNConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectDeleteListenerAdaptor.java | 10
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/MemberVirtualAttributeProvider.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/RootPrivilegeChangeListener.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java | 5
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/DelayedConfigAddListener.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/CharacterSetPasswordValidator.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigurationAddListener.java | 10
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java | 3
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/MonitorConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordValidatorConfigManager.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java | 10
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/DictionaryPasswordValidator.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/EntryUUIDPlugin.java | 1
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/RootContainer.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/JMXAlertHandler.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/AttributeCleanupPlugin.java | 13
/dev/null | 195 ----------
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java | 3
162 files changed, 389 insertions(+), 644 deletions(-)
diff --git a/opendj-sdk/opendj3-server-dev/resource/admin/example-plugin/ExamplePlugin.java b/opendj-sdk/opendj3-server-dev/resource/admin/example-plugin/ExamplePlugin.java
index a476b6a..8728ca0 100644
--- a/opendj-sdk/opendj3-server-dev/resource/admin/example-plugin/ExamplePlugin.java
+++ b/opendj-sdk/opendj3-server-dev/resource/admin/example-plugin/ExamplePlugin.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package com.example.opends;
@@ -35,7 +35,7 @@
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.config.ConfigException;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationConnector.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationConnector.java
index bb0b113..ba266ee 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationConnector.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationConnector.java
@@ -40,6 +40,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.AddressMask;
import org.opends.server.admin.server.ConfigurationChangeListener;
@@ -57,7 +58,6 @@
import org.opends.server.core.ServerContext;
import org.opends.server.core.SynchronousStrategy;
import org.opends.server.protocols.ldap.LDAPConnectionHandler;
-import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.FilePermission;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/AggregationPropertyDefinition.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/AggregationPropertyDefinition.java
index 6b03a8b..17c73ca 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/AggregationPropertyDefinition.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/AggregationPropertyDefinition.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin;
@@ -59,7 +59,7 @@
import org.opends.server.admin.std.meta.RootCfgDefn;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
/**
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigAddListenerAdaptor.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigAddListenerAdaptor.java
index b2fcb1b..b54c5c4 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigAddListenerAdaptor.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigAddListenerAdaptor.java
@@ -22,37 +22,33 @@
*
*
* Copyright 2007-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.server;
-
-
import java.util.LinkedList;
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.admin.Configuration;
import org.opends.server.admin.Constraint;
import org.opends.server.admin.DecodingException;
import org.opends.server.admin.DefinitionDecodingException;
+import org.opends.server.admin.DefinitionDecodingException.Reason;
import org.opends.server.admin.InstantiableRelationDefinition;
import org.opends.server.admin.ManagedObjectDefinition;
import org.opends.server.admin.ManagedObjectPath;
import org.opends.server.admin.OptionalRelationDefinition;
import org.opends.server.admin.SetRelationDefinition;
-import org.opends.server.admin.DefinitionDecodingException.Reason;
import org.opends.server.api.ConfigAddListener;
import org.opends.server.config.ConfigEntry;
-import org.forgerock.opendj.config.server.ConfigException;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
-import org.forgerock.opendj.ldap.ResultCode;
-
-
/**
* An adaptor class which converts {@link ConfigAddListener} callbacks
@@ -161,6 +157,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry) {
if (optionalRelation != null) {
// Optional managed objects are located directly beneath the
@@ -174,8 +171,7 @@
}
}
- // Cached objects are guaranteed to be from previous acceptable
- // callback.
+ // Cached objects are guaranteed to be from previous acceptable callback.
ConfigChangeResult result = listener
.applyConfigurationAdd(cachedManagedObject);
@@ -203,6 +199,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean configAddIsAcceptable(ConfigEntry configEntry,
LocalizableMessageBuilder unacceptableReason) {
DN dn = configEntry.getDN();
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java
index 2af1441..93b32bf 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.server;
@@ -57,7 +57,7 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java
index ba8b955..61926f6 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.server;
@@ -49,7 +49,7 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigurationAddListener.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigurationAddListener.java
index 817f424..41879e3 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigurationAddListener.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigurationAddListener.java
@@ -22,19 +22,15 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.server;
-import org.forgerock.i18n.LocalizableMessage;
-
-
import java.util.List;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.admin.Configuration;
-import org.opends.server.types.ConfigChangeResult;
-
-
/**
* This interface defines the methods that a Directory Server
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigurationChangeListener.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigurationChangeListener.java
index 383eb1a..72b88f8 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigurationChangeListener.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigurationChangeListener.java
@@ -22,19 +22,15 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.server;
-import org.forgerock.i18n.LocalizableMessage;
-
-
import java.util.List;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.admin.Configuration;
-import org.opends.server.types.ConfigChangeResult;
-
-
/**
* This interface defines the methods that a Directory Server
@@ -63,8 +59,6 @@
public boolean isConfigurationChangeAcceptable(T configuration,
List<LocalizableMessage> unacceptableReasons);
-
-
/**
* Applies the configuration changes to this change listener.
*
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigurationDeleteListener.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigurationDeleteListener.java
index 7006ae8..30ff9f3 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigurationDeleteListener.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigurationDeleteListener.java
@@ -22,19 +22,15 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.server;
-import org.forgerock.i18n.LocalizableMessage;
-
-
import java.util.List;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.admin.Configuration;
-import org.opends.server.types.ConfigChangeResult;
-
-
/**
* This interface defines the methods that a Directory Server
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/DelayedConfigAddListener.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/DelayedConfigAddListener.java
index 6d5d230..ed79493 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/DelayedConfigAddListener.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/DelayedConfigAddListener.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.server;
@@ -33,7 +33,7 @@
import org.opends.server.config.ConfigEntry;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.forgerock.i18n.LocalizableMessageBuilder;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectAddListener.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectAddListener.java
index 488d20a..5de281c 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectAddListener.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectAddListener.java
@@ -22,20 +22,15 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.server;
-
-
-import org.forgerock.i18n.LocalizableMessage;
-
import java.util.List;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.admin.Configuration;
-import org.opends.server.types.ConfigChangeResult;
-
-
/**
* This interface defines the methods that a Directory Server
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectAddListenerAdaptor.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectAddListenerAdaptor.java
index 0b4771c..7bd1677 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectAddListenerAdaptor.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectAddListenerAdaptor.java
@@ -22,19 +22,15 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.server;
-
-
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.admin.Configuration;
-import org.opends.server.types.ConfigChangeResult;
-
-
/**
* An adaptor class which converts
@@ -69,6 +65,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ConfigChangeResult applyConfigurationAdd(
ServerManagedObject<? extends T> mo) {
return listener.applyConfigurationAdd(mo.getConfiguration());
@@ -91,6 +88,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isConfigurationAddAcceptable(
ServerManagedObject<? extends T> mo, List<LocalizableMessage> unacceptableReasons) {
return listener.isConfigurationAddAcceptable(mo.getConfiguration(),
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectChangeListener.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectChangeListener.java
index 349a11f..5df988d 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectChangeListener.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectChangeListener.java
@@ -22,20 +22,15 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.server;
-
-
-import org.forgerock.i18n.LocalizableMessage;
-
import java.util.List;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.admin.Configuration;
-import org.opends.server.types.ConfigChangeResult;
-
-
/**
* This interface defines the methods that a Directory Server
@@ -75,6 +70,5 @@
* @return Returns information about the result of changing the
* server managed object.
*/
- public ConfigChangeResult applyConfigurationChange(
- ServerManagedObject<? extends T> mo);
+ public ConfigChangeResult applyConfigurationChange(ServerManagedObject<? extends T> mo);
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectChangeListenerAdaptor.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectChangeListenerAdaptor.java
index f19ab36..15edf4c 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectChangeListenerAdaptor.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectChangeListenerAdaptor.java
@@ -22,19 +22,15 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.server;
-
-
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.admin.Configuration;
-import org.opends.server.types.ConfigChangeResult;
-
-
/**
* An adaptor class which converts
@@ -64,18 +60,12 @@
this.listener = listener;
}
-
-
- /**
- * {@inheritDoc}
- */
- public ConfigChangeResult applyConfigurationChange(
- ServerManagedObject<? extends T> mo) {
+ /**{@inheritDoc} */
+ @Override
+ public ConfigChangeResult applyConfigurationChange(ServerManagedObject<? extends T> mo) {
return listener.applyConfigurationChange(mo.getConfiguration());
}
-
-
/**
* Gets the configuration change listener associated with this
* adaptor.
@@ -93,6 +83,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isConfigurationChangeAcceptable(
ServerManagedObject<? extends T> mo, List<LocalizableMessage> unacceptableReasons) {
return listener.isConfigurationChangeAcceptable(mo.getConfiguration(),
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectDeleteListener.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectDeleteListener.java
index cb23df6..914c7f3 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectDeleteListener.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectDeleteListener.java
@@ -22,20 +22,15 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.server;
-
-
-import org.forgerock.i18n.LocalizableMessage;
-
import java.util.List;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.admin.Configuration;
-import org.opends.server.types.ConfigChangeResult;
-
-
/**
* This interface defines the methods that a Directory Server
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectDeleteListenerAdaptor.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectDeleteListenerAdaptor.java
index 9fa16f9..10cd6c9 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectDeleteListenerAdaptor.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObjectDeleteListenerAdaptor.java
@@ -22,19 +22,15 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.server;
-
-
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.admin.Configuration;
-import org.opends.server.types.ConfigChangeResult;
-
-
/**
* An adaptor class which converts
@@ -69,6 +65,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ConfigChangeResult applyConfigurationDelete(
ServerManagedObject<? extends T> mo) {
return listener.applyConfigurationDelete(mo.getConfiguration());
@@ -92,6 +89,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isConfigurationDeleteAcceptable(
ServerManagedObject<? extends T> mo, List<LocalizableMessage> unacceptableReasons) {
return listener.isConfigurationDeleteAcceptable(mo.getConfiguration(),
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/ConfigAddListener.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/ConfigAddListener.java
index 02da16c..4810904 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/ConfigAddListener.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/ConfigAddListener.java
@@ -22,16 +22,13 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.api;
-
-
-import org.opends.server.config.ConfigEntry;
-import org.opends.server.types.ConfigChangeResult;
import org.forgerock.i18n.LocalizableMessageBuilder;
-
+import org.forgerock.opendj.config.server.ConfigChangeResult;
+import org.opends.server.config.ConfigEntry;
/**
* This interface defines the methods that a Directory Server
@@ -63,8 +60,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
LocalizableMessageBuilder unacceptableReason);
-
-
/**
* Attempts to apply a new configuration based on the provided added
* entry.
@@ -75,7 +70,5 @@
* @return Information about the result of processing the
* configuration change.
*/
- public ConfigChangeResult applyConfigurationAdd(
- ConfigEntry configEntry);
+ public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry);
}
-
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/ConfigChangeListener.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/ConfigChangeListener.java
index 9263cea..719fa75 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/ConfigChangeListener.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/ConfigChangeListener.java
@@ -22,17 +22,14 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.api;
-
-
import org.opends.server.config.ConfigEntry;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.i18n.LocalizableMessageBuilder;
-
/**
* This interface defines the methods that a Directory Server
* component should implement if it wishes to be able to receive
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/ConfigDeleteListener.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/ConfigDeleteListener.java
index 68b4703..84a09d7 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/ConfigDeleteListener.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/ConfigDeleteListener.java
@@ -22,17 +22,14 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.api;
-
-
import org.opends.server.config.ConfigEntry;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.i18n.LocalizableMessageBuilder;
-
/**
* This interface defines the methods that a Directory Server
* component should implement if it wishes to be able to receive
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java
index 256a582..cd1d510 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.backends;
@@ -32,6 +32,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java
index 970ae01..5913810 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.backends;
@@ -36,6 +36,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/MonitorBackend.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/MonitorBackend.java
index 4cc150c..3f73e9a 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/MonitorBackend.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/MonitorBackend.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.server.backends;
@@ -39,6 +39,7 @@
import org.opends.server.api.Backend;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigEntry;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.*;
import org.opends.server.types.*;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java
index 3040ec2..805ee19 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.backends;
@@ -48,6 +48,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
index bb59752..9d545b6 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.backends;
@@ -70,6 +70,7 @@
import org.opends.server.api.ClientConnection;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.opends.server.config.ConfigEntry;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java
index a5739d5..9d12d63 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.backends;
@@ -63,6 +63,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.TrustStoreBackendCfg;
import org.opends.server.api.Backend;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
index 80bbc25..69ae91f 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
* Portions Copyright 2014 Manuel Gaupp
*/
package org.opends.server.backends.jeb;
@@ -37,6 +37,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.Assertion;
import org.forgerock.opendj.ldap.ByteSequence;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
index 8e7be6b..c94b73d 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.backends.jeb;
@@ -44,6 +44,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
index 81ef8cc..93d7b43 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -34,6 +34,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java
index e8ca3fb..4991477 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java
@@ -39,7 +39,7 @@
import org.opends.server.api.Backend;
import org.opends.server.core.DirectoryServer;
import org.opends.server.monitors.DatabaseEnvironmentMonitor;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.FilePermission;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java
index cd7e2b7..fc6ee5c 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.backends.jeb;
@@ -57,7 +57,7 @@
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/AttributeIndex.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/AttributeIndex.java
index 9c7ec04..0ce0c19 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/AttributeIndex.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/AttributeIndex.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
* Portions Copyright 2014 Manuel Gaupp
*/
package org.opends.server.backends.pluggable;
@@ -33,6 +33,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.Assertion;
import org.forgerock.opendj.ldap.ByteString;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/BackendImpl.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/BackendImpl.java
index 9780f20..a2cd815 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/BackendImpl.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/BackendImpl.java
@@ -22,10 +22,16 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.backends.pluggable;
+import static org.opends.messages.BackendMessages.*;
+import static org.opends.messages.JebMessages.*;
+import static org.opends.server.core.DirectoryServer.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
import java.io.File;
import java.io.IOException;
import java.util.*;
@@ -34,6 +40,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.ResultCode;
@@ -52,12 +59,6 @@
import org.opends.server.extensions.DiskSpaceMonitor;
import org.opends.server.types.*;
-import static org.opends.messages.BackendMessages.*;
-import static org.opends.messages.JebMessages.*;
-import static org.opends.server.core.DirectoryServer.getServerErrorResultCode;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
/**
* This is an implementation of a Directory Server Backend which stores entries
* locally in a Berkeley DB JE database.
@@ -82,9 +83,7 @@
private MonitorProvider<?> rootContainerMonitor;
private DiskSpaceMonitor diskMonitor;
- /**
- * The controls supported by this backend.
- */
+ /** The controls supported by this backend. */
private static final Set<String> supportedControls = new HashSet<String>(Arrays.asList(
OID_SUBTREE_DELETE_CONTROL,
OID_PAGED_RESULTS_CONTROL,
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java
index fe8858c..9bab1ca 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
* Portions copyright 2013 Manuel Gaupp
*/
package org.opends.server.backends.pluggable;
@@ -88,7 +88,7 @@
import org.opends.server.types.AttributeType;
import org.opends.server.types.Attributes;
import org.opends.server.types.CanceledOperationException;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/RootContainer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/RootContainer.java
index 9aa11f5..f7cc86f 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/RootContainer.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/RootContainer.java
@@ -54,7 +54,7 @@
import org.opends.server.backends.pluggable.spi.WriteOperation;
import org.opends.server.backends.pluggable.spi.WriteableStorage;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VLVIndex.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VLVIndex.java
index 4914f13..33a9830 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VLVIndex.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VLVIndex.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.backends.pluggable;
@@ -62,7 +62,7 @@
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
index 2a72246..90c1b2b 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.backends.task;
@@ -45,6 +45,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java
index 23f1bdc..563fc09 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -48,7 +48,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.AccessControlHandler;
import org.opends.server.api.AlertGenerator;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
index 209ccda1..ae65ef6 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -45,7 +45,7 @@
import org.opends.server.admin.std.server.AccountStatusNotificationHandlerCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.AccountStatusNotificationHandler;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AlertHandlerConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AlertHandlerConfigManager.java
index f290cbb..6de4193 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AlertHandlerConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AlertHandlerConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -44,7 +44,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.AlertHandler;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java
index 901dba3..d64637e 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -47,7 +47,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java
index ea199fe..f5e48be 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -53,7 +53,7 @@
import org.opends.server.api.ConfigHandler;
import org.opends.server.config.ConfigConstants;
import org.opends.server.config.ConfigEntry;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/CertificateMapperConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/CertificateMapperConfigManager.java
index c1b5361..af6c52e 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/CertificateMapperConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/CertificateMapperConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -47,7 +47,7 @@
import org.opends.server.admin.std.server.CertificateMapperCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.CertificateMapper;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
index 608f14b..fcc2b3c 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.server.core;
@@ -49,7 +49,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.ConnectionHandler;
import org.opends.server.protocols.ldap.LDAPConnectionHandler;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/CoreConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/CoreConfigManager.java
index b0059eb..0a40199 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/CoreConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/CoreConfigManager.java
@@ -22,13 +22,14 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2015 ForgeRock AS.
*/
package org.opends.server.core;
import java.util.*;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.admin.server.ConfigurationChangeListener;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java
index 7fcdbc3..6ce0f8b 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java
@@ -48,7 +48,7 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.extensions.DefaultEntryCache;
import org.opends.server.monitors.EntryCacheMonitorProvider;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationConfigManager.java
index 2044e1e..789d528 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -44,7 +44,7 @@
import org.opends.server.admin.std.server.ExtendedOperationHandlerCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.ExtendedOperationHandler;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java
index ff6c88b..e61a1c7 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java
@@ -32,6 +32,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java
index a7e0995..7d1cf9d 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -47,7 +47,7 @@
import org.opends.server.admin.std.server.IdentityMapperCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.IdentityMapper;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
index 2f06160..4d46125 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -44,7 +44,7 @@
import org.opends.server.admin.server.ServerManagementContext;
import org.opends.server.api.KeyManagerProvider;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java
index f062205..757d7e5 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -39,7 +39,7 @@
import org.opends.server.admin.server.ConfigurationDeleteListener;
import org.opends.server.admin.ClassPropertyDefinition;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.loggers.RetentionPolicy;
import org.forgerock.opendj.config.server.ConfigException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/LogRotationPolicyConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/LogRotationPolicyConfigManager.java
index cb7da5a..0ce85a1 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/LogRotationPolicyConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/LogRotationPolicyConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
import java.util.List;
@@ -39,7 +39,7 @@
import org.opends.server.admin.std.meta.LogRotationPolicyCfgDefn;
import org.opends.server.admin.ClassPropertyDefinition;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import static org.opends.messages.ConfigMessages.*;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/LoggerConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/LoggerConfigManager.java
index 7f5f24a..c3d1df8 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/LoggerConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/LoggerConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -49,7 +49,7 @@
import org.opends.server.loggers.DebugLogger;
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.HTTPAccessLogger;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.InitializationException;
/**
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java
index 80409ce..e01897e 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -49,7 +49,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/MonitorConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/MonitorConfigManager.java
index 06607d7..6b2df31 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/MonitorConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/MonitorConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.core;
@@ -45,7 +45,7 @@
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.MonitorProvider;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java
index 747a18a..fe9383e 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -47,7 +47,7 @@
import org.opends.server.admin.std.server.PasswordGeneratorCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.PasswordGenerator;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
index a50c259..8451d13 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2015 ForgeRock AS.
*/
package org.opends.server.core;
@@ -34,6 +34,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.admin.ClassPropertyDefinition;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java
index a587622..71473d1 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2015 ForgeRock AS.
*/
package org.opends.server.core;
-
-
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
@@ -39,6 +37,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.GeneralizedTime;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
index d8179be..fd08c1e 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -45,7 +45,7 @@
import org.opends.server.admin.std.server.PasswordStorageSchemeCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.PasswordStorageScheme;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordValidatorConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
index b289bb6..8d085dc 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -47,7 +47,7 @@
import org.opends.server.admin.std.server.PasswordValidatorCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.PasswordValidator;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java
index c31e564..9fab4c3 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -36,6 +36,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.util.Utils;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/RootDNConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/RootDNConfigManager.java
index 2e26952..1ae4db9 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/RootDNConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/RootDNConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
import static org.opends.messages.ConfigMessages.*;
@@ -42,7 +42,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.admin.std.server.RootDNCfg;
import org.opends.server.admin.std.server.RootDNUserCfg;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/RootPrivilegeChangeListener.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/RootPrivilegeChangeListener.java
index bf01ab9..66a6453 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/RootPrivilegeChangeListener.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/RootPrivilegeChangeListener.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -34,7 +34,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.meta.RootDNCfgDefn;
import org.opends.server.admin.std.server.RootDNCfg;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.Privilege;
/**
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/SASLConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/SASLConfigManager.java
index 780ecdc..912a1d5 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/SASLConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/SASLConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -47,7 +47,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.admin.std.server.SASLMechanismHandlerCfg;
import org.opends.server.api.SASLMechanismHandler;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java
index 4caffd6..d24a8d0 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -44,7 +44,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.admin.std.server.SynchronizationProviderCfg;
import org.opends.server.api.SynchronizationProvider;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java
index fbde834..5e23c7d 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -44,7 +44,7 @@
import org.opends.server.admin.server.ServerManagementContext;
import org.opends.server.api.TrustManagerProvider;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java
index accb7f5..2dc835e 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -37,6 +37,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.util.Utils;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/WorkQueueConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/WorkQueueConfigManager.java
index bb7d2ce..9856cc3 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/WorkQueueConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/WorkQueueConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
import java.util.List;
@@ -36,7 +36,7 @@
import org.opends.server.admin.std.server.WorkQueueCfg;
import org.opends.server.api.WorkQueue;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.InitializationException;
import static org.opends.messages.ConfigMessages.*;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
index 368fa2a..3c7d9ff 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
@@ -23,7 +23,7 @@
*
* Copyright 2006-2010 Sun Microsystems, Inc.
* Portions Copyright 2009 Parametric Technology Corporation (PTC)
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.crypto;
@@ -53,6 +53,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ModificationType;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java
index b86af6b..700e830 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -36,6 +36,7 @@
import org.opends.server.admin.std.server.PasswordValidatorCfg;
import org.opends.server.api.PasswordValidator;
import org.opends.server.types.*;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
index 0be1406..46830a1 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2015 ForgeRock AS.
*/
package org.opends.server.extensions;
-
-
import java.security.MessageDigest;
import java.security.SecureRandom;
import java.text.ParseException;
@@ -40,6 +38,7 @@
import org.opends.server.admin.std.server.CramMD5SASLMechanismHandlerCfg;
import org.opends.server.admin.std.server.SASLMechanismHandlerCfg;
import org.opends.server.api.*;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/CharacterSetPasswordValidator.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/CharacterSetPasswordValidator.java
index 819707c..be3f32e 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/CharacterSetPasswordValidator.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/CharacterSetPasswordValidator.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -42,7 +42,7 @@
import org.opends.server.admin.std.server.CharacterSetPasswordValidatorCfg;
import org.opends.server.admin.std.server.PasswordValidatorCfg;
import org.opends.server.api.PasswordValidator;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DirectoryConfig;
import org.opends.server.types.Entry;
import org.opends.server.types.Operation;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
index 2846df0..bf715b7 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -55,6 +55,7 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.LocalizableMessageDescriptor.Arg1;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/CryptPasswordStorageScheme.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/CryptPasswordStorageScheme.java
index 6444422..2424a9e 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/CryptPasswordStorageScheme.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/CryptPasswordStorageScheme.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2010-2014 ForgeRock AS
+ * Portions Copyright 2010-2015 ForgeRock AS
* Portions Copyright 2012 Dariusz Janny <dariusz.janny@gmail.com>
*/
package org.opends.server.extensions;
@@ -36,6 +36,7 @@
import org.opends.server.admin.std.server.CryptPasswordStorageSchemeCfg;
import org.opends.server.admin.std.server.PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/DefaultEntryCache.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/DefaultEntryCache.java
index c975045..c992138 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/DefaultEntryCache.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/DefaultEntryCache.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -40,7 +40,7 @@
import org.opends.server.api.EntryCache;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/DictionaryPasswordValidator.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/DictionaryPasswordValidator.java
index 00a4adf..1ca76ee 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/DictionaryPasswordValidator.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/DictionaryPasswordValidator.java
@@ -23,7 +23,7 @@
*
* Copyright 2008 Sun Microsystems, Inc.
* Portions Copyright 2011 profiq, s.r.o.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -40,6 +40,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.admin.server.ConfigurationChangeListener;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
index 8b76565..3a7b4d1 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -51,7 +51,7 @@
import org.opends.server.api.SASLMechanismHandler;
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java
index 947581a..d615949 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -34,6 +34,7 @@
import java.util.zip.Checksum;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
index 516eddd..adcc199 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -44,7 +44,7 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.AccountStatusNotification;
import org.opends.server.types.AccountStatusNotificationType;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java
index 2b50048..516043c 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -35,6 +35,7 @@
import java.util.Set;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
index 3093a42..6f4927b 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -36,6 +36,7 @@
import org.opends.server.api.CertificateMapper;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.SASLMechanismHandler;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FIFOEntryCache.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FIFOEntryCache.java
index ebeb08c..a367215 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FIFOEntryCache.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FIFOEntryCache.java
@@ -45,7 +45,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
import org.opends.server.types.CacheEntry;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
index 0aa6376..ad9137f 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.extensions;
import org.forgerock.i18n.LocalizableMessage;
@@ -45,7 +45,7 @@
import org.opends.server.api.KeyManagerProvider;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
index 8ec55ee..b6c2a01 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -44,7 +44,7 @@
import org.opends.server.api.TrustManagerProvider;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
index 565c5fb..12396b8 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -35,6 +35,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
index 396dd30..b0c07d6 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -65,7 +65,7 @@
import org.opends.server.api.SASLMechanismHandler;
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/JMXAlertHandler.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/JMXAlertHandler.java
index d09c410..12cc3ac 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/JMXAlertHandler.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/JMXAlertHandler.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -57,7 +57,7 @@
import org.opends.server.config.JMXMBean;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
import static org.opends.messages.ConfigMessages.*;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
index 14cacaf..84d16ed 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2015 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -66,7 +66,7 @@
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.ldap.DereferenceAliasesPolicy;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java
index 736f929..b1daa00 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -34,6 +34,7 @@
import org.opends.server.admin.std.server.LengthBasedPasswordValidatorCfg;
import org.opends.server.admin.std.server.PasswordValidatorCfg;
import org.opends.server.api.PasswordValidator;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/MemberVirtualAttributeProvider.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/MemberVirtualAttributeProvider.java
index 817ab42..4c5b290 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/MemberVirtualAttributeProvider.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/MemberVirtualAttributeProvider.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -43,7 +43,7 @@
import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.Attributes;
import org.opends.server.core.SearchOperation;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
index 8d15bbf..e1f2738 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2013-2014 ForgeRock AS.
+ * Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -44,7 +44,7 @@
import org.opends.server.admin.std.server.PBKDF2PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
import org.opends.server.util.Base64;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
index 65d5187..977f89f 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.extensions;
import org.forgerock.i18n.LocalizableMessage;
@@ -43,7 +43,7 @@
import org.opends.server.api.KeyManagerProvider;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java
index 10b711d..c6a4ab3 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -46,7 +46,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.monitors.ParallelWorkQueueMonitor;
import org.opends.server.types.CancelRequest;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
import org.opends.server.types.Operation;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
index 7472828..1636303 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -39,6 +39,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.io.ASN1;
import org.forgerock.opendj.io.ASN1Reader;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java
index fa7061e..2a4244e 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2015 ForgeRock AS.
*/
package org.opends.server.extensions;
-
-
import static org.opends.messages.CoreMessages.*;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -43,6 +41,7 @@
import org.opends.server.api.AuthenticationPolicyState;
import org.opends.server.api.IdentityMapper;
import org.opends.server.api.SASLMechanismHandler;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/RandomPasswordGenerator.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/RandomPasswordGenerator.java
index 7ccb60a..0bb8321 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/RandomPasswordGenerator.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/RandomPasswordGenerator.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -37,6 +37,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java
index 33faf92..8e06f78 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -42,6 +42,7 @@
import java.util.regex.PatternSyntaxException;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java
index da91fd4..c1edc8f 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java
@@ -22,25 +22,25 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.extensions;
-import org.forgerock.i18n.LocalizableMessage;
-
+import static org.opends.messages.ExtensionMessages.*;
import java.util.List;
import java.util.Set;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.i18n.LocalizableMessageBuilder;
+import org.forgerock.i18n.LocalizableMessage;
+
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.
RepeatedCharactersPasswordValidatorCfg;
import org.opends.server.api.PasswordValidator;
import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ByteString;
-import static org.opends.messages.ExtensionMessages.*;
-import org.forgerock.i18n.LocalizableMessageBuilder;
-
/**
* This class provides an OpenDS password validator that may be used to ensure
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
index ecb4583..bb5035d 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -55,7 +55,7 @@
import org.opends.server.types.AccountStatusNotificationType;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;
import org.opends.server.util.EMailMessage;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java
index 0644a35..db6b721 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -42,7 +42,7 @@
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.AlertHandler;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.InitializationException;
import org.opends.server.util.EMailMessage;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidator.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidator.java
index 86623cf..ba1e39d 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidator.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidator.java
@@ -22,26 +22,26 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.extensions;
-import org.forgerock.i18n.LocalizableMessage;
+
+import static org.opends.messages.ExtensionMessages.*;
import java.util.List;
import java.util.Set;
-import org.opends.server.api.PasswordValidator;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.LocalizableMessageBuilder;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.api.PasswordValidator;
+import org.opends.server.types.*;
import org.opends.server.util.LevenshteinDistance;
import org.opends.server.admin.std.server.SimilarityBasedPasswordValidatorCfg;
import org.opends.server.admin.server.ConfigurationChangeListener;
-import static org.opends.messages.ExtensionMessages.*;
-import org.forgerock.i18n.LocalizableMessageBuilder;
-
-
/**
* This class provides a password validator that can ensure that the provided
* password meets minimum similarity requirements.
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
index 495074e..2e7866c 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
@@ -48,7 +48,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
import org.opends.server.types.CacheEntry;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
index 948492e..48cda98 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
* Portions Copyright 2013 Manuel Gaupp
*/
package org.opends.server.extensions;
@@ -58,7 +58,7 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.internal.SearchRequest;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
index 52cc784..4e956ac 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -37,6 +37,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkQueue.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkQueue.java
index 8f83518..e871684 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkQueue.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkQueue.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -50,7 +50,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.monitors.TraditionalWorkQueueMonitor;
import org.opends.server.types.CancelRequest;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
import org.opends.server.types.Operation;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidator.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidator.java
index 7ca75fb..43833bc 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidator.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidator.java
@@ -22,25 +22,24 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.extensions;
-import org.forgerock.i18n.LocalizableMessage;
-
+import static org.opends.messages.ExtensionMessages.*;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.UniqueCharactersPasswordValidatorCfg;
import org.opends.server.api.PasswordValidator;
import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ByteString;
-import static org.opends.messages.ExtensionMessages.*;
-import org.forgerock.i18n.LocalizableMessageBuilder;
-
/**
* This class provides an OpenDS password validator that may be used to ensure
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
index fe208d0..3b47726 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -30,6 +30,7 @@
import java.util.Set;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.admin.server.ConfigurationChangeListener;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java
index 70dcd1d..39ddaad 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2015 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -45,7 +45,7 @@
import org.opends.server.admin.std.server.LogPublisherCfg;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
import org.opends.server.util.StaticUtils;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
index 279be52..e56de7e 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2011-2014 ForgeRock AS
+ * Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.loggers;
@@ -48,6 +48,7 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.api.Group;
import org.opends.server.authorization.dseecompat.PatternDN;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.*;
import org.opends.server.types.*;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java
index 18ade21..e3b1816 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.loggers;
import static org.opends.messages.LoggerMessages.*;
@@ -36,7 +36,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.FileCountLogRetentionPolicyCfg;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java
index 50d0b20..80539eb 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.loggers;
import java.util.Arrays;
@@ -33,7 +33,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.FixedTimeLogRotationPolicyCfg;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.util.TimeThread;
/**
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
index cd8080b..e638b7d 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.loggers;
@@ -39,7 +39,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.FreeDiskSpaceLogRetentionPolicyCfg;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
/**
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java
index 9e7ec24..6c8ca81 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.loggers;
@@ -47,7 +47,7 @@
import org.opends.server.api.DirectoryThread;
import org.opends.server.api.ServerShutdownListener;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.FilePermission;
import org.opends.server.util.TimeThread;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java
index 53e216c..852c6d0 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.loggers;
import static org.opends.messages.LoggerMessages.*;
@@ -36,7 +36,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.SizeLimitLogRetentionPolicyCfg;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
/**
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java
index ab3054a..1d9c9ee 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.loggers;
import org.forgerock.i18n.LocalizableMessage;
@@ -31,7 +31,7 @@
import org.opends.server.admin.std.server.SizeLimitLogRotationPolicyCfg;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import java.util.List;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
index a33bca3..ea75d10 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.loggers;
@@ -38,6 +38,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java
index fa2fe89..e99da22 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2015 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -38,6 +38,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.FileBasedAuditLogPublisherCfg;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.*;
import org.opends.server.types.*;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java
index 95218a9..0172570 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.loggers;
@@ -41,7 +41,7 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.FilePermission;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
index 4f1ece1..7bf48c6 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -47,7 +47,7 @@
import org.opends.server.admin.std.server.FileBasedErrorLogPublisherCfg;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.FilePermission;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
index 254cebf..cc52227 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.loggers;
@@ -47,7 +47,7 @@
import org.opends.server.admin.std.server.FileBasedHTTPAccessLogPublisherCfg;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.FilePermission;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java
index da44ed9..5ceb78b 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.loggers;
import org.forgerock.i18n.LocalizableMessage;
@@ -30,7 +30,7 @@
import org.opends.server.util.TimeThread;
import org.opends.server.admin.std.server.TimeLimitLogRotationPolicyCfg;
import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import java.util.List;
/**
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TraceSettings.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TraceSettings.java
index 943564b..0270752 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TraceSettings.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/loggers/TraceSettings.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.loggers;
@@ -32,7 +32,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.DebugTargetCfg;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
/**
* This class encapsulates the trace settings in effect at a given tracing scope.
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/AttributeCleanupPlugin.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/AttributeCleanupPlugin.java
index 3010e7a..7cabe86 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/AttributeCleanupPlugin.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/AttributeCleanupPlugin.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2011 profiq s.r.o.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2015 ForgeRock AS.
*/
package org.opends.server.plugins;
-
-
import static org.opends.messages.PluginMessages.*;
import static org.opends.server.util.StaticUtils.toLowerCase;
@@ -37,22 +35,21 @@
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.AttributeCleanupPluginCfg;
import org.opends.server.admin.std.server.PluginCfg;
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
-import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PreParseAddOperation;
import org.opends.server.types.operation.PreParseModifyOperation;
-
-
/**
* The attribute cleanup plugin implementation class. The plugin removes and/or
* renames the configured parameters from the incoming ADD and MODIFY requests.
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/ChangeNumberControlPlugin.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/ChangeNumberControlPlugin.java
index 9cfa907..a438536 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/ChangeNumberControlPlugin.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/ChangeNumberControlPlugin.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
* Portions Copyright 2013 ForgeRock AS
*/
package org.opends.server.plugins;
@@ -45,7 +45,7 @@
import org.forgerock.opendj.io.ASN1Writer;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.protocol.OperationContext;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.Control;
import org.opends.server.types.operation.PostOperationAddOperation;
import org.opends.server.types.operation.PostOperationDeleteOperation;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/EntryUUIDPlugin.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/EntryUUIDPlugin.java
index c897e31..ca5bbfd 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/EntryUUIDPlugin.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/EntryUUIDPlugin.java
@@ -36,6 +36,7 @@
import java.util.UUID;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.schema.AttributeUsage;
import org.opends.server.admin.server.ConfigurationChangeListener;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/LDAPADListPlugin.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/LDAPADListPlugin.java
index aa6ab94..041a720 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/LDAPADListPlugin.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/LDAPADListPlugin.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.plugins;
@@ -41,7 +41,7 @@
import org.opends.server.api.plugin.PluginResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DirectoryConfig;
import org.opends.server.types.ObjectClass;
import org.opends.server.types.operation.PreParseSearchOperation;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/LastModPlugin.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/LastModPlugin.java
index d79c4b8..ae46ab9 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/LastModPlugin.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/LastModPlugin.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.plugins;
-
-
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -43,6 +41,7 @@
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
import org.opends.server.types.operation.PreOperationAddOperation;
@@ -53,7 +52,6 @@
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.util.TimeThread.*;
-
/**
* This class implements a Directory Server plugin that will add the
* creatorsName and createTimestamp attributes to an entry whenever it is added
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
index 611771e..baa8b06 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2015 ForgeRock AS.
*/
package org.opends.server.plugins;
-
-
import static org.opends.messages.PluginMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.extensions.ExtensionsConstants.*;
@@ -51,6 +49,7 @@
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.PasswordPolicy;
@@ -62,7 +61,6 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
-
/**
* This class implements a Directory Server plugin that performs various
* password policy processing during an LDIF import. In particular, it ensures
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index c2a494a..0be99a0 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -50,6 +50,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ModificationType;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java
index 82a7325..9c33da8 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2011-2012 profiq s.r.o.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2015 ForgeRock AS.
*/
package org.opends.server.plugins;
@@ -47,6 +47,7 @@
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.controls.LDAPAssertionRequestControl;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/SevenBitCleanPlugin.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/SevenBitCleanPlugin.java
index d3c649e..9f6e954 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/SevenBitCleanPlugin.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/SevenBitCleanPlugin.java
@@ -22,10 +22,12 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.plugins;
+import static org.opends.messages.PluginMessages.*;
+
import java.util.List;
import java.util.Set;
@@ -37,6 +39,7 @@
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
@@ -47,8 +50,6 @@
import org.opends.server.types.operation.PreParseModifyOperation;
import org.opends.server.types.operation.PreParseModifyDNOperation;
-import static org.opends.messages.PluginMessages.*;
-
/**
* This class implements a Directory Server plugin that can be used to ensure
* that the values for a specified set of attributes (optionally, below a
@@ -59,18 +60,12 @@
extends DirectoryServerPlugin<SevenBitCleanPluginCfg>
implements ConfigurationChangeListener<SevenBitCleanPluginCfg>
{
- /**
- * The bitmask that will be used to make the comparisons.
- */
- private static final byte MASK = (byte) 0x7F;
+ /** The bitmask that will be used to make the comparisons. */
+ private static final byte MASK = 0x7F;
-
-
- // The current configuration for this plugin.
+ /** The current configuration for this plugin. */
private SevenBitCleanPluginCfg currentConfig;
-
-
/**
* Creates a new instance of this Directory Server plugin. Every plugin must
* implement a default constructor (it is the only one that will be used to
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
index a9f9ed3..67d1cd8 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.plugins;
@@ -31,6 +31,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java
index ab41932..97fef61 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.plugins.profiler;
import static org.opends.messages.PluginMessages.*;
@@ -42,7 +42,7 @@
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryConfig;
import org.opends.server.util.TimeThread;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java
index 0c50ae1..2ef0b46 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols;
-
-
import java.io.File;
import java.io.IOException;
import java.util.Collection;
@@ -46,7 +44,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DirectoryConfig;
import org.opends.server.types.DN;
import org.opends.server.types.ExistingFileBehavior;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java
index 025ef3a..f22ffce 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.http;
@@ -59,6 +59,7 @@
import org.forgerock.json.resource.Resources;
import org.forgerock.json.resource.Router;
import org.forgerock.json.resource.servlet.HttpServlet;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
index f1cfac4..3d1cb85 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.protocols.jmx;
@@ -47,7 +47,7 @@
import org.opends.server.api.ConnectionHandler;
import org.opends.server.api.ServerShutdownListener;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.HostPort;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
index ef11dc3..5f1d6a7 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -46,6 +46,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.AddressMask;
import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ExternalChangelogDomain.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ExternalChangelogDomain.java
index ac605c1..c3a248e 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ExternalChangelogDomain.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ExternalChangelogDomain.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -34,7 +34,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.server.ConfigurationDeleteListener;
import org.opends.server.admin.std.server.ExternalChangelogDomainCfg;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.RDN;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java
index 1b34b21..241e899 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -36,6 +36,7 @@
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.plugin.LDAPReplicationDomain.*;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index d2f995a..7e692fa 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -52,6 +52,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DecodeException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
index 9a67737..514c1b7 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
@@ -60,7 +60,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.service.DSRSShutdownSync;
import org.opends.server.types.BackupConfig;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplicationServerListener.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplicationServerListener.java
index 4e8abe1..5047050 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplicationServerListener.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplicationServerListener.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -37,7 +37,7 @@
import org.opends.server.admin.std.server.ReplicationSynchronizationProviderCfg;
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.replication.service.DSRSShutdownSync;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
/**
* This class is used to create and object that can
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
index 203088f..5778463 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -38,6 +38,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java
index d1abe25..29ac03c 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.schema;
@@ -35,6 +35,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java
index 8459a96..a9d235d 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
* Portions Copyright 2013-2014 Manuel Gaupp
*/
package org.opends.server.schema;
@@ -40,7 +40,7 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.io.ASN1;
import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.io.ASN1Reader;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
index 924d330..e0ff470 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
@@ -46,7 +46,7 @@
import org.opends.server.admin.std.server.CollationMatchingRuleCfg;
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java
index 2f36221..cfbfef7 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
* Portions Copyright 2012 Manuel Gaupp
*/
package org.opends.server.schema;
@@ -38,7 +38,7 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java
index 160253b..91454e4 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
import java.util.List;
@@ -37,7 +37,7 @@
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java
index 3f3d999..99af6e2 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java
@@ -22,12 +22,13 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*
*/
package org.opends.server.schema;
-
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.schema.SchemaConstants.*;
import java.util.List;
import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -39,13 +40,10 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;
-import org.opends.server.types.ConfigChangeResult;
-import static org.opends.messages.SchemaMessages.*;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
-import static org.opends.server.schema.SchemaConstants.*;
-
/**
* This class implements the JPEG attribute syntax. This is actually
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
index c0e373f..3e6b98c 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
@@ -22,35 +22,30 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
+
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-
-
import java.util.List;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.TelephoneNumberAttributeSyntaxCfg;
-import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.opends.server.api.AttributeSyntax;
-import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ConfigChangeResult;
-
-
+import org.forgerock.i18n.LocalizableMessageBuilder;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.schema.MatchingRule;
import static org.opends.messages.SchemaMessages.*;
-import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class implements the telephone number attribute syntax, which is defined
* in RFC 2252. Note that this can have two modes of operation, depending on
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/ConfigChangeResult.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/ConfigChangeResult.java
deleted file mode 100644
index d357501..0000000
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/ConfigChangeResult.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS
- */
-package org.opends.server.types;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.ldap.ResultCode;
-
-/**
- * This class defines a data structure that can be used to hold
- * information about the result of processing a configuration change.
- */
-@org.opends.server.types.PublicAPI(
- stability=org.opends.server.types.StabilityLevel.UNCOMMITTED,
- mayInstantiate=true,
- mayExtend=false,
- mayInvoke=true)
-public final class ConfigChangeResult
-{
- /**
- * A set of messages describing the changes that were made, any action that
- * may be required, or any problems that were encountered.
- */
- private final List<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
-
- /**
- * Indicates whether one or more of the changes requires administrative action
- * in order to take effect.
- */
- private boolean adminActionRequired;
-
- /** The result code to return to the client from this configuration change. */
- private ResultCode resultCode = ResultCode.SUCCESS;
-
- /** Creates a new mutable config change result object. */
- public ConfigChangeResult()
- {
- super();
- }
-
- /**
- * Retrieves the result code for this config change result.
- *
- * @return The result code for this config change result.
- */
- public ResultCode getResultCode()
- {
- return resultCode;
- }
-
- /**
- * Specifies the result code for this config change result.
- *
- * @param resultCode The result code for this config change result.
- */
- public void setResultCode(ResultCode resultCode)
- {
- this.resultCode = resultCode;
- }
-
- /**
- * Sets the provided result code for this config change result if the current result code is
- * success.
- *
- * @param newResultCode
- * The new result code for this config change result.
- */
- public void setResultCodeIfSuccess(ResultCode newResultCode)
- {
- if (getResultCode() == ResultCode.SUCCESS)
- {
- setResultCode(newResultCode);
- }
- }
-
- /**
- * Indicates whether administrative action is required before one or
- * more of the changes will take effect.
- *
- * @return <CODE>true</CODE> if one or more of the configuration
- * changes require administrative action to take effect, or
- * <CODE>false</CODE> if not.
- */
- public boolean adminActionRequired()
- {
- return adminActionRequired;
- }
-
- /**
- * Specifies whether administrative action is required before one or
- * more of the changes will take effect.
- *
- * @param adminActionRequired Specifies whether administrative
- * action is required before one or
- * more of the changes will take effect.
- */
- public void setAdminActionRequired(boolean adminActionRequired)
- {
- this.adminActionRequired = adminActionRequired;
- }
-
- /**
- * Retrieves the set of messages that provide explanation for the
- * processing of the configuration changes. This list may be
- * modified by the caller.
- *
- * @return The set of messages that provide explanation for the
- * processing of the configuration changes.
- */
- public List<LocalizableMessage> getMessages()
- {
- return messages;
- }
-
- /**
- * Adds the provided message to the set of messages for this config
- * change result.
- *
- * @param message The message to add to the set of messages for
- * this config change result.
- */
- public void addMessage(LocalizableMessage message)
- {
- messages.add(message);
- }
-
- /**
- * Retrieves a string representation of this config change result.
- *
- * @return A string representation of this config change result.
- */
- @Override
- public String toString()
- {
- StringBuilder buffer = new StringBuilder();
- toString(buffer);
- return buffer.toString();
- }
-
- /**
- * Appends a string representation of this config change result to
- * the provided buffer.
- *
- * @param buffer The buffer to which the information should be
- * appended.
- */
- public void toString(StringBuilder buffer)
- {
- buffer.append("ConfigChangeResult(result=");
- buffer.append(resultCode);
- buffer.append(", adminActionRequired=");
- buffer.append(adminActionRequired);
- buffer.append(", messages={");
-
- if (! messages.isEmpty())
- {
- final Iterator<LocalizableMessage> iterator = messages.iterator();
- buffer.append(iterator.next());
- while (iterator.hasNext())
- {
- buffer.append(",");
- buffer.append(iterator.next());
- }
- }
-
- buffer.append("})");
- }
-}
diff --git a/opendj-sdk/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java b/opendj-sdk/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java
index 2ea532e..497e47e 100644
--- a/opendj-sdk/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java
+++ b/opendj-sdk/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.snmp;
@@ -30,7 +30,6 @@
import java.io.File;
-
import com.sun.management.comm.SnmpV3AdaptorServer;
import com.sun.management.snmp.InetAddressAcl;
import com.sun.management.snmp.SnmpEngineParameters;
@@ -46,7 +45,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.admin.std.server.SNMPConnectionHandlerCfg;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.util.StaticUtils;
import org.forgerock.util.Reject;
diff --git a/opendj-sdk/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java b/opendj-sdk/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java
index 3284497..612fbf0 100644
--- a/opendj-sdk/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java
+++ b/opendj-sdk/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.snmp;
@@ -41,7 +41,7 @@
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ConnectionHandler;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.HostPort;
import org.opends.server.admin.std.server.SNMPConnectionHandlerCfg;
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java
index ec7c967..7b927db 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.admin.server;
@@ -47,7 +47,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java
index a62bdd3..36b2747 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.server;
@@ -43,7 +43,7 @@
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.core.AddOperation;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.Entry;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java
index 9f0255f..fb1426b 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.server;
-
-
import java.util.List;
import java.util.SortedSet;
@@ -43,7 +41,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ListenerTest.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ListenerTest.java
index 2e3adc9..4c994ce 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ListenerTest.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ListenerTest.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.server;
-
-
import static org.testng.Assert.*;
import java.util.List;
@@ -44,15 +42,13 @@
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-
-
/**
* Test cases for listener registration.
*/
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DummyAlertHandler.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DummyAlertHandler.java
index a68e4a8..33a8749 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DummyAlertHandler.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DummyAlertHandler.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -35,7 +35,7 @@
import org.opends.server.admin.std.server.AlertHandlerCfg;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.AlertHandler;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.InitializationException;
/**
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java
index 4293e63..7e8b0cb 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java
@@ -22,11 +22,11 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.extensions;
-
+import static org.testng.Assert.*;
import java.util.ArrayList;
import java.util.HashSet;
@@ -39,17 +39,15 @@
import org.opends.server.TestCaseUtils;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.meta.
- RepeatedCharactersPasswordValidatorCfgDefn;
-import org.opends.server.admin.std.server.
- RepeatedCharactersPasswordValidatorCfg;
+import org.opends.server.admin.std.meta.RepeatedCharactersPasswordValidatorCfgDefn;
+import org.opends.server.admin.std.server.RepeatedCharactersPasswordValidatorCfg;
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Attributes;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
@@ -58,10 +56,6 @@
import org.forgerock.opendj.ldap.ModificationType;
import org.forgerock.opendj.ldap.ResultCode;
-import static org.testng.Assert.*;
-
-
-
/**
* A set of test cases for the repeated characters password validator.
*/
@@ -73,7 +67,7 @@
*
* @throws Exception If an unexpected problem occurs.
*/
- @BeforeClass()
+ @BeforeClass
public void startServer()
throws Exception
{
@@ -270,7 +264,7 @@
*
* @throws Exception If an unexpected problem occurs.
*/
- @Test()
+ @Test
public void testPasswordIsAcceptable2Consecutive()
throws Exception
{
@@ -339,7 +333,7 @@
*
* @throws Exception If an unexpected problem occurs.
*/
- @Test()
+ @Test
public void testPasswordIsAcceptable3Consecutive()
throws Exception
{
@@ -407,7 +401,7 @@
*
* @throws Exception If an unexpected problem occurs.
*/
- @Test()
+ @Test
public void testPasswordIsAcceptableCaseSensitive()
throws Exception
{
@@ -476,7 +470,7 @@
*
* @throws Exception If an unexpected problem occurs.
*/
- @Test()
+ @Test
public void testPasswordIsAcceptableCaseInsensitive()
throws Exception
{
@@ -543,7 +537,7 @@
*
* @throws Exception If an unexpected problem occurs.
*/
- @Test()
+ @Test
public void testPasswordIsAcceptableUnlimitedRepeats()
throws Exception
{
@@ -611,7 +605,7 @@
*
* @throws Exception If an unexpected problem occurs.
*/
- @Test()
+ @Test
public void testPasswordIsAcceptableConfigurationChange()
throws Exception
{
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java
index d458508..ed22eeb 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java
@@ -22,11 +22,11 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.extensions;
-
+import static org.testng.Assert.*;
import java.util.ArrayList;
import java.util.HashSet;
@@ -39,17 +39,15 @@
import org.opends.server.TestCaseUtils;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.meta.
- UniqueCharactersPasswordValidatorCfgDefn;
-import org.opends.server.admin.std.server.
- UniqueCharactersPasswordValidatorCfg;
+import org.opends.server.admin.std.meta.UniqueCharactersPasswordValidatorCfgDefn;
+import org.opends.server.admin.std.server.UniqueCharactersPasswordValidatorCfg;
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Attributes;
import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
@@ -58,10 +56,6 @@
import org.forgerock.opendj.ldap.ModificationType;
import org.forgerock.opendj.ldap.ResultCode;
-import static org.testng.Assert.*;
-
-
-
/**
* A set of test cases for the unique characters password validator.
*/
@@ -73,7 +67,7 @@
*
* @throws Exception If an unexpected problem occurs.
*/
- @BeforeClass()
+ @BeforeClass
public void startServer()
throws Exception
{
@@ -270,7 +264,7 @@
*
* @throws Exception If an unexpected problem occurs.
*/
- @Test()
+ @Test
public void testPasswordIsAcceptable7Unique()
throws Exception
{
@@ -339,7 +333,7 @@
*
* @throws Exception If an unexpected problem occurs.
*/
- @Test()
+ @Test
public void testPasswordIsAcceptable4Unique()
throws Exception
{
@@ -407,7 +401,7 @@
*
* @throws Exception If an unexpected problem occurs.
*/
- @Test()
+ @Test
public void testPasswordIsAcceptableCaseSensitive()
throws Exception
{
@@ -476,7 +470,7 @@
*
* @throws Exception If an unexpected problem occurs.
*/
- @Test()
+ @Test
public void testPasswordIsAcceptableCaseInsensitive()
throws Exception
{
@@ -543,7 +537,7 @@
*
* @throws Exception If an unexpected problem occurs.
*/
- @Test()
+ @Test
public void testPasswordIsAcceptableAnyNumberOfCharacters()
throws Exception
{
@@ -611,7 +605,7 @@
*
* @throws Exception If an unexpected problem occurs.
*/
- @Test()
+ @Test
public void testPasswordIsAcceptableConfigurationChange()
throws Exception
{
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java
index 724cf04..1767c55 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.protocols.jmx;
@@ -56,7 +56,7 @@
import org.opends.server.core.DeleteOperationBasis;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
index eefd9fe..fce47e0 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.schema;
@@ -39,7 +39,7 @@
import org.opends.server.admin.std.server.TelephoneNumberAttributeSyntaxCfg;
import org.opends.server.config.ConfigEntry;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.testng.annotations.DataProvider;
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java
index a98c3ec..2cbb067 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.snmp;
@@ -44,7 +44,7 @@
import org.opends.server.admin.std.server.SNMPConnectionHandlerCfg;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.types.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
import org.opends.server.types.Modification;
--
Gitblit v1.10.0