From 09cf0ade4fd10e5e1e7aa7b220e0b7a616a89cfc Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 04 Apr 2016 13:38:34 +0000
Subject: [PATCH] Switch imports from old config to new config
---
opendj-server-legacy/src/main/java/org/opends/server/schema/DITContentRuleSyntax.java | 2
opendj-server-legacy/src/main/java/org/opends/server/api/PasswordGenerator.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/NullTrustManagerProvider.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/OIDSyntax.java | 4
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java | 2
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationServerListener.java | 10
opendj-server-legacy/src/main/java/org/opends/server/core/VirtualAttributeConfigManager.java | 20
opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/server/ChangelogBaseDNVirtualAttributeProvider.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java | 6
opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplServerFakeConfiguration.java | 8
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java | 14
opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java | 2
opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java | 4
opendj-server-legacy/src/main/java/org/opends/server/api/CertificateMapper.java | 4
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEMonitor.java | 2
opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPInetAddressAcl.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java | 14
opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java | 6
opendj-server-legacy/src/main/java/org/opends/server/monitors/StackTraceMonitorProvider.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java | 2
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ExternalChangelogDomain.java | 8
opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java | 4
opendj-server-legacy/src/main/java/org/opends/server/api/ConnectionHandler.java | 2
opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAudit.java | 37
opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogPublisher.java | 4
opendj-server-legacy/src/test/java/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 9
opendj-server-legacy/src/test/java/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java | 12
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java | 10
opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java | 8
opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java | 8
opendj-server-legacy/src/test/java/org/opends/server/core/GroupManagerTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java | 8
opendj-server-legacy/src/main/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java | 2
opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryConfig.java | 3
opendj-server-legacy/src/main/java/org/opends/server/extensions/BcryptPasswordStorageScheme.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/SoftReferenceEntryCache.java | 6
opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java | 8
opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java | 21
opendj-server-legacy/src/main/java/org/opends/server/schema/DeliveryMethodSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/NullKeyManagerProvider.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactAssertionSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/PrintableStringSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/api/MatchingRuleFactory.java | 4
opendj-server-legacy/src/main/java/org/opends/server/loggers/ConsoleDebugLogPublisher.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java | 7
opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationConnector.java | 20
opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java | 2
opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/JPEGSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java | 24
opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexTypeDescriptor.java | 4
opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBMonitor.java | 2
opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditHTTPAccessLogPublisher.java | 4
opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogPublisher.java | 4
opendj-server-legacy/src/test/java/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java | 6
opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/DummyAlertHandler.java | 6
opendj-server-legacy/src/main/java/org/opends/server/api/AttributeSyntax.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/ConfigFileHandlerTestCase.java | 8
opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java | 6
opendj-server-legacy/src/test/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java | 2
opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 12
opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/FaxNumberSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java | 2
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/CertificatePairSyntax.java | 4
opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java | 8
opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java | 21
opendj-server-legacy/src/main/java/org/opends/server/schema/SubtreeSpecificationSyntax.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java | 8
opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxConnectTest.java | 6
opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java | 8
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java | 10
opendj-server-legacy/src/main/java/org/opends/server/schema/EnhancedGuideSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/server/LightweightServerHandler.java | 2
opendj-server-legacy/src/main/java/org/opends/server/replication/server/LastChangeNumberVirtualAttributeProvider.java | 4
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java | 4
opendj-server-legacy/src/test/java/org/opends/server/replication/server/AssuredReplicationServerTest.java | 4
opendj-server-legacy/src/test/java/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationActionThread.java | 8
opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java | 6
opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java | 21
opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java | 8
opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/StateTest.java | 6
opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/DiskSpaceMonitor.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/NameFormSyntax.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java | 2
opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java | 23
opendj-server-legacy/replace.rb | 18
opendj-server-legacy/src/test/java/org/opends/server/extensions/PBKDF2PasswordStorageSchemeTestCase.java | 10
opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java | 21
opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java | 19
opendj-server-legacy/src/main/java/org/opends/server/core/CoreConfigManager.java | 21
opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java | 8
opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/server/extensions/AnonymousSASLMechanismHandler.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/BackendConfigManager.java | 22
opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java | 6
opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAccountStatusNotificationHandler.java | 4
opendj-server-legacy/src/main/java/org/opends/server/monitors/TraditionalWorkQueueMonitor.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicy.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java | 4
opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java | 4
opendj-server-legacy/src/test/java/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/server/schema/CollationMatchingRuleFactory.java | 4
opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/UTCTimeSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleFactory.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java | 6
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendMonitor.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java | 12
opendj-server-legacy/src/main/java/org/opends/server/core/CertificateMapperConfigManager.java | 24
opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java | 6
opendj-server-legacy/src/test/java/org/opends/server/plugins/ShortCircuitPlugin.java | 4
opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleUseSyntax.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java | 9
opendj-server-legacy/src/main/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java | 4
opendj-server-legacy/src/main/java/org/opends/server/api/IdentityMapper.java | 4
opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java | 10
opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java | 8
opendj-server-legacy/src/main/java/org/opends/server/api/plugin/DirectoryServerPlugin.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendStat.java | 4
opendj-server-legacy/src/main/java/org/opends/server/api/VirtualAttributeProvider.java | 2
opendj-server-legacy/src/main/java/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java | 2
opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java | 21
opendj-server-legacy/src/main/java/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java | 4
opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPUserAcl.java | 6
opendj-server-legacy/src/main/java/org/opends/server/schema/BinarySyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/api/KeyManagerProvider.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java | 2
opendj-server-legacy/src/main/java/org/opends/server/loggers/TextErrorLogPublisher.java | 6
opendj-server-legacy/src/test/java/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java | 8
opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java | 20
opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateListSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationMonitor.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/DITStructureRuleSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/monitors/SystemInfoMonitorProvider.java | 2
opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java | 35
opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditAccessLogPublisher.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java | 6
opendj-server-legacy/src/main/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java | 6
opendj-server-legacy/src/test/java/org/opends/server/core/ConfigurationHandlerTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/PKCS5S2PasswordStorageSchemeTestCase.java | 10
opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java | 6
opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java | 2
opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java | 2
opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java | 21
opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java | 19
opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeRuleTestCase.java | 2
opendj-server-legacy/src/main/java/org/opends/server/tasks/AddSchemaFileTask.java | 2
opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java | 4
opendj-server-legacy/src/main/java/org/opends/server/loggers/FixedTimeRotationPolicy.java | 6
opendj-server-legacy/src/test/java/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java | 13
opendj-server-legacy/src/test/java/org/opends/server/extensions/BcryptPasswordStorageSchemeTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java | 6
opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java | 19
opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java | 6
opendj-server-legacy/src/main/java/org/opends/server/extensions/CancelExtendedOperation.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexPanel.java | 10
opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAlertHandler.java | 8
opendj-server-legacy/src/main/java/org/opends/server/schema/NameAndOptionalUIDSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskBackend.java | 9
opendj-server-legacy/src/main/java/org/opends/server/extensions/StartTLSExtendedOperation.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java | 4
opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBBackend.java | 4
opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java | 2
opendj-server-legacy/src/main/java/org/opends/server/tools/ExportLDIF.java | 2
opendj-server-legacy/src/main/java/org/opends/server/core/WorkQueueConfigManager.java | 19
opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRotationPolicy.java | 6
opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java | 21
opendj-server-legacy/src/main/java/org/opends/server/api/AlertHandler.java | 4
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/NamingConflictTest.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java | 4
opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/pdb/PDBTestCase.java | 4
opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java | 19
opendj-server-legacy/src/main/java/org/opends/server/types/VirtualAttributeRule.java | 4
opendj-server-legacy/src/test/java/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java | 6
opendj-server-legacy/src/test/java/org/opends/server/loggers/AbstractTextAccessLogPublisherTest.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/DefaultEntryCache.java | 4
opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java | 6
opendj-server-legacy/src/main/java/org/opends/server/loggers/RetentionPolicy.java | 4
opendj-server-legacy/src/test/java/org/opends/server/core/PasswordPolicyTestCase.java | 14
opendj-server-legacy/src/test/java/org/opends/server/schema/CertificateSyntaxTest.java | 6
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java | 2
opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyFactory.java | 4
opendj-server-legacy/src/main/java/org/opends/server/api/WorkQueue.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java | 2
opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java | 17
opendj-server-legacy/src/main/java/org/opends/server/api/Group.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java | 4
opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogPublisher.java | 4
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java | 2
opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java | 27
opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java | 21
opendj-server-legacy/src/test/java/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java | 9
opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ID2ChildrenCountTest.java | 6
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java | 26
opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/GroupManager.java | 21
opendj-server-legacy/src/test/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java | 14
opendj-server-legacy/src/main/java/org/opends/server/api/PasswordStorageScheme.java | 4
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java | 4
opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java | 8
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/DomainFakeCfg.java | 10
opendj-server-legacy/src/main/java/org/opends/server/loggers/CsvFileAccessLogPublisher.java | 4
opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java | 6
opendj-server-legacy/src/test/java/org/opends/server/extensions/BlowfishPasswordStorageSchemeTestCase.java | 9
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java | 6
opendj-server-legacy/src/test/java/org/opends/server/monitors/BackendMonitorTestCase.java | 4
opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java | 10
opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogger.java | 8
opendj-server-legacy/src/test/java/org/opends/server/plugins/LDAPADListPluginTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java | 6
opendj-server-legacy/src/main/java/org/opends/server/core/MatchingRuleConfigManager.java | 25
opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPConnectionHandler.java | 6
opendj-server-legacy/src/main/java/org/opends/server/loggers/ExternalAccessLogPublisher.java | 6
opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/plugins/EntryUUIDPlugin.java | 8
opendj-server-legacy/src/test/java/org/opends/server/plugins/DisconnectClientPlugin.java | 4
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/TopologyViewTest.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java | 8
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEBackend.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/LogRetentionPolicyConfigManager.java | 21
opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java | 4
opendj-server-legacy/src/test/java/org/opends/server/monitors/TestMonitorProvider.java | 2
opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java | 18
opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java | 8
opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java | 23
opendj-server-legacy/src/main/java/org/opends/server/schema/OtherMailboxSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java | 4
opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java | 14
opendj-server-legacy/src/test/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java | 12
opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java | 6
opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java | 6
opendj-server-legacy/src/test/java/org/opends/server/extensions/CommonEntryCacheTestCase.java | 2
opendj-server-legacy/src/main/java/org/opends/server/replication/server/LastCookieVirtualProvider.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/IA5StringSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java | 2
opendj-server-legacy/src/main/java/org/opends/server/api/SynchronizationProvider.java | 4
opendj-server-legacy/src/main/java/org/opends/server/protocols/http/CollectClientConnectionsFilter.java | 4
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java | 6
opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java | 8
opendj-server-legacy/src/main/java/org/opends/server/loggers/TextDebugLogPublisher.java | 10
opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java | 6
opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java | 27
opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java | 14
opendj-server-legacy/src/main/java/org/opends/server/api/plugin/InternalDirectoryServerPlugin.java | 2
opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java | 26
opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java | 6
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDB.java | 2
opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/PluggableBackendImplTestCase.java | 10
opendj-server-legacy/src/main/java/org/opends/server/api/ExtendedOperationHandler.java | 4
opendj-server-legacy/src/test/java/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java | 6
opendj-server-legacy/src/test/java/org/opends/server/extensions/FIFOEntryCacheTestCase.java | 6
opendj-server-legacy/src/test/java/org/opends/server/backends/pdb/PDBStorageTest.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS5S2PasswordStorageScheme.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java | 21
opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java | 4
opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/DN2IDTest.java | 6
opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerPlugin.java | 8
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java | 6
opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA512PasswordStorageSchemeTestCase.java | 10
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java | 8
opendj-server-legacy/src/main/java/org/opends/server/tools/BackendToolUtils.java | 38
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java | 6
opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java | 8
opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogPublisher.java | 4
opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogger.java | 8
opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java | 14
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java | 6
opendj-server-legacy/src/main/java/org/opends/server/api/AccessControlHandler.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java | 6
opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java | 6
opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java | 4
opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogger.java | 8
opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyConfigManager.java | 25
opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java | 6
opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAuditLogPublisher.java | 4
opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDBTest.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java | 6
opendj-server-legacy/src/test/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java | 6
opendj-server-legacy/src/test/java/org/opends/server/plugins/LastModPluginTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java | 28
opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java | 4
opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordStorageSchemeTestCase.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/TelexNumberSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java | 6
opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java | 2
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LdapTestCase.java | 8
opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java | 10
opendj-server-legacy/src/main/java/org/opends/server/monitors/VersionMonitorProvider.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java | 6
opendj-server-legacy/src/main/java/org/opends/server/api/TrustManagerProvider.java | 4
opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractLogger.java | 10
opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java | 4
opendj-server-legacy/src/main/java/org/opends/server/loggers/TextHTTPAccessLogPublisher.java | 4
opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalConnectionHandler.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java | 6
opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java | 4
opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java | 8
opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleFactory.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java | 22
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileReplicaDB.java | 2
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java | 32
opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA256PasswordStorageSchemeTestCase.java | 10
opendj-server-legacy/src/main/java/org/opends/server/loggers/LogPublisher.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/SubstringAssertionSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/Uninstaller.java | 20
opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java | 4
opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java | 8
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/IsolationTest.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/GuideSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/monitors/ConnectionHandlerMonitor.java | 4
opendj-server-legacy/src/main/java/org/opends/server/api/PasswordValidator.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java | 58
opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressSyntax.java | 4
opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ControlsTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java | 2
opendj-server-legacy/src/test/java/org/opends/server/plugins/NullPlugin.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tasks/BackupTask.java | 7
opendj-server-legacy/src/main/java/org/opends/server/schema/AciSyntax.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/GetConnectionIDExtendedOperation.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tools/VerifyIndex.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/WhoAmIExtendedOperation.java | 2
opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java | 8
opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java | 6
opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/server/tasks/TaskUtils.java | 31
opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java | 6
opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java | 40
opendj-server-legacy/src/main/java/org/opends/server/extensions/ConfigFileHandler.java | 62
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java | 4
opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogger.java | 8
opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringSyntax.java | 4
opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java | 6
opendj-server-legacy/src/test/java/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java | 6
opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java | 6
opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java | 4
opendj-server-legacy/src/main/java/org/opends/server/monitors/ParallelWorkQueueMonitor.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/PostalAddressSyntax.java | 4
opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java | 4
opendj-server-legacy/src/test/java/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java | 8
opendj-server-legacy/src/main/java/org/opends/server/api/SASLMechanismHandler.java | 4
opendj-server-legacy/src/test/java/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java | 9
opendj-server-legacy/src/test/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java | 12
opendj-server-legacy/src/test/java/org/opends/server/plugins/AttributeCleanupPluginTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java | 6
opendj-server-legacy/src/main/java/org/opends/server/monitors/MemoryUsageMonitorProvider.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java | 4
opendj-server-legacy/src/test/java/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/SupportedAlgorithmSyntax.java | 4
opendj-server-legacy/src/test/java/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java | 9
opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java | 4
opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeLimitRotationPolicy.java | 6
opendj-server-legacy/src/test/java/org/opends/server/extensions/AESPasswordStorageSchemeTestCase.java | 9
opendj-server-legacy/src/main/java/org/opends/server/monitors/EntryCacheMonitorProvider.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java | 6
opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/JETestCase.java | 4
opendj-server-legacy/src/main/java/org/opends/server/api/AccountStatusNotificationHandler.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/LogRotationPolicyConfigManager.java | 21
opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/CountryStringSyntax.java | 4
opendj-server-legacy/src/test/java/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java | 8
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromFile.java | 46
opendj-server-legacy/src/main/java/org/opends/server/schema/AttributeTypeSyntax.java | 4
opendj-server-legacy/src/test/java/org/opends/server/types/PrivilegeTestCase.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/server/FirstChangeNumberVirtualAttributeProvider.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tasks/RestoreTask.java | 3
opendj-server-legacy/src/test/java/org/opends/server/extensions/TripleDESPasswordStorageSchemeTestCase.java | 9
opendj-server-legacy/src/main/java/org/opends/server/schema/FaxSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringSyntax.java | 4
opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java | 12
opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java | 8
opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationPolicy.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java | 6
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ExternalChangelogDomainFakeCfg.java | 10
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRuleFactory.java | 4
opendj-server-legacy/src/test/java/org/opends/server/schema/CountryStringSyntaxTest.java | 8
opendj-server-legacy/src/test/java/org/opends/server/plugins/DelayPreOpPlugin.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/server/tools/ListBackends.java | 12
opendj-server-legacy/src/main/java/org/opends/server/extensions/JMXAlertHandler.java | 6
opendj-server-legacy/src/test/java/org/opends/server/admin/server/AdminTestCaseUtils.java | 4
opendj-server-legacy/src/test/java/org/opends/server/tools/ImportLDIFTestCase.java | 4
opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java | 6
opendj-server-legacy/src/main/java/org/opends/server/loggers/TraceSettings.java | 6
opendj-server-legacy/src/main/java/org/opends/server/api/MonitorProvider.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/RC4PasswordStorageSchemeTestCase.java | 9
opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordModifyExtendedOperation.java | 6
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java | 54
opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java | 2
opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java | 2
opendj-server-legacy/src/main/java/org/opends/server/core/ConfigurationBackend.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java | 6
opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java | 6
opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java | 8
opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeSyntax.java | 4
opendj-server-legacy/src/main/java/org/opends/server/monitors/ClientConnectionMonitorProvider.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java | 16
opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA384PasswordStorageSchemeTestCase.java | 10
opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java | 4
456 files changed, 1,599 insertions(+), 1,710 deletions(-)
diff --git a/opendj-server-legacy/replace.rb b/opendj-server-legacy/replace.rb
index dfa1fa9..2ac9e16 100755
--- a/opendj-server-legacy/replace.rb
+++ b/opendj-server-legacy/replace.rb
@@ -182,7 +182,7 @@
NEW_CONFIG = {
:dirs => JAVA_DIRS + SNMP_DIR,
:extensions => ["java"],
- :stoplist => ["org/opends/server/admin", "api/Config", "MatchingRuleConfigManager"],
+ :stoplist => ["org/opends/server/admin", "api/Config", "MatchingRuleConfigManager", "ConfigEntry"],
:replacements =>
[
/import org.opends.server.admin.std.server\.([^;]+);/,
@@ -194,6 +194,9 @@
/import org.opends.server.admin.std.client\.([^;]+);/,
'import org.forgerock.opendj.server.config.client.\1;',
+ /import org.opends.server.config.ConfigEntry;/,
+ 'import org.opends.server.types.Entry;',
+
/import org.opends.server.admin.client\.(\w+);/,
'import org.forgerock.opendj.config.client.\1;',
@@ -270,7 +273,16 @@
/(\s+)AttributeType (\w+) = (configuration|config|cfg|\w+Cfg).get(\w+)Attribute\(\);/,
'\1AttributeType \2 = \3.get\4Attribute();',
- /^(\s+)public DN dn\(\)/,
+ /\bConfigEntry\b/,
+ 'Entry',
+
+ /configEntry.getEntry\(\)/,
+ 'configEntry',
+
+ /configEntry.getDN\(\)/,
+ 'configEntry.getName()',
+
+ /^(\s+)public DN dn\(\)/,
'\1public org.forgerock.opendj.ldap.DN dn()',
]
@@ -406,7 +418,7 @@
############################### List of replacements to run #################################
- REPLACEMENTS = [ ATTRTYPE ]
+ REPLACEMENTS = [ NEW_CONFIG ]
################################### Processing methods ########################################
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java
index 0fe5b08..1d3dbf4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java
@@ -32,14 +32,14 @@
import org.opends.admin.ads.ADSContext.ServerProperty;
import org.opends.admin.ads.ADSContextException.ErrorType;
-import org.opends.server.admin.ManagedObjectNotFoundException;
-import org.opends.server.admin.client.ManagementContext;
+import org.forgerock.opendj.config.ManagedObjectNotFoundException;
+import org.forgerock.opendj.config.client.ManagementContext;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
-import org.opends.server.admin.client.ldap.LDAPManagementContext;
-import org.opends.server.admin.std.client.LDIFBackendCfgClient;
-import org.opends.server.admin.std.client.RootCfgClient;
-import org.opends.server.admin.std.meta.BackendCfgDefn;
-import org.opends.server.admin.std.meta.LDIFBackendCfgDefn;
+import org.forgerock.opendj.config.client.ldap.LDAPManagementContext;
+import org.forgerock.opendj.server.config.client.LDIFBackendCfgClient;
+import org.forgerock.opendj.server.config.client.RootCfgClient;
+import org.forgerock.opendj.server.config.meta.BackendCfgDefn;
+import org.forgerock.opendj.server.config.meta.LDIFBackendCfgDefn;
import org.opends.server.config.ConfigConstants;
import org.opends.server.crypto.CryptoManagerImpl;
import org.opends.server.types.CryptoManagerException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java
index 36f6c90..307ed5a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.guitools.controlpanel.datamodel;
@@ -26,7 +26,7 @@
import java.util.TreeSet;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.meta.AdministrationConnectorCfgDefn;
+import org.forgerock.opendj.server.config.meta.AdministrationConnectorCfgDefn;
/**
* This class is used to represent a Listener and is aimed to be used by the
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexTypeDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexTypeDescriptor.java
index a942d31..cb6f719 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexTypeDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexTypeDescriptor.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2015 ForgeRock AS.
+ * Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.guitools.controlpanel.datamodel;
@@ -19,7 +19,7 @@
import java.util.LinkedHashSet;
import java.util.Set;
-import org.opends.server.admin.std.meta.BackendIndexCfgDefn;
+import org.forgerock.opendj.server.config.meta.BackendIndexCfgDefn;
import org.opends.server.util.RemoveOnceNewConfigFrameworkIsUsed;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java
index 2a34466..d247958 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java
@@ -21,8 +21,8 @@
import java.util.List;
import org.forgerock.opendj.ldap.SearchScope;
-import org.opends.server.admin.std.meta.BackendVLVIndexCfgDefn;
import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.server.config.meta.BackendVLVIndexCfgDefn;
/**
* The class used to describe the VLV index configuration.
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
index 78b3be4..d1ac934 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
@@ -43,19 +43,19 @@
import org.opends.guitools.controlpanel.ui.ProgressDialog;
import org.opends.guitools.controlpanel.util.ConfigReader;
import org.opends.guitools.controlpanel.util.Utilities;
-import org.opends.server.admin.client.ManagementContext;
+import org.forgerock.opendj.config.client.ManagementContext;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
-import org.opends.server.admin.client.ldap.LDAPManagementContext;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.client.PluggableBackendCfgClient;
-import org.opends.server.admin.std.client.ReplicationDomainCfgClient;
-import org.opends.server.admin.std.client.ReplicationSynchronizationProviderCfgClient;
-import org.opends.server.admin.std.client.RootCfgClient;
-import org.opends.server.admin.std.server.ReplicationDomainCfg;
-import org.opends.server.admin.std.server.ReplicationSynchronizationProviderCfg;
-import org.opends.server.admin.std.server.RootCfg;
+import org.forgerock.opendj.config.client.ldap.LDAPManagementContext;
+import org.forgerock.opendj.config.server.ServerManagementContext;
+import org.forgerock.opendj.server.config.client.PluggableBackendCfgClient;
+import org.forgerock.opendj.server.config.client.ReplicationDomainCfgClient;
+import org.forgerock.opendj.server.config.client.ReplicationSynchronizationProviderCfgClient;
+import org.forgerock.opendj.server.config.client.RootCfgClient;
+import org.forgerock.opendj.server.config.server.ReplicationDomainCfg;
+import org.forgerock.opendj.server.config.server.ReplicationSynchronizationProviderCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.config.ConfigConstants;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.types.Entry;
import org.opends.server.config.DNConfigAttribute;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.DN;
@@ -428,7 +428,7 @@
String backendName = backend.getBackendID();
DN dn = DN.valueOf("ds-cfg-backend-id" + "=" + backendName + ",cn=Backends,cn=config");
- ConfigEntry configEntry = DirectoryServer.getConfigHandler().getConfigEntry(dn);
+ Entry configEntry = DirectoryServer.getConfigHandler().getConfigEntry(dn);
DNConfigAttribute baseDNAttr =
new DNConfigAttribute(
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java
index faf26aa..3873f4b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java
@@ -37,12 +37,12 @@
import org.opends.guitools.controlpanel.ui.ProgressDialog;
import org.opends.guitools.controlpanel.util.ConfigReader;
import org.opends.guitools.controlpanel.util.Utilities;
-import org.opends.server.admin.client.ManagementContext;
+import org.forgerock.opendj.config.client.ManagementContext;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
-import org.opends.server.admin.client.ldap.LDAPManagementContext;
-import org.opends.server.admin.std.client.BackendCfgClient;
-import org.opends.server.admin.std.client.PluggableBackendCfgClient;
-import org.opends.server.admin.std.client.RootCfgClient;
+import org.forgerock.opendj.config.client.ldap.LDAPManagementContext;
+import org.forgerock.opendj.server.config.client.BackendCfgClient;
+import org.forgerock.opendj.server.config.client.PluggableBackendCfgClient;
+import org.forgerock.opendj.server.config.client.RootCfgClient;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.OpenDsException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexPanel.java
index ef90a2b..92d206c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexPanel.java
@@ -56,12 +56,12 @@
import org.opends.guitools.controlpanel.task.Task;
import org.opends.guitools.controlpanel.util.ConfigReader;
import org.opends.guitools.controlpanel.util.Utilities;
-import org.opends.server.admin.client.ManagementContext;
+import org.forgerock.opendj.config.client.ManagementContext;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
-import org.opends.server.admin.client.ldap.LDAPManagementContext;
-import org.opends.server.admin.std.client.BackendCfgClient;
-import org.opends.server.admin.std.client.BackendIndexCfgClient;
-import org.opends.server.admin.std.client.PluggableBackendCfgClient;
+import org.forgerock.opendj.config.client.ldap.LDAPManagementContext;
+import org.forgerock.opendj.server.config.client.BackendCfgClient;
+import org.forgerock.opendj.server.config.client.BackendIndexCfgClient;
+import org.forgerock.opendj.server.config.client.PluggableBackendCfgClient;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.DN;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
index a12a5e4..3b48b0b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
@@ -58,6 +58,8 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.forgerock.opendj.config.LDAPProfile;
+import org.forgerock.opendj.config.client.ManagementContext;
+import org.forgerock.opendj.config.client.ldap.LDAPManagementContext;
import org.forgerock.opendj.ldap.DN;
import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
@@ -75,16 +77,16 @@
import org.opends.quicksetup.Installation;
import org.opends.quicksetup.installer.InstallerHelper;
import org.opends.quicksetup.util.Utils;
-import org.opends.server.admin.AdminException;
+import org.forgerock.opendj.config.AdminException;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
-import org.opends.server.admin.client.ldap.LDAPManagementContext;
-import org.opends.server.admin.std.client.BackendCfgClient;
-import org.opends.server.admin.std.client.BackendIndexCfgClient;
-import org.opends.server.admin.std.client.PluggableBackendCfgClient;
-import org.opends.server.admin.std.client.RootCfgClient;
-import org.opends.server.admin.std.meta.BackendCfgDefn;
-import org.opends.server.admin.std.meta.BackendIndexCfgDefn;
-import org.opends.server.admin.std.meta.BackendIndexCfgDefn.IndexType;
+import org.forgerock.opendj.config.client.ldap.LDAPManagementContext;
+import org.forgerock.opendj.server.config.client.BackendCfgClient;
+import org.forgerock.opendj.server.config.client.BackendIndexCfgClient;
+import org.forgerock.opendj.server.config.client.PluggableBackendCfgClient;
+import org.forgerock.opendj.server.config.client.RootCfgClient;
+import org.forgerock.opendj.server.config.meta.BackendCfgDefn;
+import org.forgerock.opendj.server.config.meta.BackendIndexCfgDefn;
+import org.forgerock.opendj.server.config.meta.BackendIndexCfgDefn.IndexType;
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.tools.BackendCreationHelper;
@@ -997,11 +999,9 @@
getInfo().initializeConfigurationFramework();
final File config = Installation.getLocal().getCurrentConfigurationFile();
final LDAPProfile profile = LDAPProfile.getInstance();
- try (org.forgerock.opendj.config.client.ManagementContext context =
- org.forgerock.opendj.config.client.ldap.LDAPManagementContext.newLDIFManagementContext(config, profile))
+ try (ManagementContext context = LDAPManagementContext.newLDIFManagementContext(config, profile))
{
- final org.forgerock.opendj.server.config.client.BackendCfgClient backend =
- context.getRootConfiguration().getBackend(backendName);
+ final BackendCfgClient backend = context.getRootConfiguration().getBackend(backendName);
final SortedSet<DN> baseDNs = backend.getBaseDN();
baseDNs.add(DN.valueOf(newBaseDN));
backend.setBaseDN(baseDNs);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
index 01047ce..c9c3c0a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
@@ -47,14 +47,14 @@
import org.opends.guitools.controlpanel.task.Task;
import org.opends.guitools.controlpanel.util.ConfigReader;
import org.opends.guitools.controlpanel.util.Utilities;
-import org.opends.server.admin.PropertyException;
-import org.opends.server.admin.client.ManagementContext;
+import org.forgerock.opendj.config.PropertyException;
+import org.forgerock.opendj.config.client.ManagementContext;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
-import org.opends.server.admin.client.ldap.LDAPManagementContext;
-import org.opends.server.admin.std.client.BackendCfgClient;
-import org.opends.server.admin.std.client.BackendIndexCfgClient;
-import org.opends.server.admin.std.client.PluggableBackendCfgClient;
-import org.opends.server.admin.std.meta.BackendIndexCfgDefn;
+import org.forgerock.opendj.config.client.ldap.LDAPManagementContext;
+import org.forgerock.opendj.server.config.client.BackendCfgClient;
+import org.forgerock.opendj.server.config.client.BackendIndexCfgClient;
+import org.forgerock.opendj.server.config.client.PluggableBackendCfgClient;
+import org.forgerock.opendj.server.config.meta.BackendIndexCfgDefn;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.schema.SomeSchemaElement;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
index 7202eda..2cd1692 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
@@ -43,14 +43,14 @@
import org.opends.guitools.controlpanel.task.Task;
import org.opends.guitools.controlpanel.util.ConfigReader;
import org.opends.guitools.controlpanel.util.Utilities;
-import org.opends.server.admin.PropertyException;
-import org.opends.server.admin.client.ManagementContext;
+import org.forgerock.opendj.config.PropertyException;
+import org.forgerock.opendj.config.client.ManagementContext;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
-import org.opends.server.admin.client.ldap.LDAPManagementContext;
-import org.opends.server.admin.std.client.BackendCfgClient;
-import org.opends.server.admin.std.client.BackendVLVIndexCfgClient;
-import org.opends.server.admin.std.client.PluggableBackendCfgClient;
-import org.opends.server.admin.std.meta.BackendVLVIndexCfgDefn;
+import org.forgerock.opendj.config.client.ldap.LDAPManagementContext;
+import org.forgerock.opendj.server.config.client.BackendCfgClient;
+import org.forgerock.opendj.server.config.client.BackendVLVIndexCfgClient;
+import org.forgerock.opendj.server.config.client.PluggableBackendCfgClient;
+import org.forgerock.opendj.server.config.meta.BackendVLVIndexCfgDefn;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.OpenDsException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
index 75b654a..45d8fae 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
@@ -65,12 +65,12 @@
import org.opends.guitools.controlpanel.task.Task;
import org.opends.guitools.controlpanel.util.ConfigReader;
import org.opends.guitools.controlpanel.util.Utilities;
-import org.opends.server.admin.client.ManagementContext;
+import org.forgerock.opendj.config.client.ManagementContext;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
-import org.opends.server.admin.client.ldap.LDAPManagementContext;
-import org.opends.server.admin.std.client.BackendVLVIndexCfgClient;
-import org.opends.server.admin.std.client.PluggableBackendCfgClient;
-import org.opends.server.admin.std.client.RootCfgClient;
+import org.forgerock.opendj.config.client.ldap.LDAPManagementContext;
+import org.forgerock.opendj.server.config.client.BackendVLVIndexCfgClient;
+import org.forgerock.opendj.server.config.client.PluggableBackendCfgClient;
+import org.forgerock.opendj.server.config.client.RootCfgClient;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.OpenDsException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
index 81dd9fb..62f214a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
@@ -55,34 +55,34 @@
import org.opends.guitools.controlpanel.datamodel.VLVIndexDescriptor;
import org.opends.guitools.controlpanel.datamodel.VLVSortOrder;
import org.opends.guitools.controlpanel.task.OnlineUpdateException;
-import org.opends.server.admin.client.AuthorizationException;
-import org.opends.server.admin.client.CommunicationException;
-import org.opends.server.admin.client.ConcurrentModificationException;
-import org.opends.server.admin.client.ManagementContext;
+import org.forgerock.opendj.ldap.LdapException;
+
+import org.forgerock.opendj.config.client.ConcurrentModificationException;
+import org.forgerock.opendj.config.client.ManagementContext;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
-import org.opends.server.admin.client.ldap.LDAPManagementContext;
-import org.opends.server.admin.std.client.AdministrationConnectorCfgClient;
-import org.opends.server.admin.std.client.BackendCfgClient;
-import org.opends.server.admin.std.client.BackendIndexCfgClient;
-import org.opends.server.admin.std.client.BackendVLVIndexCfgClient;
-import org.opends.server.admin.std.client.BackupBackendCfgClient;
-import org.opends.server.admin.std.client.ConnectionHandlerCfgClient;
-import org.opends.server.admin.std.client.HTTPConnectionHandlerCfgClient;
-import org.opends.server.admin.std.client.JMXConnectionHandlerCfgClient;
-import org.opends.server.admin.std.client.LDAPConnectionHandlerCfgClient;
-import org.opends.server.admin.std.client.LDIFBackendCfgClient;
-import org.opends.server.admin.std.client.LDIFConnectionHandlerCfgClient;
-import org.opends.server.admin.std.client.MemoryBackendCfgClient;
-import org.opends.server.admin.std.client.MonitorBackendCfgClient;
-import org.opends.server.admin.std.client.PluggableBackendCfgClient;
-import org.opends.server.admin.std.client.ReplicationDomainCfgClient;
-import org.opends.server.admin.std.client.ReplicationServerCfgClient;
-import org.opends.server.admin.std.client.ReplicationSynchronizationProviderCfgClient;
-import org.opends.server.admin.std.client.RootCfgClient;
-import org.opends.server.admin.std.client.RootDNCfgClient;
-import org.opends.server.admin.std.client.RootDNUserCfgClient;
-import org.opends.server.admin.std.client.SNMPConnectionHandlerCfgClient;
-import org.opends.server.admin.std.client.TaskBackendCfgClient;
+import org.forgerock.opendj.config.client.ldap.LDAPManagementContext;
+import org.forgerock.opendj.server.config.client.AdministrationConnectorCfgClient;
+import org.forgerock.opendj.server.config.client.BackendCfgClient;
+import org.forgerock.opendj.server.config.client.BackendIndexCfgClient;
+import org.forgerock.opendj.server.config.client.BackendVLVIndexCfgClient;
+import org.forgerock.opendj.server.config.client.BackupBackendCfgClient;
+import org.forgerock.opendj.server.config.client.ConnectionHandlerCfgClient;
+import org.forgerock.opendj.server.config.client.HTTPConnectionHandlerCfgClient;
+import org.forgerock.opendj.server.config.client.JMXConnectionHandlerCfgClient;
+import org.forgerock.opendj.server.config.client.LDAPConnectionHandlerCfgClient;
+import org.forgerock.opendj.server.config.client.LDIFBackendCfgClient;
+import org.forgerock.opendj.server.config.client.LDIFConnectionHandlerCfgClient;
+import org.forgerock.opendj.server.config.client.MemoryBackendCfgClient;
+import org.forgerock.opendj.server.config.client.MonitorBackendCfgClient;
+import org.forgerock.opendj.server.config.client.PluggableBackendCfgClient;
+import org.forgerock.opendj.server.config.client.ReplicationDomainCfgClient;
+import org.forgerock.opendj.server.config.client.ReplicationServerCfgClient;
+import org.forgerock.opendj.server.config.client.ReplicationSynchronizationProviderCfgClient;
+import org.forgerock.opendj.server.config.client.RootCfgClient;
+import org.forgerock.opendj.server.config.client.RootDNCfgClient;
+import org.forgerock.opendj.server.config.client.RootDNUserCfgClient;
+import org.forgerock.opendj.server.config.client.SNMPConnectionHandlerCfgClient;
+import org.forgerock.opendj.server.config.client.TaskBackendCfgClient;
import org.opends.server.config.ConfigConstants;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tools.tasks.TaskEntry;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromFile.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromFile.java
index 639c4d6..92fbc40 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromFile.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromFile.java
@@ -42,29 +42,29 @@
import org.opends.guitools.controlpanel.datamodel.VLVIndexDescriptor;
import org.opends.guitools.controlpanel.datamodel.VLVSortOrder;
import org.opends.guitools.controlpanel.task.OfflineUpdateException;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.server.AdministrationConnectorCfg;
-import org.opends.server.admin.std.server.BackendCfg;
-import org.opends.server.admin.std.server.BackendIndexCfg;
-import org.opends.server.admin.std.server.BackendVLVIndexCfg;
-import org.opends.server.admin.std.server.BackupBackendCfg;
-import org.opends.server.admin.std.server.ConnectionHandlerCfg;
-import org.opends.server.admin.std.server.HTTPConnectionHandlerCfg;
-import org.opends.server.admin.std.server.JMXConnectionHandlerCfg;
-import org.opends.server.admin.std.server.LDAPConnectionHandlerCfg;
-import org.opends.server.admin.std.server.LDIFBackendCfg;
-import org.opends.server.admin.std.server.LDIFConnectionHandlerCfg;
-import org.opends.server.admin.std.server.MemoryBackendCfg;
-import org.opends.server.admin.std.server.MonitorBackendCfg;
-import org.opends.server.admin.std.server.PluggableBackendCfg;
-import org.opends.server.admin.std.server.ReplicationDomainCfg;
-import org.opends.server.admin.std.server.ReplicationServerCfg;
-import org.opends.server.admin.std.server.ReplicationSynchronizationProviderCfg;
-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.admin.std.server.SNMPConnectionHandlerCfg;
-import org.opends.server.admin.std.server.TaskBackendCfg;
+import org.forgerock.opendj.config.server.ServerManagementContext;
+import org.forgerock.opendj.server.config.server.AdministrationConnectorCfg;
+import org.forgerock.opendj.server.config.server.BackendCfg;
+import org.forgerock.opendj.server.config.server.BackendIndexCfg;
+import org.forgerock.opendj.server.config.server.BackendVLVIndexCfg;
+import org.forgerock.opendj.server.config.server.BackupBackendCfg;
+import org.forgerock.opendj.server.config.server.ConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.server.HTTPConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.server.JMXConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.server.LDAPConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.server.LDIFBackendCfg;
+import org.forgerock.opendj.server.config.server.LDIFConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.server.MemoryBackendCfg;
+import org.forgerock.opendj.server.config.server.MonitorBackendCfg;
+import org.forgerock.opendj.server.config.server.PluggableBackendCfg;
+import org.forgerock.opendj.server.config.server.ReplicationDomainCfg;
+import org.forgerock.opendj.server.config.server.ReplicationServerCfg;
+import org.forgerock.opendj.server.config.server.ReplicationSynchronizationProviderCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
+import org.forgerock.opendj.server.config.server.RootDNCfg;
+import org.forgerock.opendj.server.config.server.RootDNUserCfg;
+import org.forgerock.opendj.server.config.server.SNMPConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.server.TaskBackendCfg;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.OpenDsException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java
index d78c5a7..f216eae 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java
@@ -31,7 +31,7 @@
import org.opends.guitools.controlpanel.datamodel.ConnectionHandlerDescriptor;
import org.opends.guitools.controlpanel.datamodel.VLVSortOrder;
import org.opends.guitools.controlpanel.task.OfflineUpdateException;
-import org.opends.server.admin.std.meta.AdministrationConnectorCfgDefn;
+import org.forgerock.opendj.server.config.meta.AdministrationConnectorCfgDefn;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tools.tasks.TaskEntry;
import org.forgerock.opendj.ldap.DN;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java
index 65e1279..e9039bd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java
@@ -28,9 +28,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ConditionResult;
-import org.opends.server.admin.std.server.BackendCfg;
+import org.forgerock.opendj.server.config.server.BackendCfg;
import org.opends.server.api.ConfigHandler;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.types.Entry;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
@@ -65,10 +65,10 @@
* The mapping that holds all of the configuration entries that have been read
* from the LDIF file.
*/
- private HashMap<DN,ConfigEntry> configEntries = new HashMap<>();
+ private HashMap<DN,Entry> configEntries = new HashMap<>();
/** The reference to the configuration root entry. */
- private ConfigEntry configRootEntry;
+ private Entry configRootEntry;
/** The server root. */
private String serverRoot;
@@ -87,14 +87,14 @@
/** {@inheritDoc} */
@Override
- public ConfigEntry getConfigEntry(DN entryDN) throws ConfigException
+ public Entry getConfigEntry(DN entryDN) throws ConfigException
{
return configEntries.get(entryDN);
}
/** {@inheritDoc} */
@Override
- public ConfigEntry getConfigRootEntry() throws ConfigException
+ public Entry getConfigRootEntry() throws ConfigException
{
return configRootEntry;
}
@@ -157,7 +157,7 @@
LocalizableMessage message = ERR_CONFIG_FILE_EMPTY.get(f.getAbsolutePath());
throw new InitializationException(message);
}
- configRootEntry = new ConfigEntry(entry, null);
+ configRootEntry = new Entry(entry, null);
baseDNs = new DN[] { configRootEntry.getDN() };
@@ -172,7 +172,7 @@
{
DN entryDN = entry.getName();
DN parentDN = entryDN.parent();
- ConfigEntry parentEntry = null;
+ Entry parentEntry = null;
if (parentDN != null)
{
parentEntry = configEntries.get(parentDN);
@@ -194,7 +194,7 @@
}
else
{
- ConfigEntry configEntry = new ConfigEntry(entry, parentEntry);
+ Entry configEntry = new Entry(entry, parentEntry);
parentEntry.addChild(configEntry);
configEntries.put(entryDN, configEntry);
}
@@ -294,10 +294,10 @@
public Entry getEntry(DN entryDN)
throws DirectoryException
{
- ConfigEntry configEntry = configEntries.get(entryDN);
+ Entry configEntry = configEntries.get(entryDN);
if (configEntry != null)
{
- return configEntry.getEntry();
+ return configEntry;
}
return null;
}
@@ -327,7 +327,7 @@
@Override
public ConditionResult hasSubordinates(DN entryDN) throws DirectoryException
{
- ConfigEntry baseEntry = configEntries.get(entryDN);
+ Entry baseEntry = configEntries.get(entryDN);
if (baseEntry != null)
{
return ConditionResult.valueOf(baseEntry.hasChildren());
@@ -372,7 +372,7 @@
private long numSubordinates(DN entryDN, boolean subtree) throws DirectoryException
{
- final ConfigEntry baseEntry = configEntries.get(entryDN);
+ final Entry baseEntry = configEntries.get(entryDN);
if (baseEntry == null)
{
return -1;
@@ -383,7 +383,7 @@
return baseEntry.getChildren().size();
}
long count = 0;
- for (ConfigEntry child : baseEntry.getChildren().values())
+ for (Entry child : baseEntry.getChildren().values())
{
count += numSubordinates(child.getDN(), true);
count++;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
index 0a093ed..4448a00 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
@@ -113,9 +113,10 @@
import org.opends.quicksetup.Installation;
import org.opends.quicksetup.ui.UIFactory;
import org.opends.quicksetup.util.Utils;
-import org.opends.server.admin.ClassLoaderProvider;
+import org.forgerock.opendj.config.ConfigurationFramework;
import org.opends.server.api.ConfigHandler;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.types.Entry;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
import org.opends.server.schema.SchemaConstants;
import org.opends.server.schema.SomeSchemaElement;
@@ -2314,7 +2315,7 @@
public static void deleteConfigSubtree(ConfigHandler confHandler, DN dn)
throws OpenDsException, ConfigException
{
- ConfigEntry confEntry = confHandler.getConfigEntry(dn);
+ Entry confEntry = confHandler.getConfigEntry(dn);
if (confEntry != null)
{
// Copy the values to avoid problems with this recursive method.
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/Uninstaller.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/Uninstaller.java
index ae8f99f..a854f06 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/Uninstaller.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/Uninstaller.java
@@ -51,17 +51,17 @@
import org.opends.quicksetup.util.ServerController;
import org.opends.quicksetup.util.UIKeyStore;
import org.opends.quicksetup.util.Utils;
-import org.opends.server.admin.AttributeTypePropertyDefinition;
-import org.opends.server.admin.ClassLoaderProvider;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.ManagedObjectNotFoundException;
-import org.opends.server.admin.client.ManagementContext;
+import org.forgerock.opendj.config.AttributeTypePropertyDefinition;
+import org.forgerock.opendj.config.ConfigurationFramework;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.ManagedObjectNotFoundException;
+import org.forgerock.opendj.config.client.ManagementContext;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
-import org.opends.server.admin.client.ldap.LDAPManagementContext;
-import org.opends.server.admin.std.client.ReplicationDomainCfgClient;
-import org.opends.server.admin.std.client.ReplicationServerCfgClient;
-import org.opends.server.admin.std.client.ReplicationSynchronizationProviderCfgClient;
-import org.opends.server.admin.std.client.RootCfgClient;
+import org.forgerock.opendj.config.client.ldap.LDAPManagementContext;
+import org.forgerock.opendj.server.config.client.ReplicationDomainCfgClient;
+import org.forgerock.opendj.server.config.client.ReplicationServerCfgClient;
+import org.forgerock.opendj.server.config.client.ReplicationSynchronizationProviderCfgClient;
+import org.forgerock.opendj.server.config.client.RootCfgClient;
import org.opends.server.core.DirectoryServer;
import org.opends.server.util.DynamicConstants;
import org.opends.server.util.StaticUtils;
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java
index d1c3583..5778e3a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java
@@ -62,23 +62,23 @@
import org.opends.quicksetup.UserData;
import org.opends.quicksetup.util.OutputReader;
import org.opends.quicksetup.util.Utils;
-import org.opends.server.admin.ManagedObjectDefinition;
-import org.opends.server.admin.ManagedObjectNotFoundException;
-import org.opends.server.admin.PropertyException;
-import org.opends.server.admin.client.ManagementContext;
+import org.forgerock.opendj.config.ManagedObjectDefinition;
+import org.forgerock.opendj.config.ManagedObjectNotFoundException;
+import org.forgerock.opendj.config.PropertyException;
+import org.forgerock.opendj.config.client.ManagementContext;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
-import org.opends.server.admin.client.ldap.LDAPManagementContext;
-import org.opends.server.admin.std.client.BackendCfgClient;
-import org.opends.server.admin.std.client.CryptoManagerCfgClient;
-import org.opends.server.admin.std.client.ReplicationDomainCfgClient;
-import org.opends.server.admin.std.client.ReplicationServerCfgClient;
-import org.opends.server.admin.std.client.ReplicationSynchronizationProviderCfgClient;
-import org.opends.server.admin.std.client.RootCfgClient;
-import org.opends.server.admin.std.meta.BackendCfgDefn;
-import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn;
-import org.opends.server.admin.std.meta.ReplicationServerCfgDefn;
-import org.opends.server.admin.std.meta.ReplicationSynchronizationProviderCfgDefn;
-import org.opends.server.admin.std.server.BackendCfg;
+import org.forgerock.opendj.config.client.ldap.LDAPManagementContext;
+import org.forgerock.opendj.server.config.client.BackendCfgClient;
+import org.forgerock.opendj.server.config.client.CryptoManagerCfgClient;
+import org.forgerock.opendj.server.config.client.ReplicationDomainCfgClient;
+import org.forgerock.opendj.server.config.client.ReplicationServerCfgClient;
+import org.forgerock.opendj.server.config.client.ReplicationSynchronizationProviderCfgClient;
+import org.forgerock.opendj.server.config.client.RootCfgClient;
+import org.forgerock.opendj.server.config.meta.BackendCfgDefn;
+import org.forgerock.opendj.server.config.meta.ReplicationDomainCfgDefn;
+import org.forgerock.opendj.server.config.meta.ReplicationServerCfgDefn;
+import org.forgerock.opendj.server.config.meta.ReplicationSynchronizationProviderCfgDefn;
+import org.forgerock.opendj.server.config.server.BackendCfg;
import org.opends.server.backends.task.TaskState;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tools.ConfigureDS;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationConnector.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationConnector.java
index a4d39c6..061c687 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationConnector.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationConnector.java
@@ -33,17 +33,17 @@
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;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.LDAPConnectionHandlerCfgDefn.SSLClientAuthPolicy;
-import org.opends.server.admin.std.server.AdministrationConnectorCfg;
-import org.opends.server.admin.std.server.ConnectionHandlerCfg;
-import org.opends.server.admin.std.server.FileBasedKeyManagerProviderCfg;
-import org.opends.server.admin.std.server.FileBasedTrustManagerProviderCfg;
-import org.opends.server.admin.std.server.KeyManagerProviderCfg;
-import org.opends.server.admin.std.server.LDAPConnectionHandlerCfg;
-import org.opends.server.admin.std.server.RootCfg;
-import org.opends.server.admin.std.server.TrustManagerProviderCfg;
+import org.forgerock.opendj.server.config.meta.LDAPConnectionHandlerCfgDefn.SSLClientAuthPolicy;
+import org.forgerock.opendj.server.config.server.AdministrationConnectorCfg;
+import org.forgerock.opendj.server.config.server.ConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.server.FileBasedKeyManagerProviderCfg;
+import org.forgerock.opendj.server.config.server.FileBasedTrustManagerProviderCfg;
+import org.forgerock.opendj.server.config.server.KeyManagerProviderCfg;
+import org.forgerock.opendj.server.config.server.LDAPConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
+import org.forgerock.opendj.server.config.server.TrustManagerProviderCfg;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
import org.opends.server.core.SynchronousStrategy;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/AccessControlHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AccessControlHandler.java
index a21b08c..a3afb39 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/AccessControlHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/AccessControlHandler.java
@@ -19,7 +19,7 @@
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.AccessControlHandlerCfg;
+import org.forgerock.opendj.server.config.server.AccessControlHandlerCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.DN;
import org.opends.server.core.*;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/AccountStatusNotificationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AccountStatusNotificationHandler.java
index bdec438..868560c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/AccountStatusNotificationHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/AccountStatusNotificationHandler.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.api;
@@ -21,7 +21,7 @@
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.
+import org.forgerock.opendj.server.config.server.
AccountStatusNotificationHandlerCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.AccountStatusNotification;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/AlertHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AlertHandler.java
index cc3eaaf..c1c4d18 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/AlertHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/AlertHandler.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.api;
import org.forgerock.i18n.LocalizableMessage;
@@ -21,7 +21,7 @@
import java.util.List;
-import org.opends.server.admin.std.server.AlertHandlerCfg;
+import org.forgerock.opendj.server.config.server.AlertHandlerCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/AttributeSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AttributeSyntax.java
index 475f7e2..bb7a51a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/AttributeSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/AttributeSyntax.java
@@ -20,12 +20,12 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.opends.server.core.ServerContext;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyFactory.java
index 79318b7..3e44cab 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyFactory.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.api;
@@ -21,7 +21,7 @@
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.AuthenticationPolicyCfg;
+import org.forgerock.opendj.server.config.server.AuthenticationPolicyCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ServerContext;
import org.opends.server.types.InitializationException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java b/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
index d5470e3..22f7aad 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
@@ -32,7 +32,7 @@
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.MatchingRule;
-import org.opends.server.admin.Configuration;
+import org.forgerock.opendj.config.Configuration;
import org.opends.server.backends.RebuildConfig;
import org.opends.server.backends.VerifyConfig;
import org.opends.server.core.AddOperation;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/CertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/api/CertificateMapper.java
index 31d21d0..3b03a01 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/CertificateMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/CertificateMapper.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.api;
import org.forgerock.i18n.LocalizableMessage;
@@ -22,7 +22,7 @@
import java.security.cert.Certificate;
import java.util.List;
-import org.opends.server.admin.std.server.CertificateMapperCfg;
+import org.forgerock.opendj.server.config.server.CertificateMapperCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/ConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ConnectionHandler.java
index 18d570b..6a33bb3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/ConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/ConnectionHandler.java
@@ -25,7 +25,7 @@
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.ConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.server.ConnectionHandlerCfg;
import org.opends.server.core.ServerContext;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.monitors.ConnectionHandlerMonitor;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java b/opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java
index c43023c..1bff547 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java
@@ -24,7 +24,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.std.server.EntryCacheCfg;
+import org.forgerock.opendj.server.config.server.EntryCacheCfg;
import org.opends.server.monitors.EntryCacheMonitorProvider;
import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.Entry;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/ExtendedOperationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ExtendedOperationHandler.java
index d4aea4e..3432411 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/ExtendedOperationHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/ExtendedOperationHandler.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.api;
@@ -21,7 +21,7 @@
import java.util.Set;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.ExtendedOperationHandlerCfg;
+import org.forgerock.opendj.server.config.server.ExtendedOperationHandlerCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ExtendedOperation;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/Group.java b/opendj-server-legacy/src/main/java/org/opends/server/api/Group.java
index 9fed813..0db3f30 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/Group.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/Group.java
@@ -22,7 +22,7 @@
import java.util.List;
import java.util.Set;
-import org.opends.server.admin.std.server.GroupImplementationCfg;
+import org.forgerock.opendj.server.config.server.GroupImplementationCfg;
import org.opends.server.core.ServerContext;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/IdentityMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/api/IdentityMapper.java
index 60708c4..c0fe9e0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/IdentityMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/IdentityMapper.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.api;
import org.forgerock.i18n.LocalizableMessage;
@@ -21,7 +21,7 @@
import java.util.List;
-import org.opends.server.admin.std.server.IdentityMapperCfg;
+import org.forgerock.opendj.server.config.server.IdentityMapperCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/KeyManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/api/KeyManagerProvider.java
index ad804c7..4943236 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/KeyManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/KeyManagerProvider.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.api;
import org.forgerock.i18n.LocalizableMessage;
@@ -22,7 +22,7 @@
import java.util.List;
import javax.net.ssl.KeyManager;
-import org.opends.server.admin.std.server.KeyManagerProviderCfg;
+import org.forgerock.opendj.server.config.server.KeyManagerProviderCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/MatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/api/MatchingRuleFactory.java
index 2075ceb..0730745 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/MatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/MatchingRuleFactory.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.api;
@@ -20,7 +20,7 @@
import java.util.Collection;
import java.util.List;
-import org.opends.server.admin.std.server.MatchingRuleCfg;
+import org.forgerock.opendj.server.config.server.MatchingRuleCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.i18n.LocalizableMessage;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/MonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/api/MonitorProvider.java
index f5dc3c5..61df951 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/MonitorProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/MonitorProvider.java
@@ -27,7 +27,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.types.DirectoryConfig;
import org.opends.server.types.InitializationException;
import org.opends.server.types.ObjectClass;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/PasswordGenerator.java b/opendj-server-legacy/src/main/java/org/opends/server/api/PasswordGenerator.java
index 40e6663..c7afa24 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/PasswordGenerator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/PasswordGenerator.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.api;
import org.forgerock.i18n.LocalizableMessage;
@@ -21,7 +21,7 @@
import java.util.List;
-import org.opends.server.admin.std.server.PasswordGeneratorCfg;
+import org.forgerock.opendj.server.config.server.PasswordGeneratorCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/api/PasswordStorageScheme.java
index c61e0b1..e8589a5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/PasswordStorageScheme.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.api;
import org.forgerock.i18n.LocalizableMessage;
@@ -21,7 +21,7 @@
import java.util.List;
-import org.opends.server.admin.std.server.PasswordStorageSchemeCfg;
+import org.forgerock.opendj.server.config.server.PasswordStorageSchemeCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/PasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/api/PasswordValidator.java
index e1a2f57..72e2e50 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/PasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/PasswordValidator.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.api;
import org.forgerock.i18n.LocalizableMessage;
@@ -22,7 +22,7 @@
import java.util.List;
import java.util.Set;
-import org.opends.server.admin.std.server.PasswordValidatorCfg;
+import org.forgerock.opendj.server.config.server.PasswordValidatorCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/SASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/api/SASLMechanismHandler.java
index 1ed5b12..4ead77f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/SASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/SASLMechanismHandler.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.api;
import org.forgerock.i18n.LocalizableMessage;
@@ -21,7 +21,7 @@
import java.util.List;
-import org.opends.server.admin.std.server.SASLMechanismHandlerCfg;
+import org.forgerock.opendj.server.config.server.SASLMechanismHandlerCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.BindOperation;
import org.opends.server.types.InitializationException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/SynchronizationProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/api/SynchronizationProvider.java
index bf94afc..b4555cd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/SynchronizationProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/SynchronizationProvider.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.api;
import org.forgerock.i18n.LocalizableMessage;
@@ -21,7 +21,7 @@
import java.util.List;
-import org.opends.server.admin.std.server.SynchronizationProviderCfg;
+import org.forgerock.opendj.server.config.server.SynchronizationProviderCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/TrustManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/api/TrustManagerProvider.java
index bf1a387..8aaa412 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/TrustManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/TrustManagerProvider.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.api;
import org.forgerock.i18n.LocalizableMessage;
@@ -22,7 +22,7 @@
import java.util.List;
import javax.net.ssl.TrustManager;
-import org.opends.server.admin.std.server.TrustManagerProviderCfg;
+import org.forgerock.opendj.server.config.server.TrustManagerProviderCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/VirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/api/VirtualAttributeProvider.java
index 17dd3ff..8217921 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/VirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/VirtualAttributeProvider.java
@@ -27,7 +27,7 @@
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.ldap.schema.MatchingRule;
-import org.opends.server.admin.std.server.VirtualAttributeCfg;
+import org.forgerock.opendj.server.config.server.VirtualAttributeCfg;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.Attribute;
import org.opends.server.types.Entry;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/WorkQueue.java b/opendj-server-legacy/src/main/java/org/opends/server/api/WorkQueue.java
index 4d3b20a..60cfeed 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/WorkQueue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/WorkQueue.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.api;
@@ -20,7 +20,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.WorkQueueCfg;
+import org.forgerock.opendj.server.config.server.WorkQueueCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/plugin/DirectoryServerPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/api/plugin/DirectoryServerPlugin.java
index 5067bbf..b6f5dc1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/plugin/DirectoryServerPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/plugin/DirectoryServerPlugin.java
@@ -21,7 +21,7 @@
import java.util.List;
import java.util.Set;
-import org.opends.server.admin.std.server.PluginCfg;
+import org.forgerock.opendj.server.config.server.PluginCfg;
import org.opends.server.api.ClientConnection;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.DN;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/plugin/InternalDirectoryServerPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/api/plugin/InternalDirectoryServerPlugin.java
index 09532ec..f628115 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/plugin/InternalDirectoryServerPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/plugin/InternalDirectoryServerPlugin.java
@@ -20,7 +20,7 @@
import java.util.Set;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.PluginCfg;
+import org.forgerock.opendj.server.config.server.PluginCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.InitializationException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java
index 1b4bba9..dff57ec 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java
@@ -34,7 +34,7 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.std.server.DseeCompatAccessControlHandlerCfg;
+import org.forgerock.opendj.server.config.server.DseeCompatAccessControlHandlerCfg;
import org.opends.server.api.AccessControlHandler;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ConfigHandler;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
index f65271c..35176ec 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
@@ -38,14 +38,14 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
import org.forgerock.opendj.ldap.AVA;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.BackupBackendCfg;
+import org.forgerock.opendj.server.config.server.BackupBackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
index 5f90e53..dadec61 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
@@ -52,7 +52,7 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.Configuration;
+import org.forgerock.opendj.config.Configuration;
import org.opends.server.api.Backend;
import org.opends.server.config.ConfigConstants;
import org.opends.server.controls.EntryChangelogNotificationControl;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java
index 53f78cb..6620d0d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java
@@ -42,8 +42,8 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.LDIFBackendCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.LDIFBackendCfg;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.Backend;
import org.opends.server.controls.SubtreeDeleteControl;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java
index ac47d6d..9303e3a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java
@@ -35,7 +35,7 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.std.server.MemoryBackendCfg;
+import org.forgerock.opendj.server.config.server.MemoryBackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.controls.SubtreeDeleteControl;
import org.opends.server.core.AddOperation;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
index 66a5c70..a1f3ba7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
@@ -48,12 +48,11 @@
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.util.Reject;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.MonitorBackendCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.MonitorBackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.MonitorData;
import org.opends.server.api.MonitorProvider;
-import org.opends.server.config.ConfigEntry;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
@@ -133,9 +132,9 @@
final ArrayList<Attribute> userAttrs = new ArrayList<>();
try
{
- final ConfigEntry configEntry = DirectoryServer
+ final Entry configEntry = DirectoryServer
.getConfigEntry(configEntryDN);
- for (final List<Attribute> attrs : configEntry.getEntry()
+ for (final List<Attribute> attrs : configEntry
.getUserAttributes().values())
{
for (final Attribute a : attrs)
@@ -146,7 +145,7 @@
}
}
}
- for (final List<Attribute> attrs : configEntry.getEntry()
+ for (final List<Attribute> attrs : configEntry
.getOperationalAttributes().values())
{
for (final Attribute a : attrs)
@@ -183,7 +182,7 @@
Reject.ifNull(config);
final MonitorBackendCfg cfg = config;
- final ConfigEntry configEntry = DirectoryServer.getConfigEntry(cfg.dn());
+ final Entry configEntry = DirectoryServer.getConfigEntry(cfg.dn());
// Make sure that a configuration entry was provided. If not, then we will
// not be able to complete initialization.
@@ -193,14 +192,14 @@
throw new ConfigException(message);
}
- configEntryDN = configEntry.getDN();
+ configEntryDN = configEntry.getName();
// Get the set of user-defined attributes for the configuration entry. Any
// attributes that we don't recognize will be included directly in the base
// monitor entry.
userDefinedAttributes = new ArrayList<>();
- addAll(userDefinedAttributes, configEntry.getEntry().getUserAttributes().values());
- addAll(userDefinedAttributes, configEntry.getEntry().getOperationalAttributes().values());
+ addAll(userDefinedAttributes, configEntry.getUserAttributes().values());
+ addAll(userDefinedAttributes, configEntry.getOperationalAttributes().values());
// Construct the set of objectclasses to include in the base monitor entry.
final ObjectClass topOC = DirectoryServer.getObjectClass(OC_TOP, true);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java
index 567fcdd..7ce0e23 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java
@@ -32,7 +32,7 @@
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
-import org.opends.server.admin.std.server.BackendCfg;
+import org.forgerock.opendj.server.config.server.BackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.controls.PagedResultsControl;
import org.opends.server.core.AddOperation;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
index a1b76bb..a054445 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
@@ -47,11 +47,11 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.util.Reject;
import org.forgerock.util.Utils;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.RootDSEBackendCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.RootDSEBackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.ClientConnection;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.types.Entry;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
@@ -138,7 +138,7 @@
@Override
public void openBackend() throws ConfigException, InitializationException
{
- ConfigEntry configEntry = DirectoryServer.getConfigEntry(configEntryDN);
+ Entry configEntry = DirectoryServer.getConfigEntry(configEntryDN);
// Make sure that a configuration entry was provided. If not, then we will
// not be able to complete initialization.
@@ -149,7 +149,7 @@
}
userDefinedAttributes = new ArrayList<>();
- addAllUserDefinedAttrs(userDefinedAttributes, configEntry.getEntry());
+ addAllUserDefinedAttrs(userDefinedAttributes, configEntry);
// Create the set of base DNs that we will handle. In this case, it's just
@@ -946,8 +946,8 @@
ArrayList<Attribute> userAttrs = new ArrayList<>();
try
{
- ConfigEntry configEntry = DirectoryServer.getConfigEntry(configEntryDN);
- addAllUserDefinedAttrs(userAttrs, configEntry.getEntry());
+ Entry configEntry = DirectoryServer.getConfigEntry(configEntryDN);
+ addAllUserDefinedAttrs(userAttrs, configEntry);
}
catch (ConfigException e)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
index 7af4b2a..a691277 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
@@ -64,13 +64,13 @@
import org.forgerock.opendj.ldap.schema.CoreSchema;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.opendj.ldap.schema.ObjectClassType;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.SchemaBackendCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.SchemaBackendCfg;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.Backend;
import org.opends.server.api.Backupable;
import org.opends.server.api.ClientConnection;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.types.Entry;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
@@ -96,7 +96,6 @@
import org.opends.server.types.DITContentRule;
import org.opends.server.types.DITStructureRule;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.Entry;
import org.opends.server.types.ExistingFileBehavior;
import org.opends.server.types.IndexType;
import org.opends.server.types.InitializationException;
@@ -228,9 +227,9 @@
throw new ConfigException(message);
}
- ConfigEntry configEntry = DirectoryServer.getConfigEntry(cfg.dn());
+ Entry configEntry = DirectoryServer.getConfigEntry(cfg.dn());
- configEntryDN = configEntry.getDN();
+ configEntryDN = configEntry.getName();
// Get all of the attribute types that we will use for schema elements.
attributeTypesType = getAttributeType(ATTR_ATTRIBUTE_TYPES_LC);
@@ -259,7 +258,7 @@
schemaObjectClasses.put(subschemaOC, OC_SUBSCHEMA);
- configEntryDN = configEntry.getDN();
+ configEntryDN = configEntry.getName();
DN[] newBaseDNs = new DN[cfg.getBaseDN().size()];
cfg.getBaseDN().toArray(newBaseDNs);
@@ -282,8 +281,8 @@
// attributes that we don't recognize will be included directly in the
// schema entry.
userDefinedAttributes = new ArrayList<>();
- addAll(configEntry.getEntry().getUserAttributes().values());
- addAll(configEntry.getEntry().getOperationalAttributes().values());
+ addAll(configEntry.getUserAttributes().values());
+ addAll(configEntry.getOperationalAttributes().values());
showAllAttributes = cfg.isShowAllAttributes();
@@ -3733,9 +3732,9 @@
ArrayList<Attribute> newUserAttrs = new ArrayList<>();
try
{
- ConfigEntry configEntry = DirectoryServer.getConfigEntry(configEntryDN);
+ Entry configEntry = DirectoryServer.getConfigEntry(configEntryDN);
for (List<Attribute> attrs :
- configEntry.getEntry().getUserAttributes().values())
+ configEntry.getUserAttributes().values())
{
for (Attribute a : attrs)
{
@@ -3746,7 +3745,7 @@
}
}
for (List<Attribute> attrs :
- configEntry.getEntry().getOperationalAttributes().values())
+ configEntry.getOperationalAttributes().values())
{
for (Attribute a : attrs)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java
index 5c4e43a..ae26019 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java
@@ -62,8 +62,8 @@
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.util.Reject;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.TrustStoreBackendCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.TrustStoreBackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java
index 06f02bc..439f1f5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java
@@ -42,9 +42,9 @@
import org.opends.server.admin.BooleanPropertyDefinition;
import org.opends.server.admin.DurationPropertyDefinition;
import org.opends.server.admin.PropertyDefinition;
-import org.opends.server.admin.std.meta.JEBackendCfgDefn;
-import org.opends.server.admin.std.server.BackendCfg;
-import org.opends.server.admin.std.server.JEBackendCfg;
+import org.forgerock.opendj.server.config.meta.JEBackendCfgDefn;
+import org.forgerock.opendj.server.config.server.BackendCfg;
+import org.forgerock.opendj.server.config.server.JEBackendCfg;
import org.opends.server.config.ConfigConstants;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.MemoryQuota;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEBackend.java
index 66270ce..e05f8bd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEBackend.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2015 ForgeRock AS.
+ * Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.backends.jeb;
@@ -19,7 +19,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.std.server.JEBackendCfg;
+import org.forgerock.opendj.server.config.server.JEBackendCfg;
import org.opends.server.backends.pluggable.BackendImpl;
import org.opends.server.backends.pluggable.spi.Storage;
import org.opends.server.core.ServerContext;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEMonitor.java
index d2222ee..60a5dad 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEMonitor.java
@@ -19,8 +19,8 @@
import static org.opends.server.util.StaticUtils.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorData;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import com.sleepycat.je.Environment;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java
index 9bd7cfd..e6115f3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java
@@ -52,8 +52,8 @@
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.util.Reject;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.JEBackendCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.JEBackendCfg;
import org.opends.server.api.Backupable;
import org.opends.server.api.DiskSpaceMonitorHandler;
import org.opends.server.backends.pluggable.spi.AccessMode;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBBackend.java
index 8937dda..fd21778 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBBackend.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2015 ForgeRock AS.
+ * Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.backends.pdb;
@@ -19,7 +19,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.std.server.PDBBackendCfg;
+import org.forgerock.opendj.server.config.server.PDBBackendCfg;
import org.opends.server.backends.pluggable.BackendImpl;
import org.opends.server.backends.pluggable.spi.Storage;
import org.opends.server.core.ServerContext;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBMonitor.java
index 9bd037b..65eefa2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBMonitor.java
@@ -19,8 +19,8 @@
import java.rmi.RemoteException;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorData;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import com.persistit.Management.BufferPoolInfo;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java
index 9dda8be..7f41304 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java
@@ -48,8 +48,8 @@
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.util.Reject;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.PDBBackendCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.PDBBackendCfg;
import org.opends.server.api.Backupable;
import org.opends.server.api.DiskSpaceMonitorHandler;
import org.opends.server.backends.pluggable.spi.AccessMode;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java
index d245b13..47d3d72 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java
@@ -38,9 +38,9 @@
import org.forgerock.opendj.ldap.spi.IndexQueryFactory;
import org.forgerock.opendj.ldap.spi.Indexer;
import org.forgerock.opendj.ldap.spi.IndexingOptions;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.BackendIndexCfgDefn.IndexType;
-import org.opends.server.admin.std.server.BackendIndexCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.BackendIndexCfgDefn.IndexType;
+import org.forgerock.opendj.server.config.server.BackendIndexCfg;
import org.opends.server.backends.pluggable.spi.StorageRuntimeException;
import org.opends.server.backends.pluggable.spi.TreeName;
import org.opends.server.backends.pluggable.spi.WriteOperation;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
index 1c1943b..42ac8f3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
@@ -37,8 +37,8 @@
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.util.Reject;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.PluggableBackendCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.PluggableBackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.MonitorProvider;
import org.opends.server.backends.RebuildConfig;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendMonitor.java
index 87162a8..2d4e19c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendMonitor.java
@@ -25,8 +25,8 @@
import java.util.concurrent.atomic.AtomicInteger;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorData;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.types.SearchFilter;
import org.opends.server.util.TimeThread;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendStat.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendStat.java
index f48dc6c..2a08b1a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendStat.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendStat.java
@@ -41,8 +41,8 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.util.Option;
import org.forgerock.util.Options;
-import org.opends.server.admin.std.server.BackendCfg;
-import org.opends.server.admin.std.server.PluggableBackendCfg;
+import org.forgerock.opendj.server.config.server.BackendCfg;
+import org.forgerock.opendj.server.config.server.PluggableBackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.backends.pluggable.spi.Cursor;
import org.opends.server.backends.pluggable.spi.ReadOperation;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
index eb574fa..05f2f3a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
@@ -55,12 +55,12 @@
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.util.Pair;
import org.opends.messages.CoreMessages;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.std.server.BackendIndexCfg;
-import org.opends.server.admin.std.server.BackendVLVIndexCfg;
-import org.opends.server.admin.std.server.PluggableBackendCfg;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.server.BackendIndexCfg;
+import org.forgerock.opendj.server.config.server.BackendVLVIndexCfg;
+import org.forgerock.opendj.server.config.server.PluggableBackendCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.EntryCache;
import org.opends.server.api.VirtualAttributeProvider;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
index aefaa73..40023b0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
@@ -85,9 +85,9 @@
import org.forgerock.util.Reject;
import org.forgerock.util.Utils;
import org.forgerock.util.promise.PromiseImpl;
-import org.opends.server.admin.std.meta.BackendIndexCfgDefn.IndexType;
-import org.opends.server.admin.std.server.BackendIndexCfg;
-import org.opends.server.admin.std.server.PluggableBackendCfg;
+import org.forgerock.opendj.server.config.meta.BackendIndexCfgDefn.IndexType;
+import org.forgerock.opendj.server.config.server.BackendIndexCfg;
+import org.forgerock.opendj.server.config.server.PluggableBackendCfg;
import org.opends.server.api.CompressedSchema;
import org.opends.server.backends.RebuildConfig;
import org.opends.server.backends.pluggable.AttributeIndex.MatchingRuleIndex;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java
index 0554457..e686113 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java
@@ -33,8 +33,8 @@
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.PluggableBackendCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.PluggableBackendCfg;
import org.opends.server.api.CompressedSchema;
import org.opends.server.backends.pluggable.spi.AccessMode;
import org.opends.server.backends.pluggable.spi.ReadOperation;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
index 499c063..4dd8c97 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
@@ -48,9 +48,9 @@
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.util.Reject;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.BackendVLVIndexCfgDefn.Scope;
-import org.opends.server.admin.std.server.BackendVLVIndexCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.BackendVLVIndexCfgDefn.Scope;
+import org.forgerock.opendj.server.config.server.BackendVLVIndexCfg;
import org.opends.server.backends.pluggable.State.IndexFlag;
import org.opends.server.backends.pluggable.spi.Cursor;
import org.opends.server.backends.pluggable.spi.Importer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskBackend.java
index 5fd4555..eab0742 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskBackend.java
@@ -44,11 +44,10 @@
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.util.Reject;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.TaskBackendCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.TaskBackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.Backupable;
-import org.opends.server.config.ConfigEntry;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
@@ -159,9 +158,9 @@
final DN[] baseDNs = new DN[cfg.getBaseDN().size()];
cfg.getBaseDN().toArray(baseDNs);
- ConfigEntry configEntry = DirectoryServer.getConfigEntry(cfg.dn());
+ Entry configEntry = DirectoryServer.getConfigEntry(cfg.dn());
- configEntryDN = configEntry.getDN();
+ configEntryDN = configEntry.getName();
// Make sure that the provided set of base DNs contains exactly one value.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java b/opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java
index 29fb25a..6ffab4b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java
@@ -45,7 +45,7 @@
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.util.Utils;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.DirectoryServerMBean;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java
index 14d5d6d..09dc4b0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java
@@ -30,12 +30,11 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.util.Utils;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.AccessControlHandlerCfgDefn;
-import org.opends.server.admin.std.server.AccessControlHandlerCfg;
-import org.opends.server.admin.std.server.RootCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.AccessControlHandlerCfgDefn;
+import org.forgerock.opendj.server.config.server.AccessControlHandlerCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.api.AccessControlHandler;
import org.opends.server.api.AlertGenerator;
import org.forgerock.opendj.config.server.ConfigChangeResult;
@@ -146,11 +145,7 @@
throws ConfigException, InitializationException
{
this.serverContext = serverContext;
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration =
- managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Don't register as an add and delete listener with the root configuration
// as we can have only one object at a given time.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
index 387b225..8db9d78 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
@@ -26,14 +26,13 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.util.Utils;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.AccountStatusNotificationHandlerCfgDefn;
-import org.opends.server.admin.std.server.AccountStatusNotificationHandlerCfg;
-import org.opends.server.admin.std.server.RootCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.AccountStatusNotificationHandlerCfgDefn;
+import org.forgerock.opendj.server.config.server.AccountStatusNotificationHandlerCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.api.AccountStatusNotificationHandler;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.ldap.DN;
@@ -92,11 +91,7 @@
public void initializeNotificationHandlers()
throws ConfigException, InitializationException
{
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration =
- managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Register as an add and delete listener with the root configuration so
// we can be notified if any account status notification handler entry
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java
index 3742994..5cc5355 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java
@@ -24,14 +24,13 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.util.Utils;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.AlertHandlerCfgDefn;
-import org.opends.server.admin.std.server.AlertHandlerCfg;
-import org.opends.server.admin.std.server.RootCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.AlertHandlerCfgDefn;
+import org.forgerock.opendj.server.config.server.AlertHandlerCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.api.AlertHandler;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.config.server.ConfigChangeResult;
@@ -87,10 +86,7 @@
public void initializeAlertHandlers()
throws ConfigException, InitializationException
{
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration = managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Register as an add and delete listener with the root configuration so we
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java
index df9afe9..de5b706 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java
@@ -31,14 +31,13 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
import org.forgerock.util.Utils;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.AttributeSyntaxCfgDefn;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
-import org.opends.server.admin.std.server.RootCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.AttributeSyntaxCfgDefn;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.api.AttributeSyntax;
import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.DirectoryException;
@@ -96,11 +95,7 @@
public void initializeAttributeSyntaxes()
throws ConfigException, InitializationException
{
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration =
- managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Register as an add and delete listener with the root configuration so we
@@ -212,8 +207,7 @@
}
catch (DirectoryException de)
{
- ccr.addMessage(WARN_CONFIG_SCHEMA_SYNTAX_CONFLICTING_SYNTAX.get(
- configuration.dn(), de.getMessageObject()));
+ ccr.addMessage(WARN_CONFIG_SCHEMA_SYNTAX_CONFLICTING_SYNTAX.get(configuration.dn(), de.getMessageObject()));
ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
}
}
@@ -403,8 +397,7 @@
}
catch (DirectoryException de)
{
- ccr.addMessage(WARN_CONFIG_SCHEMA_SYNTAX_CONFLICTING_SYNTAX.get(
- configuration.dn(), de.getMessageObject()));
+ ccr.addMessage(WARN_CONFIG_SCHEMA_SYNTAX_CONFLICTING_SYNTAX.get(configuration.dn(), de.getMessageObject()));
ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/BackendConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/BackendConfigManager.java
index e3f2463..7e1efc2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/BackendConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/BackendConfigManager.java
@@ -33,19 +33,17 @@
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.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.BackendCfgDefn;
-import org.opends.server.admin.std.server.BackendCfg;
-import org.opends.server.admin.std.server.RootCfg;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.BackendCfgDefn;
+import org.forgerock.opendj.server.config.server.BackendCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.BackendInitializationListener;
-import org.opends.server.api.ConfigHandler;
import org.opends.server.config.ConfigConstants;
-import org.opends.server.config.ConfigEntry;
import org.forgerock.opendj.ldap.DN;
+import org.opends.server.types.Entry;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
import org.opends.server.types.WritabilityMode;
@@ -95,8 +93,8 @@
{
// Create an internal server management context and retrieve
// the root configuration.
- ServerManagementContext context = ServerManagementContext.getInstance();
- RootCfg root = context.getRootConfiguration();
+
+ RootCfg root = serverContext.getServerManagementContext().getRootConfiguration();
// Register add and delete listeners.
root.addBackendAddListener(this);
@@ -104,7 +102,7 @@
// Get the configuration entry that is at the root of all the backends in
// the server.
- ConfigEntry backendRoot;
+ Entry backendRoot;
try
{
DN configEntryDN = DN.valueOf(ConfigConstants.DN_BACKEND_BASE);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/CertificateMapperConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/CertificateMapperConfigManager.java
index bb259f6..c7b5edf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/CertificateMapperConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/CertificateMapperConfigManager.java
@@ -28,14 +28,13 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.util.Utils;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.CertificateMapperCfgDefn;
-import org.opends.server.admin.std.server.CertificateMapperCfg;
-import org.opends.server.admin.std.server.RootCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.CertificateMapperCfgDefn;
+import org.forgerock.opendj.server.config.server.CertificateMapperCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.api.CertificateMapper;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.ldap.DN;
@@ -92,11 +91,7 @@
public void initializeCertificateMappers()
throws ConfigException, InitializationException
{
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration =
- managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Register as an add and delete listener with the root configuration so we
@@ -120,8 +115,7 @@
CertificateMapper mapper = loadMapper(className, mapperConfiguration,
true);
certificateMappers.put(mapperConfiguration.dn(), mapper);
- DirectoryServer.registerCertificateMapper(mapperConfiguration.dn(),
- mapper);
+ DirectoryServer.registerCertificateMapper(mapperConfiguration.dn(), mapper);
}
catch (InitializationException ie)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ConfigurationBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ConfigurationBackend.java
index b503864..3c81e75 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ConfigurationBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ConfigurationBackend.java
@@ -36,7 +36,7 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.std.server.ConfigFileHandlerBackendCfg;
+import org.forgerock.opendj.server.config.server.ConfigFileHandlerBackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.Backupable;
import org.opends.server.api.ClientConnection;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java
index c7f6534..e022408 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java
@@ -27,16 +27,15 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.ConnectionHandlerCfgDefn;
+import org.forgerock.opendj.server.config.server.AdministrationConnectorCfg;
+import org.forgerock.opendj.server.config.server.ConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.admin.AdministrationConnector;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.ConnectionHandlerCfgDefn;
-import org.opends.server.admin.std.server.AdministrationConnectorCfg;
-import org.opends.server.admin.std.server.ConnectionHandlerCfg;
-import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.ConnectionHandler;
import org.opends.server.protocols.ldap.LDAPConnectionHandler;
import org.forgerock.opendj.config.server.ConfigChangeResult;
@@ -230,14 +229,9 @@
// Clear the set of connection handlers in case of in-core restart.
connectionHandlers.clear();
- // Initialize the admin connector.
initializeAdministrationConnectorConfig();
- // Get the root configuration which acts as the parent of all
- // connection handlers.
- ServerManagementContext context = ServerManagementContext
- .getInstance();
- RootCfg root = context.getRootConfiguration();
+ RootCfg root = serverContext.getServerManagementContext().getRootConfiguration();
// Register as an add and delete listener so that we can
// be notified if new connection handlers are added or existing
@@ -279,8 +273,7 @@
private void initializeAdministrationConnectorConfig()
throws ConfigException, InitializationException {
- RootCfg root =
- ServerManagementContext.getInstance().getRootConfiguration();
+ RootCfg root = serverContext.getServerManagementContext().getRootConfiguration();
AdministrationConnectorCfg administrationConnectorCfg =
root.getAdministrationConnector();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/CoreConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/CoreConfigManager.java
index 9244b2d..28fb875 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/CoreConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/CoreConfigManager.java
@@ -23,14 +23,13 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.GlobalCfgDefn;
-import org.opends.server.admin.std.meta.GlobalCfgDefn.DisabledPrivilege;
-import org.opends.server.admin.std.meta.GlobalCfgDefn.InvalidAttributeSyntaxBehavior;
-import org.opends.server.admin.std.meta.GlobalCfgDefn.SingleStructuralObjectclassBehavior;
-import org.opends.server.admin.std.server.GlobalCfg;
-import org.opends.server.admin.std.server.RootCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.GlobalCfgDefn;
+import org.forgerock.opendj.server.config.meta.GlobalCfgDefn.DisabledPrivilege;
+import org.forgerock.opendj.server.config.meta.GlobalCfgDefn.InvalidAttributeSyntaxBehavior;
+import org.forgerock.opendj.server.config.meta.GlobalCfgDefn.SingleStructuralObjectclassBehavior;
+import org.forgerock.opendj.server.config.server.GlobalCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.api.AuthenticationPolicy;
import org.opends.server.loggers.CommonAudit;
import org.opends.server.types.*;
@@ -75,11 +74,7 @@
public void initializeCoreConfig()
throws ConfigException, InitializationException
{
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration =
- managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Get the global configuration and register with it as a change listener.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java
index 6b4cba4..8de9bfe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java
@@ -16,7 +16,7 @@
*/
package org.opends.server.core;
-import org.opends.server.admin.std.server.AccessControlHandlerCfg;
+import org.forgerock.opendj.server.config.server.AccessControlHandlerCfg;
import org.opends.server.api.AccessControlHandler;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.DN;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
index 589ae27..593511b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
@@ -71,16 +71,16 @@
import org.forgerock.util.Reject;
import org.opends.server.admin.AdministrationConnector;
import org.opends.server.admin.AdministrationDataSync;
-import org.opends.server.admin.ClassLoaderProvider;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.server.AlertHandlerCfg;
-import org.opends.server.admin.std.server.ConnectionHandlerCfg;
-import org.opends.server.admin.std.server.CryptoManagerCfg;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
-import org.opends.server.admin.std.server.PasswordValidatorCfg;
-import org.opends.server.admin.std.server.RootCfg;
-import org.opends.server.admin.std.server.RootDSEBackendCfg;
-import org.opends.server.admin.std.server.SynchronizationProviderCfg;
+import org.forgerock.opendj.config.ConfigurationFramework;
+import org.forgerock.opendj.config.server.ServerManagementContext;
+import org.forgerock.opendj.server.config.server.AlertHandlerCfg;
+import org.forgerock.opendj.server.config.server.ConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.server.CryptoManagerCfg;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
+import org.forgerock.opendj.server.config.server.PasswordValidatorCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
+import org.forgerock.opendj.server.config.server.RootDSEBackendCfg;
+import org.forgerock.opendj.server.config.server.SynchronizationProviderCfg;
import org.opends.server.api.AccessControlHandler;
import org.opends.server.api.AccountStatusNotificationHandler;
import org.opends.server.api.AlertGenerator;
@@ -119,7 +119,7 @@
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.backends.RootDSEBackend;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.types.Entry;
import org.opends.server.config.JMXMBean;
import org.opends.server.controls.PasswordPolicyErrorType;
import org.opends.server.controls.PasswordPolicyResponseControl;
@@ -673,7 +673,7 @@
public static final int DEFAULT_TIMEOUT = 200;
/** Entry point for server configuration. */
- private org.forgerock.opendj.config.server.ServerManagementContext serverManagementContext;
+ private ServerManagementContext serverManagementContext;
/** Entry point to common audit service, where all audit events must be published. */
private CommonAudit commonAudit;
@@ -681,7 +681,6 @@
/** Class that prints the version of OpenDJ server to System.out. */
public static final class DirectoryServerVersionHandler implements VersionHandler
{
- /** {@inheritDoc} */
@Override
public void printVersion()
{
@@ -732,7 +731,7 @@
}
@Override
- public org.forgerock.opendj.config.server.ServerManagementContext getServerManagementContext()
+ public ServerManagementContext getServerManagementContext()
{
return serverManagementContext;
}
@@ -1110,7 +1109,7 @@
{
schemaHandler.initialize(serverContext);
}
- catch (org.forgerock.opendj.config.server.ConfigException e)
+ catch (ConfigException e)
{
// TODO : fix message
throw new InitializationException(LocalizableMessage.raw("Cannot initialize schema handler"), e);
@@ -1517,8 +1516,7 @@
public void initializeCryptoManager()
throws ConfigException, InitializationException
{
- RootCfg root =
- ServerManagementContext.getInstance().getRootConfiguration();
+ RootCfg root = serverContext.getServerManagementContext().getRootConfiguration();
CryptoManagerCfg cryptoManagerCfg = root.getCryptoManager();
cryptoManager = new CryptoManagerImpl(serverContext, cryptoManagerCfg);
}
@@ -1702,7 +1700,7 @@
* @param changeListeners The set of change listeners mapped to the DN of
* the corresponding configuration entry.
*/
- private void getChangeListeners(ConfigEntry configEntry,
+ private void getChangeListeners(Entry configEntry,
Map<String, List<ConfigAddListener>> addListeners,
Map<String, List<ConfigDeleteListener>> deleteListeners,
Map<String, List<ConfigChangeListener>> changeListeners)
@@ -1711,17 +1709,17 @@
put(deleteListeners, configEntry, configEntry.getDeleteListeners());
put(changeListeners, configEntry, configEntry.getChangeListeners());
- for (ConfigEntry child : configEntry.getChildren().values())
+ for (Entry child : configEntry.getChildren().values())
{
getChangeListeners(child, addListeners, deleteListeners, changeListeners);
}
}
- private <T> void put(Map<String, List<T>> listeners, ConfigEntry configEntry, List<T> cfgListeners)
+ private <T> void put(Map<String, List<T>> listeners, Entry configEntry, List<T> cfgListeners)
{
if (cfgListeners != null && !cfgListeners.isEmpty())
{
- listeners.put(configEntry.getDN().toString(), cfgListeners);
+ listeners.put(configEntry.getName().toString(), cfgListeners);
}
}
@@ -1785,7 +1783,7 @@
RootDSEBackendCfg rootDSECfg;
try
{
- RootCfg root = ServerManagementContext.getInstance().getRootConfiguration();
+ RootCfg root = serverContext.getServerManagementContext().getRootConfiguration();
rootDSECfg = root.getRootDSEBackend();
}
catch (Exception e)
@@ -2096,8 +2094,7 @@
throws ConfigException, InitializationException {
RootDSEBackendCfg rootDSECfg;
try {
- RootCfg root =
- ServerManagementContext.getInstance().getRootConfiguration();
+ RootCfg root = serverContext.getServerManagementContext().getRootConfiguration();
rootDSECfg = root.getRootDSEBackend();
} catch (Exception e) {
logger.traceException(e);
@@ -2149,16 +2146,17 @@
/**
* Retrieves the requested entry from the Directory Server configuration.
+ * <p>
+ * The main difference with {@link #getEntry(DN)} is that virtual attributes are not processed.
+ * This is important when the whole directory server is not initialized yet (when initializing all backends).
*
* @param entryDN The DN of the configuration entry to retrieve.
- *
* @return The requested entry from the Directory Server configuration.
- *
- * @throws ConfigException If a problem occurs while trying to retrieve the
- * requested entry.
+ * @throws ConfigException If a problem occurs while trying to retrieve the requested entry.
+ * @deprecated use {@link #getEntry(DN)} when possible
*/
- public static ConfigEntry getConfigEntry(DN entryDN)
- throws ConfigException
+ @Deprecated
+ public static Entry getConfigEntry(DN entryDN) throws ConfigException
{
return directoryServer.configHandler.getConfigEntry(entryDN);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java
index 59a7207..c386e24 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java
@@ -22,18 +22,17 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.util.Utils;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.EntryCacheCfgDefn;
-import org.opends.server.admin.std.server.EntryCacheCfg;
-import org.opends.server.admin.std.server.EntryCacheMonitorProviderCfg;
-import org.opends.server.admin.std.server.RootCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.EntryCacheCfgDefn;
+import org.forgerock.opendj.server.config.server.EntryCacheCfg;
+import org.forgerock.opendj.server.config.server.EntryCacheMonitorProviderCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.api.EntryCache;
import org.opends.server.config.ConfigConstants;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.types.Entry;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.extensions.DefaultEntryCache;
import org.opends.server.monitors.EntryCacheMonitorProvider;
@@ -126,11 +125,7 @@
public void initializeEntryCache()
throws ConfigException
{
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration =
- managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Default entry cache should be already installed with
// <CODE>initializeDefaultEntryCache()</CODE> method so
@@ -142,7 +137,7 @@
rootConfiguration.addEntryCacheDeleteListener(this);
// Get the base entry cache configuration entry.
- ConfigEntry entryCacheBase;
+ Entry entryCacheBase;
try {
DN configEntryDN = DN.valueOf(ConfigConstants.DN_ENTRY_CACHE_BASE);
entryCacheBase = DirectoryServer.getConfigEntry(configEntryDN);
@@ -466,11 +461,7 @@
)
throws InitializationException
{
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration =
- managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Load the entry cache class...
EntryCache<? extends EntryCacheCfg> entryCache =
@@ -488,7 +479,7 @@
// Install and register the monitor for this cache.
EntryCacheMonitorProvider monitor =
new EntryCacheMonitorProvider(configuration.dn().
- rdn().getFirstAVA().getAttributeValue().toString(), entryCache);
+ rdn().getFirstAVA().getAttributeValue().toString(), entryCache);
try {
monitor.initializeMonitorProvider((EntryCacheMonitorProviderCfg)
rootConfiguration.getMonitorProvider(
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java
index f1ecf9f..5592824 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java
@@ -25,14 +25,13 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.ExtendedOperationHandlerCfgDefn;
-import org.opends.server.admin.std.server.ExtendedOperationHandlerCfg;
-import org.opends.server.admin.std.server.RootCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.ExtendedOperationHandlerCfgDefn;
+import org.forgerock.opendj.server.config.server.ExtendedOperationHandlerCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.api.ExtendedOperationHandler;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.ldap.DN;
@@ -89,8 +88,8 @@
{
// Create an internal server management context and retrieve
// the root configuration which has the extended operation handler relation.
- ServerManagementContext context = ServerManagementContext.getInstance();
- RootCfg root = context.getRootConfiguration();
+
+ RootCfg root = serverContext.getServerManagementContext().getRootConfiguration();
// Register add and delete listeners.
root.addExtendedOperationHandlerAddListener(this);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/GroupManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/GroupManager.java
index bc175bc..316cadc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/GroupManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/GroupManager.java
@@ -42,14 +42,13 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.util.Utils;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.GroupImplementationCfgDefn;
-import org.opends.server.admin.std.server.GroupImplementationCfg;
-import org.opends.server.admin.std.server.RootCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.GroupImplementationCfgDefn;
+import org.forgerock.opendj.server.config.server.GroupImplementationCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.BackendInitializationListener;
import org.opends.server.api.DITCacheMap;
@@ -173,11 +172,7 @@
public void initializeGroupImplementations()
throws ConfigException, InitializationException
{
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration =
- managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Register as an add and delete listener with the root configuration so we
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java
index 25d7f72..5ff402b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java
@@ -28,14 +28,13 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.util.Utils;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.IdentityMapperCfgDefn;
-import org.opends.server.admin.std.server.IdentityMapperCfg;
-import org.opends.server.admin.std.server.RootCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.IdentityMapperCfgDefn;
+import org.forgerock.opendj.server.config.server.IdentityMapperCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.api.IdentityMapper;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.ldap.DN;
@@ -89,11 +88,7 @@
public void initializeIdentityMappers()
throws ConfigException, InitializationException
{
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration =
- managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Register as an add and delete listener with the root configuration so we
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java
index 526da0f..05f692a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java
@@ -24,14 +24,13 @@
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.std.meta.KeyManagerProviderCfgDefn;
-import org.opends.server.admin.std.server.KeyManagerProviderCfg;
-import org.opends.server.admin.std.server.RootCfg;
-import org.opends.server.admin.server.ServerManagementContext;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.KeyManagerProviderCfgDefn;
+import org.forgerock.opendj.server.config.server.KeyManagerProviderCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.api.KeyManagerProvider;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.config.server.ConfigChangeResult;
@@ -93,11 +92,7 @@
public void initializeKeyManagerProviders()
throws ConfigException, InitializationException
{
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration =
- managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Register as an add and delete listener with the root configuration so we
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/LogRetentionPolicyConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/LogRetentionPolicyConfigManager.java
index 7ab5c0b..6ab0229 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/LogRetentionPolicyConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/LogRetentionPolicyConfigManager.java
@@ -12,22 +12,21 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.core;
import java.util.List;
-import org.opends.server.admin.std.server.LogRetentionPolicyCfg;
-import org.opends.server.admin.std.server.RootCfg;
-import org.opends.server.admin.std.meta.LogRetentionPolicyCfgDefn;
+import org.forgerock.opendj.server.config.server.LogRetentionPolicyCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
+import org.forgerock.opendj.server.config.meta.LogRetentionPolicyCfgDefn;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
import org.opends.server.types.InitializationException;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.loggers.RetentionPolicy;
@@ -74,8 +73,8 @@
*/
public void initializeLogRetentionPolicyConfig() throws ConfigException, InitializationException
{
- ServerManagementContext context = ServerManagementContext.getInstance();
- RootCfg root = context.getRootConfiguration();
+
+ RootCfg root = serverContext.getServerManagementContext().getRootConfiguration();
root.addLogRetentionPolicyAddListener(this);
root.addLogRetentionPolicyDeleteListener(this);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/LogRotationPolicyConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/LogRotationPolicyConfigManager.java
index 671f21c..1fa5eb7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/LogRotationPolicyConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/LogRotationPolicyConfigManager.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.core;
import java.util.List;
@@ -20,14 +20,13 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.loggers.RotationPolicy;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.LogRotationPolicyCfg;
-import org.opends.server.admin.std.server.RootCfg;
-import org.opends.server.admin.std.meta.LogRotationPolicyCfgDefn;
-import org.opends.server.admin.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.LogRotationPolicyCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
+import org.forgerock.opendj.server.config.meta.LogRotationPolicyCfgDefn;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
import org.opends.server.types.InitializationException;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
@@ -73,8 +72,8 @@
*/
public void initializeLogRotationPolicyConfig() throws ConfigException, InitializationException
{
- ServerManagementContext context = ServerManagementContext.getInstance();
- RootCfg root = context.getRootConfiguration();
+
+ RootCfg root = serverContext.getServerManagementContext().getRootConfiguration();
root.addLogRotationPolicyAddListener(this);
root.addLogRotationPolicyDeleteListener(this);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java
index ebc9d80..d24fe81 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.core;
@@ -29,16 +29,15 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.server.AccessLogPublisherCfg;
+import org.forgerock.opendj.server.config.server.DebugLogPublisherCfg;
+import org.forgerock.opendj.server.config.server.ErrorLogPublisherCfg;
+import org.forgerock.opendj.server.config.server.HTTPAccessLogPublisherCfg;
+import org.forgerock.opendj.server.config.server.LogPublisherCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.messages.Severity;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.server.AccessLogPublisherCfg;
-import org.opends.server.admin.std.server.DebugLogPublisherCfg;
-import org.opends.server.admin.std.server.ErrorLogPublisherCfg;
-import org.opends.server.admin.std.server.HTTPAccessLogPublisherCfg;
-import org.opends.server.admin.std.server.LogPublisherCfg;
-import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.loggers.AbstractLogger;
import org.opends.server.loggers.AccessLogger;
import org.opends.server.loggers.DebugLogger;
@@ -177,8 +176,8 @@
{
// Create an internal server management context and retrieve
// the root configuration which has the log publisher relation.
- ServerManagementContext context = ServerManagementContext.getInstance();
- RootCfg root = context.getRootConfiguration();
+
+ RootCfg root = serverContext.getServerManagementContext().getRootConfiguration();
root.addLogPublisherAddListener(this);
root.addLogPublisherDeleteListener(this);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/MatchingRuleConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/MatchingRuleConfigManager.java
index c0b6f0a..025abff 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/MatchingRuleConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/MatchingRuleConfigManager.java
@@ -26,19 +26,19 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.config.server.ServerManagementContext;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.MatchingRule;
+import org.forgerock.opendj.server.config.meta.MatchingRuleCfgDefn;
+import org.forgerock.opendj.server.config.server.MatchingRuleCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.forgerock.util.Utils;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.MatchingRuleCfgDefn;
-import org.opends.server.admin.std.server.MatchingRuleCfg;
-import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.MatchingRuleFactory;
import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.DirectoryException;
@@ -64,7 +64,7 @@
* A mapping between the DNs of the config entries and the associated matching
* rule Factories.
*/
- private ConcurrentHashMap<DN,MatchingRuleFactory> matchingRuleFactories;
+ private ConcurrentHashMap<DN, MatchingRuleFactory<?>> matchingRuleFactories;
private final ServerContext serverContext;
@@ -97,10 +97,7 @@
public void initializeMatchingRules()
throws ConfigException, InitializationException
{
- // Get the root configuration object.
- ServerManagementContext managementContext = ServerManagementContext.getInstance();
- RootCfg rootConfiguration =
- managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = ServerManagementContext.getInstance().getRootConfiguration();
// Register as an add and delete listener with the root configuration so we
@@ -485,7 +482,7 @@
* @throws InitializationException If a problem occurred while attempting to
* initialize the attribute syntax.
*/
- private MatchingRuleFactory loadMatchingRuleFactory(String className,
+ private MatchingRuleFactory<?> loadMatchingRuleFactory(String className,
MatchingRuleCfg configuration,
boolean initialize)
throws InitializationException
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java
index 906f302..12ec591 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java
@@ -26,14 +26,13 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.MonitorProviderCfgDefn;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
-import org.opends.server.admin.std.server.RootCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.MonitorProviderCfgDefn;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.api.MonitorProvider;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.ldap.DN;
@@ -88,11 +87,7 @@
public void initializeMonitorProviders()
throws ConfigException, InitializationException
{
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration =
- managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Register as an add and delete listener with the root configuration so we
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java
index 729aff9..df5d6d9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java
@@ -28,14 +28,13 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.util.Utils;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.PasswordGeneratorCfgDefn;
-import org.opends.server.admin.std.server.PasswordGeneratorCfg;
-import org.opends.server.admin.std.server.RootCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.PasswordGeneratorCfgDefn;
+import org.forgerock.opendj.server.config.server.PasswordGeneratorCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.api.PasswordGenerator;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.ldap.DN;
@@ -91,11 +90,7 @@
public void initializePasswordGenerators()
throws ConfigException, InitializationException
{
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration =
- managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Register as an add and delete listener with the root configuration so we
// can be notified if any password generator entries are added or removed.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicy.java
index c97c0f4..7e80028 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicy.java
@@ -21,7 +21,7 @@
import java.util.Set;
import java.util.SortedSet;
-import org.opends.server.admin.std.meta.PasswordPolicyCfgDefn.*;
+import org.forgerock.opendj.server.config.meta.PasswordPolicyCfgDefn.*;
import org.opends.server.api.*;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.DN;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyConfigManager.java
index d28d64d..9dd1505 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyConfigManager.java
@@ -28,14 +28,13 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.AuthenticationPolicyCfgDefn;
-import org.opends.server.admin.std.server.AuthenticationPolicyCfg;
-import org.opends.server.admin.std.server.PasswordPolicyCfg;
-import org.opends.server.admin.std.server.RootCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.AuthenticationPolicyCfgDefn;
+import org.forgerock.opendj.server.config.server.AuthenticationPolicyCfg;
+import org.forgerock.opendj.server.config.server.PasswordPolicyCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.api.AuthenticationPolicy;
import org.opends.server.api.AuthenticationPolicyFactory;
import org.opends.server.api.SubentryChangeListener;
@@ -83,10 +82,7 @@
public void initializeAuthenticationPolicies() throws ConfigException,
InitializationException
{
- // Get the root configuration object.
- ServerManagementContext managementContext = ServerManagementContext
- .getInstance();
- RootCfg rootConfiguration = managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Register as an add and delete listener with the root configuration so we
// can be notified if any password policy entries are added or removed.
@@ -168,9 +164,8 @@
DirectoryServer.getSubentryManager().deregisterChangeListener(this);
// Deregister as configuration change listeners.
- ServerManagementContext managementContext = ServerManagementContext
- .getInstance();
- RootCfg rootConfiguration = managementContext.getRootConfiguration();
+
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
rootConfiguration.removePasswordPolicyAddListener(this);
rootConfiguration.removePasswordPolicyDeleteListener(this);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java
index 39008cf..a1410d4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java
@@ -33,9 +33,9 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.GeneralizedTime;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.PasswordPolicyCfgDefn.StateUpdateFailurePolicy;
-import org.opends.server.admin.std.server.PasswordPolicyCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.PasswordPolicyCfgDefn.StateUpdateFailurePolicy;
+import org.forgerock.opendj.server.config.server.PasswordPolicyCfg;
import org.opends.server.api.*;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.types.*;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java
index 8bb1319..2278e1c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java
@@ -47,7 +47,7 @@
import org.forgerock.opendj.ldap.ModificationType;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.std.meta.PasswordPolicyCfgDefn;
+import org.forgerock.opendj.server.config.meta.PasswordPolicyCfgDefn;
import org.opends.server.api.AccountStatusNotificationHandler;
import org.opends.server.api.AuthenticationPolicyState;
import org.opends.server.api.PasswordGenerator;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java
index 00d8621..43cdaa9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java
@@ -26,14 +26,13 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.util.Utils;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.PasswordStorageSchemeCfgDefn;
-import org.opends.server.admin.std.server.PasswordStorageSchemeCfg;
-import org.opends.server.admin.std.server.RootCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.PasswordStorageSchemeCfgDefn;
+import org.forgerock.opendj.server.config.server.PasswordStorageSchemeCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.ldap.DN;
@@ -88,11 +87,7 @@
public void initializePasswordStorageSchemes()
throws ConfigException, InitializationException
{
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration =
- managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Register as an add and delete listener with the root configuration so we
// can be notified if any entry cache entry is added or removed.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java
index 8f146b5..2517e37 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java
@@ -28,14 +28,13 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.util.Utils;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.PasswordValidatorCfgDefn;
-import org.opends.server.admin.std.server.PasswordValidatorCfg;
-import org.opends.server.admin.std.server.RootCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.PasswordValidatorCfgDefn;
+import org.forgerock.opendj.server.config.server.PasswordValidatorCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.api.PasswordValidator;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.ldap.DN;
@@ -92,11 +91,7 @@
public void initializePasswordValidators()
throws ConfigException, InitializationException
{
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration =
- managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Register as an add and delete listener with the root configuration so we
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java
index 115c255..b2f00a9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java
@@ -39,15 +39,14 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.util.Utils;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.PluginCfgDefn;
-import org.opends.server.admin.std.server.PluginCfg;
-import org.opends.server.admin.std.server.PluginRootCfg;
-import org.opends.server.admin.std.server.RootCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.PluginCfgDefn;
+import org.forgerock.opendj.server.config.server.PluginCfg;
+import org.forgerock.opendj.server.config.server.PluginRootCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.InternalDirectoryServerPlugin;
@@ -294,15 +293,10 @@
{
registeredPlugins.clear();
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration =
- managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Get the plugin root configuration and register with it as an add and
- // delete listener so we can be notified if any plugin entries are added or
- // removed.
+ // delete listener so we can be notified if any plugin entries are added or removed.
pluginRootConfig = rootConfiguration.getPluginRoot();
pluginRootConfig.addPluginAddListener(this);
pluginRootConfig.addPluginDeleteListener(this);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java
index c5d19c7..3c3be6e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java
@@ -25,13 +25,12 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-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.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.server.RootCfg;
+import org.forgerock.opendj.server.config.server.RootDNCfg;
+import org.forgerock.opendj.server.config.server.RootDNUserCfg;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.DirectoryException;
@@ -89,11 +88,7 @@
public void initializeRootDNs()
throws ConfigException, InitializationException
{
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration =
- managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Get the root DN configuration object, use it to set the default root
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java b/opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java
index fccfc52..0daa97b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.core;
@@ -21,9 +21,9 @@
import java.util.Set;
import org.forgerock.i18n.LocalizableMessage;
-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.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.RootDNCfgDefn;
+import org.forgerock.opendj.server.config.server.RootDNCfg;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.Privilege;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java
index 075f0ab..b6eff60 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java
@@ -28,14 +28,13 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.util.Utils;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.SASLMechanismHandlerCfgDefn;
-import org.opends.server.admin.std.server.RootCfg;
-import org.opends.server.admin.std.server.SASLMechanismHandlerCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.SASLMechanismHandlerCfgDefn;
+import org.forgerock.opendj.server.config.server.RootCfg;
+import org.forgerock.opendj.server.config.server.SASLMechanismHandlerCfg;
import org.opends.server.api.SASLMechanismHandler;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.ldap.DN;
@@ -93,11 +92,7 @@
public void initializeSASLMechanismHandlers()
throws ConfigException, InitializationException
{
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration =
- managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Register as an add and delete listener with the root configuration so we
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java
index af53e16..60f3136 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java
@@ -35,8 +35,8 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.std.meta.PasswordPolicyCfgDefn.StateUpdateFailurePolicy;
-import org.opends.server.admin.std.server.PasswordValidatorCfg;
+import org.forgerock.opendj.server.config.meta.PasswordPolicyCfgDefn.StateUpdateFailurePolicy;
+import org.forgerock.opendj.server.config.server.PasswordValidatorCfg;
import org.opends.server.api.AccountStatusNotificationHandler;
import org.opends.server.api.PasswordGenerator;
import org.opends.server.api.PasswordStorageScheme;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java
index dc6bd8a..6675cd8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java
@@ -25,14 +25,13 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.SynchronizationProviderCfgDefn;
-import org.opends.server.admin.std.server.RootCfg;
-import org.opends.server.admin.std.server.SynchronizationProviderCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.SynchronizationProviderCfgDefn;
+import org.forgerock.opendj.server.config.server.RootCfg;
+import org.forgerock.opendj.server.config.server.SynchronizationProviderCfg;
import org.opends.server.api.SynchronizationProvider;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.ldap.DN;
@@ -91,8 +90,8 @@
{
// Create an internal server management context and retrieve
// the root configuration which has the synchronization provider relation.
- ServerManagementContext context = ServerManagementContext.getInstance();
- RootCfg root = context.getRootConfiguration();
+
+ RootCfg root = serverContext.getServerManagementContext().getRootConfiguration();
// Register as an add and delete listener so that we can
// be notified when new synchronization providers are added or existing
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java
index c4ffafb..ce831e6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java
@@ -24,14 +24,13 @@
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.std.meta.TrustManagerProviderCfgDefn;
-import org.opends.server.admin.std.server.TrustManagerProviderCfg;
-import org.opends.server.admin.std.server.RootCfg;
-import org.opends.server.admin.server.ServerManagementContext;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.TrustManagerProviderCfgDefn;
+import org.forgerock.opendj.server.config.server.TrustManagerProviderCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.api.TrustManagerProvider;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.config.server.ConfigChangeResult;
@@ -93,11 +92,7 @@
public void initializeTrustManagerProviders()
throws ConfigException, InitializationException
{
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration =
- managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Register as an add and delete listener with the root configuration so we
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/VirtualAttributeConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/VirtualAttributeConfigManager.java
index 24a706e..acbe04b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/VirtualAttributeConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/VirtualAttributeConfigManager.java
@@ -38,14 +38,13 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.util.Utils;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn;
-import org.opends.server.admin.std.server.RootCfg;
-import org.opends.server.admin.std.server.VirtualAttributeCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.VirtualAttributeCfgDefn;
+import org.forgerock.opendj.server.config.server.RootCfg;
+import org.forgerock.opendj.server.config.server.VirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
@@ -100,10 +99,7 @@
public void initializeVirtualAttributes()
throws ConfigException, InitializationException
{
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration = managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Register as an add and delete listener with the root configuration so we
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/WorkQueueConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/WorkQueueConfigManager.java
index 94ddba9..eada737 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/WorkQueueConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/WorkQueueConfigManager.java
@@ -12,18 +12,17 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.core;
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.meta.WorkQueueCfgDefn;
-import org.opends.server.admin.std.server.RootCfg;
-import org.opends.server.admin.std.server.WorkQueueCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.WorkQueueCfgDefn;
+import org.forgerock.opendj.server.config.server.RootCfg;
+import org.forgerock.opendj.server.config.server.WorkQueueCfg;
import org.opends.server.api.WorkQueue;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.config.server.ConfigChangeResult;
@@ -70,11 +69,7 @@
public WorkQueue initializeWorkQueue()
throws ConfigException, InitializationException
{
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration =
- managementContext.getRootConfiguration();
+ RootCfg rootConfiguration = serverContext.getServerManagementContext().getRootConfiguration();
// Get the work queue configuration and register with it as a change
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
index 21a02f2..7a81d6b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
@@ -71,8 +71,8 @@
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.util.Reject;
import org.opends.admin.ads.ADSContext;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.CryptoManagerCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.CryptoManagerCfg;
import org.opends.server.api.Backend;
import org.opends.server.backends.TrustStoreBackend;
import org.opends.server.core.AddOperation;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java
index 335b107..383132d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java
@@ -12,14 +12,14 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.crypto;
import java.io.IOException;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.
+import org.forgerock.opendj.server.config.server.
GetSymmetricKeyExtendedOperationHandlerCfg;
import org.opends.server.api.ExtendedOperationHandler;
import org.forgerock.opendj.config.server.ConfigException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java
index 07342e2..a9413d8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java
@@ -12,14 +12,14 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.AESPasswordStorageSchemeCfg;
+import org.forgerock.opendj.server.config.server.AESPasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AnonymousSASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
index 4783fbd..9077292 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.std.server.AnonymousSASLMechanismHandlerCfg;
+import org.forgerock.opendj.server.config.server.AnonymousSASLMechanismHandlerCfg;
import org.opends.server.api.SASLMechanismHandler;
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java
index dc8f663..9d93ece 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java
@@ -21,9 +21,9 @@
import java.util.List;
import java.util.Set;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.AttributeValuePasswordValidatorCfg;
-import org.opends.server.admin.std.server.PasswordValidatorCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.AttributeValuePasswordValidatorCfg;
+import org.forgerock.opendj.server.config.server.PasswordValidatorCfg;
import org.opends.server.api.PasswordValidator;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.types.*;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java
index fb07c32..82a7fc8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java
@@ -12,14 +12,14 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.Base64PasswordStorageSchemeCfg;
+import org.forgerock.opendj.server.config.server.Base64PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/BcryptPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BcryptPasswordStorageScheme.java
index 20bc99c..037e0d8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/BcryptPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BcryptPasswordStorageScheme.java
@@ -20,11 +20,11 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.BcryptPasswordStorageSchemeCfg;
+import org.forgerock.opendj.server.config.server.BcryptPasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java
index 558d071..52f8f87 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -22,7 +22,7 @@
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
-import org.opends.server.admin.std.server.BlindTrustManagerProviderCfg;
+import org.forgerock.opendj.server.config.server.BlindTrustManagerProviderCfg;
import org.opends.server.api.TrustManagerProvider;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java
index fc51b07..db4e63a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java
@@ -12,14 +12,14 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.BlowfishPasswordStorageSchemeCfg;
+import org.forgerock.opendj.server.config.server.BlowfishPasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
index 8e759ff..92a2c9f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
@@ -30,13 +30,13 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.CramMD5SASLMechanismHandlerCfg;
-import org.opends.server.admin.std.server.SASLMechanismHandlerCfg;
import org.opends.server.api.AuthenticationPolicyState;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.IdentityMapper;
import org.opends.server.api.SASLMechanismHandler;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.CramMD5SASLMechanismHandlerCfg;
+import org.forgerock.opendj.server.config.server.SASLMechanismHandlerCfg;
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.PasswordPolicyState;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CancelExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CancelExtendedOperation.java
index 1185519..5a67173 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CancelExtendedOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CancelExtendedOperation.java
@@ -12,12 +12,12 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.CancelExtendedOperationHandlerCfg;
+import org.forgerock.opendj.server.config.server.CancelExtendedOperationHandlerCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ExtendedOperationHandler;
import org.forgerock.opendj.config.server.ConfigException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java
index 9e4c093..5adbc27 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -28,9 +28,9 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.CharacterSetPasswordValidatorCfg;
-import org.opends.server.admin.std.server.PasswordValidatorCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.CharacterSetPasswordValidatorCfg;
+import org.forgerock.opendj.server.config.server.PasswordValidatorCfg;
import org.opends.server.api.PasswordValidator;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DirectoryConfig;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java
index 416cf89..fb5beda 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java
@@ -12,14 +12,14 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.ClearPasswordStorageSchemeCfg;
+import org.forgerock.opendj.server.config.server.ClearPasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java
index 8e8ba12..fdca727 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -20,7 +20,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.std.server.
+import org.forgerock.opendj.server.config.server.
CollectiveAttributeSubentriesVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ConfigFileHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ConfigFileHandler.java
index 6025ec0..f58f1d0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ConfigFileHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ConfigFileHandler.java
@@ -48,7 +48,7 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.util.Utils;
-import org.opends.server.admin.std.server.ConfigFileHandlerBackendCfg;
+import org.forgerock.opendj.server.config.server.ConfigFileHandlerBackendCfg;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.Backupable;
import org.opends.server.api.ClientConnection;
@@ -56,7 +56,7 @@
import org.opends.server.api.ConfigChangeListener;
import org.opends.server.api.ConfigDeleteListener;
import org.opends.server.api.ConfigHandler;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.types.Entry;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
@@ -119,10 +119,10 @@
* The mapping that holds all of the configuration entries that have been read
* from the LDIF file.
*/
- private ConcurrentMap<DN,ConfigEntry> configEntries;
+ private ConcurrentMap<DN,Entry> configEntries;
/** The reference to the configuration root entry. */
- private ConfigEntry configRootEntry;
+ private Entry configRootEntry;
/** The set of base DNs for this config handler backend. */
private DN[] baseDNs;
@@ -365,7 +365,7 @@
// Convert the entry to a configuration entry and put it in the config
// hash.
configEntries = new ConcurrentHashMap<>();
- configRootEntry = new ConfigEntry(entry, null);
+ configRootEntry = new Entry(entry, null);
configEntries.put(entry.getName(), configRootEntry);
@@ -429,7 +429,7 @@
entryDN, reader.getLastEntryLineNumber(), f.getAbsolutePath()));
}
- ConfigEntry parentEntry = configEntries.get(parentDN);
+ Entry parentEntry = configEntries.get(parentDN);
if (parentEntry == null)
{
close(reader);
@@ -443,7 +443,7 @@
// parent entry, and put it into the entry has.
try
{
- ConfigEntry configEntry = new ConfigEntry(entry, parentEntry);
+ Entry configEntry = new Entry(entry, parentEntry);
parentEntry.addChild(configEntry);
configEntries.put(entryDN, configEntry);
}
@@ -754,7 +754,7 @@
/** {@inheritDoc} */
@Override
- public ConfigEntry getConfigRootEntry()
+ public Entry getConfigRootEntry()
throws ConfigException
{
return configRootEntry;
@@ -762,7 +762,7 @@
/** {@inheritDoc} */
@Override
- public ConfigEntry getConfigEntry(DN entryDN)
+ public Entry getConfigEntry(DN entryDN)
throws ConfigException
{
return configEntries.get(entryDN);
@@ -825,7 +825,7 @@
public ConditionResult hasSubordinates(DN entryDN)
throws DirectoryException
{
- ConfigEntry baseEntry = configEntries.get(entryDN);
+ Entry baseEntry = configEntries.get(entryDN);
if (baseEntry != null)
{
return ConditionResult.valueOf(baseEntry.hasChildren());
@@ -838,14 +838,14 @@
public long getNumberOfEntriesInBaseDN(DN baseDN) throws DirectoryException
{
checkNotNull(baseDN, "baseDN must not be null");
- final ConfigEntry baseEntry = configEntries.get(baseDN);
+ final Entry baseEntry = configEntries.get(baseDN);
if (baseEntry == null)
{
return -1;
}
long count = 1;
- for (ConfigEntry child : baseEntry.getChildren().values())
+ for (Entry child : baseEntry.getChildren().values())
{
count += getNumberOfEntriesInBaseDN(child.getDN());
count++;
@@ -858,7 +858,7 @@
public long getNumberOfChildren(DN parentDN) throws DirectoryException
{
checkNotNull(parentDN, "parentDN must not be null");
- final ConfigEntry baseEntry = configEntries.get(parentDN);
+ final Entry baseEntry = configEntries.get(parentDN);
return baseEntry != null ? baseEntry.getChildren().size() : -1;
}
@@ -867,13 +867,13 @@
public Entry getEntry(DN entryDN)
throws DirectoryException
{
- ConfigEntry configEntry = configEntries.get(entryDN);
+ Entry configEntry = configEntries.get(entryDN);
if (configEntry == null)
{
return null;
}
- return configEntry.getEntry().duplicate(true);
+ return configEntry.duplicate(true);
}
/** {@inheritDoc} */
@@ -929,7 +929,7 @@
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
}
- ConfigEntry parentEntry = configEntries.get(parentDN);
+ Entry parentEntry = configEntries.get(parentDN);
if (parentEntry == null)
{
// The parent entry does not exist. This is not allowed.
@@ -940,7 +940,7 @@
// Encapsulate the provided entry in a config entry.
- ConfigEntry newEntry = new ConfigEntry(e, parentEntry);
+ Entry newEntry = new Entry(e, parentEntry);
// See if the parent entry has any add listeners. If so, then iterate
@@ -1018,7 +1018,7 @@
synchronized (configLock)
{
// Get the target entry. If it does not exist, then fail.
- ConfigEntry entry = configEntries.get(entryDN);
+ Entry entry = configEntries.get(entryDN);
if (entry == null)
{
DN matchedDN = getMatchedDNForDescendantOfConfig(entryDN);
@@ -1037,7 +1037,7 @@
// Get the parent entry. If there isn't one, then it must be the config
// root, which we won't allow.
- ConfigEntry parentEntry = entry.getParent();
+ Entry parentEntry = entry.getParent();
if (parentEntry == null)
{
LocalizableMessage message = ERR_CONFIG_FILE_DELETE_NO_PARENT.get(entryDN);
@@ -1147,7 +1147,7 @@
// Get the target entry. If it does not exist, then fail.
- ConfigEntry currentEntry = configEntries.get(entryDN);
+ Entry currentEntry = configEntries.get(entryDN);
if (currentEntry == null)
{
DN matchedDN = getMatchedDNForDescendantOfConfig(entryDN);
@@ -1167,7 +1167,7 @@
// Create a new config entry to use for the validation testing.
- ConfigEntry newConfigEntry = new ConfigEntry(e, currentEntry.getParent());
+ Entry newConfigEntry = new Entry(e, currentEntry.getParent());
// See if there are any config change listeners registered for this entry.
@@ -1279,7 +1279,7 @@
// First, get the base DN for the search and make sure that it exists.
DN baseDN = searchOperation.getBaseDN();
- ConfigEntry baseEntry = configEntries.get(baseDN);
+ Entry baseEntry = configEntries.get(baseDN);
if (baseEntry == null)
{
DN matchedDN = getMatchedDNForDescendantOfConfig(baseDN);
@@ -1308,7 +1308,7 @@
case SINGLE_LEVEL:
// We are only interested in entries immediately below the base entry.
// Iterate through them and return the ones that match the filter.
- for (ConfigEntry child : baseEntry.getChildren().values())
+ for (Entry child : baseEntry.getChildren().values())
{
e = child.getEntry().duplicate(true);
if (filter.matchesEntry(e) && !searchOperation.returnEntry(e, null))
@@ -1329,7 +1329,7 @@
case SUBORDINATES:
// We are not interested in the base entry, but we want to check out all
// of its children. Use a recursive process to achieve this.
- for (ConfigEntry child : baseEntry.getChildren().values())
+ for (Entry child : baseEntry.getChildren().values())
{
if (! searchSubtree(child, filter, searchOperation))
{
@@ -1385,7 +1385,7 @@
*
* @throws DirectoryException If a problem occurs during processing.
*/
- private boolean searchSubtree(ConfigEntry baseEntry, SearchFilter filter,
+ private boolean searchSubtree(Entry baseEntry, SearchFilter filter,
SearchOperation searchOperation)
throws DirectoryException
{
@@ -1395,7 +1395,7 @@
return false;
}
- for (ConfigEntry child : baseEntry.getChildren().values())
+ for (Entry child : baseEntry.getChildren().values())
{
if (! searchSubtree(child, filter, searchOperation))
{
@@ -1907,20 +1907,20 @@
* @throws DirectoryException If a problem occurs while attempting to write
* the entry or one of its children.
*/
- private void writeEntryAndChildren(LDIFWriter writer, ConfigEntry configEntry)
+ private void writeEntryAndChildren(LDIFWriter writer, Entry configEntry)
throws DirectoryException
{
try
{
// Write the entry itself to LDIF.
- writer.writeEntry(configEntry.getEntry());
+ writer.writeEntry(configEntry);
}
catch (Exception e)
{
logger.traceException(e);
LocalizableMessage message = ERR_CONFIG_FILE_WRITE_ERROR.get(
- configEntry.getDN(), e);
+ configEntry.getName(), e);
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
}
@@ -1929,8 +1929,8 @@
// See if the entry has any children. If so, then iterate through them and
// write them and their children. We'll copy the entries into a tree map
// so that we have a sensible order in the resulting LDIF.
- TreeMap<DN,ConfigEntry> childMap = new TreeMap<>(configEntry.getChildren());
- for (ConfigEntry childEntry : childMap.values())
+ TreeMap<DN,Entry> childMap = new TreeMap<>(configEntry.getChildren());
+ for (Entry childEntry : childMap.values())
{
writeEntryAndChildren(writer, childEntry);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java
index e9dbea5..b39a178 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2010-2015 ForgeRock AS.
+ * Portions Copyright 2010-2016 ForgeRock AS.
* Portions Copyright 2012 Dariusz Janny <dariusz.janny@gmail.com>
*/
package org.opends.server.extensions;
@@ -22,9 +22,9 @@
import java.util.Random;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.CryptPasswordStorageSchemeCfg;
-import org.opends.server.admin.std.server.PasswordStorageSchemeCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.CryptPasswordStorageSchemeCfg;
+import org.forgerock.opendj.server.config.server.PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DefaultEntryCache.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DefaultEntryCache.java
index 7b47046..f8388cf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DefaultEntryCache.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DefaultEntryCache.java
@@ -23,8 +23,8 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.EntryCacheCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.EntryCacheCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.BackendInitializationListener;
import org.opends.server.api.EntryCache;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java
index 35de03b..8e3122b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java
@@ -13,7 +13,7 @@
*
* Copyright 2008 Sun Microsystems, Inc.
* Portions Copyright 2011 profiq, s.r.o.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -33,9 +33,9 @@
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;
-import org.opends.server.admin.std.server.DictionaryPasswordValidatorCfg;
-import org.opends.server.admin.std.server.PasswordValidatorCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.DictionaryPasswordValidatorCfg;
+import org.forgerock.opendj.server.config.server.PasswordValidatorCfg;
import org.opends.server.api.PasswordValidator;
import org.opends.server.types.*;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
index 164a1ed..3a4947c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
@@ -32,10 +32,10 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
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.meta.DigestMD5SASLMechanismHandlerCfgDefn.QualityOfProtection;
-import org.opends.server.admin.std.server.DigestMD5SASLMechanismHandlerCfg;
-import org.opends.server.admin.std.server.SASLMechanismHandlerCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.DigestMD5SASLMechanismHandlerCfgDefn.QualityOfProtection;
+import org.forgerock.opendj.server.config.server.DigestMD5SASLMechanismHandlerCfg;
+import org.forgerock.opendj.server.config.server.SASLMechanismHandlerCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.IdentityMapper;
import org.opends.server.api.SASLMechanismHandler;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DiskSpaceMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DiskSpaceMonitor.java
index 50ccd56..3d0ce3e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DiskSpaceMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DiskSpaceMonitor.java
@@ -41,7 +41,7 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.DiskSpaceMonitorHandler;
import org.opends.server.api.MonitorData;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java
index 2b5cfda..e0a9794 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java
@@ -30,7 +30,7 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.std.server.DynamicGroupImplementationCfg;
+import org.forgerock.opendj.server.config.server.DynamicGroupImplementationCfg;
import org.opends.server.api.Group;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java
index 3fa561b..0280329 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java
@@ -29,8 +29,8 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.EntityTagVirtualAttributeCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.EntityTagVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.Attribute;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
index ab9c6a2..d7aeb47 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
@@ -28,8 +28,8 @@
import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
+import org.forgerock.opendj.server.config.server.EntryDNVirtualAttributeCfg;
import org.forgerock.opendj.ldap.schema.MatchingRule;
-import org.opends.server.admin.std.server.EntryDNVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java
index 2988c63..6e54284 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java
@@ -24,7 +24,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.std.server.EntryUUIDVirtualAttributeCfg;
+import org.forgerock.opendj.server.config.server.EntryUUIDVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.Attribute;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
index 10631d0..6ed0902 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
@@ -24,11 +24,11 @@
import java.util.HashSet;
import java.util.List;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.
ErrorLogAccountStatusNotificationHandlerCfgDefn;
-import org.opends.server.admin.std.server.AccountStatusNotificationHandlerCfg;
-import org.opends.server.admin.std.server.
+import org.forgerock.opendj.server.config.server.AccountStatusNotificationHandlerCfg;
+import org.forgerock.opendj.server.config.server.
ErrorLogAccountStatusNotificationHandlerCfg;
import org.opends.server.api.AccountStatusNotificationHandler;
import org.forgerock.opendj.config.server.ConfigException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java
index 897098e..03cc45e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java
@@ -31,9 +31,9 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.ExactMatchIdentityMapperCfg;
-import org.opends.server.admin.std.server.IdentityMapperCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.ExactMatchIdentityMapperCfg;
+import org.forgerock.opendj.server.config.server.IdentityMapperCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.IdentityMapper;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java
index 315a16b..4992e2e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java
@@ -23,12 +23,12 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.ExternalSASLMechanismHandlerCfg;
-import org.opends.server.admin.std.server.SASLMechanismHandlerCfg;
+import org.forgerock.opendj.server.config.server.ExternalSASLMechanismHandlerCfg;
+import org.forgerock.opendj.server.config.server.SASLMechanismHandlerCfg;
import org.opends.server.api.CertificateMapper;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.SASLMechanismHandler;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java
index ad0f407..6937fcc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java
@@ -36,9 +36,9 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.util.Utils;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.EntryCacheCfg;
-import org.opends.server.admin.std.server.FIFOEntryCacheCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.EntryCacheCfg;
+import org.forgerock.opendj.server.config.server.FIFOEntryCacheCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.EntryCache;
import org.opends.server.api.MonitorData;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java
index ffe4c7a..eee2e5b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java
@@ -37,8 +37,8 @@
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.FileBasedKeyManagerProviderCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.FileBasedKeyManagerProviderCfg;
import org.opends.server.api.KeyManagerProvider;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.DN;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java
index e7f13f0..99ea7b4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java
@@ -28,9 +28,9 @@
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.TrustManagerProviderCfg;
-import org.opends.server.admin.std.server.FileBasedTrustManagerProviderCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.TrustManagerProviderCfg;
+import org.forgerock.opendj.server.config.server.FileBasedTrustManagerProviderCfg;
import org.opends.server.api.TrustManagerProvider;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java
index 79e5473..b4cd54a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java
@@ -34,9 +34,9 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.CertificateMapperCfg;
-import org.opends.server.admin.std.server.FingerprintCertificateMapperCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.CertificateMapperCfg;
+import org.forgerock.opendj.server.config.server.FingerprintCertificateMapperCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.CertificateMapper;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
index 6dfc162..3bb2724 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
@@ -46,10 +46,10 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
import org.ietf.jgss.GSSException;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.GSSAPISASLMechanismHandlerCfgDefn.QualityOfProtection;
-import org.opends.server.admin.std.server.GSSAPISASLMechanismHandlerCfg;
-import org.opends.server.admin.std.server.SASLMechanismHandlerCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.GSSAPISASLMechanismHandlerCfgDefn.QualityOfProtection;
+import org.forgerock.opendj.server.config.server.GSSAPISASLMechanismHandlerCfg;
+import org.forgerock.opendj.server.config.server.SASLMechanismHandlerCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.IdentityMapper;
import org.opends.server.api.SASLMechanismHandler;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/GetConnectionIDExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GetConnectionIDExtendedOperation.java
index c418f62..114951e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/GetConnectionIDExtendedOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GetConnectionIDExtendedOperation.java
@@ -12,11 +12,11 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
-import org.opends.server.admin.std.server.
+import org.forgerock.opendj.server.config.server.
GetConnectionIdExtendedOperationHandlerCfg;
import org.opends.server.api.ExtendedOperationHandler;
import org.forgerock.opendj.config.server.ConfigException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java
index 65fe3d4..f0ea90a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java
@@ -25,7 +25,7 @@
import org.forgerock.opendj.ldap.RDN;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.std.server.GoverningStructureRuleVirtualAttributeCfg;
+import org.forgerock.opendj.server.config.server.GoverningStructureRuleVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
index 451eb29..acc3d93 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -23,7 +23,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.std.server.HasSubordinatesVirtualAttributeCfg;
+import org.forgerock.opendj.server.config.server.HasSubordinatesVirtualAttributeCfg;
import org.opends.server.api.Backend;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.opends.server.api.VirtualAttributeProvider;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
index d6cc699..4538191 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
@@ -25,7 +25,7 @@
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.SearchScope;
-import org.opends.server.admin.std.server.IsMemberOfVirtualAttributeCfg;
+import org.forgerock.opendj.server.config.server.IsMemberOfVirtualAttributeCfg;
import org.opends.server.api.Group;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/JMXAlertHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/JMXAlertHandler.java
index 1af1621..6cacd90 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/JMXAlertHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/JMXAlertHandler.java
@@ -38,9 +38,9 @@
import javax.management.NotificationBroadcasterSupport;
import javax.management.ObjectName;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.AlertHandlerCfg;
-import org.opends.server.admin.std.server.JMXAlertHandlerCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.AlertHandlerCfg;
+import org.forgerock.opendj.server.config.server.JMXAlertHandlerCfg;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.AlertHandler;
import org.opends.server.api.DirectoryServerMBean;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
index 06899fe..1cdd27f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
@@ -66,9 +66,9 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.LDAPPassThroughAuthenticationPolicyCfgDefn.MappingPolicy;
-import org.opends.server.admin.std.server.LDAPPassThroughAuthenticationPolicyCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.LDAPPassThroughAuthenticationPolicyCfgDefn.MappingPolicy;
+import org.forgerock.opendj.server.config.server.LDAPPassThroughAuthenticationPolicyCfg;
import org.opends.server.api.AuthenticationPolicy;
import org.opends.server.api.AuthenticationPolicyFactory;
import org.opends.server.api.AuthenticationPolicyState;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java
index 5d4f191..60dcff8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -20,9 +20,9 @@
import java.util.List;
import java.util.Set;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.LengthBasedPasswordValidatorCfg;
-import org.opends.server.admin.std.server.PasswordValidatorCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.LengthBasedPasswordValidatorCfg;
+import org.forgerock.opendj.server.config.server.PasswordValidatorCfg;
import org.opends.server.api.PasswordValidator;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java
index 5e31781..f76e9da 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -22,7 +22,7 @@
import java.util.Arrays;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.MD5PasswordStorageSchemeCfg;
+import org.forgerock.opendj.server.config.server.MD5PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java
index 6186c86..76c1490 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java
@@ -24,8 +24,8 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.MemberVirtualAttributeCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.MemberVirtualAttributeCfg;
import org.opends.server.api.Group;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullKeyManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullKeyManagerProvider.java
index 7271a2f..319a9b1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullKeyManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullKeyManagerProvider.java
@@ -12,13 +12,13 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
import javax.net.ssl.KeyManager;
-import org.opends.server.admin.std.server.KeyManagerProviderCfg;
+import org.forgerock.opendj.server.config.server.KeyManagerProviderCfg;
import org.opends.server.api.KeyManagerProvider;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullTrustManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullTrustManagerProvider.java
index b223dd8..da06726 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullTrustManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullTrustManagerProvider.java
@@ -12,13 +12,13 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
import javax.net.ssl.TrustManager;
-import org.opends.server.admin.std.server.TrustManagerProviderCfg;
+import org.forgerock.opendj.server.config.server.TrustManagerProviderCfg;
import org.opends.server.api.TrustManagerProvider;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java
index 9b44263..ae06ec7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -23,7 +23,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.std.server.NumSubordinatesVirtualAttributeCfg;
+import org.forgerock.opendj.server.config.server.NumSubordinatesVirtualAttributeCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
index fb4c493..a9a367e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2013-2015 ForgeRock AS.
+ * Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -30,8 +30,8 @@
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.PBKDF2PasswordStorageSchemeCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.PBKDF2PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.config.server.ConfigChangeResult;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java
index e75ad67..f927f57 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java
@@ -28,8 +28,8 @@
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.PKCS11KeyManagerProviderCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.PKCS11KeyManagerProviderCfg;
import org.opends.server.api.KeyManagerProvider;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS5S2PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS5S2PasswordStorageScheme.java
index 232e549..2d89b6c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS5S2PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS5S2PasswordStorageScheme.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2014-2015 ForgeRock AS.
+ * Copyright 2014-2016 ForgeRock AS.
* Portions Copyright 2014 Emidio Stani & Andrea Stani
*/
package org.opends.server.extensions;
@@ -29,7 +29,7 @@
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.std.server.PKCS5S2PasswordStorageSchemeCfg;
+import org.forgerock.opendj.server.config.server.PKCS5S2PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java
index bde5cbc..8f4ed19 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -30,8 +30,8 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
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.ParallelWorkQueueCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.ParallelWorkQueueCfg;
import org.opends.server.api.WorkQueue;
import org.opends.server.core.DirectoryServer;
import org.opends.server.monitors.ParallelWorkQueueMonitor;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
index 940ea24..29899b5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
@@ -12,21 +12,21 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2012 profiq s.r.o.
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ResultCode;
-import
- org.opends.server.admin.std.server.PasswordExpirationTimeVirtualAttributeCfg;
+import org.forgerock.opendj.server.config.server.PasswordExpirationTimeVirtualAttributeCfg;
import org.opends.server.api.AuthenticationPolicy;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.PasswordPolicyState;
import org.opends.server.core.SearchOperation;
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.types.*;
+
import static org.opends.messages.ExtensionMessages.*;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordModifyExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordModifyExtendedOperation.java
index 13f1944..17d32c0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordModifyExtendedOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordModifyExtendedOperation.java
@@ -49,9 +49,9 @@
import org.forgerock.opendj.ldap.ModificationType;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.ExtendedOperationHandlerCfg;
-import org.opends.server.admin.std.server.PasswordModifyExtendedOperationHandlerCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.ExtendedOperationHandlerCfg;
+import org.forgerock.opendj.server.config.server.PasswordModifyExtendedOperationHandlerCfg;
import org.opends.server.api.AuthenticationPolicy;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ExtendedOperationHandler;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java
index 681b43c..aa4250f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java
@@ -34,7 +34,7 @@
import org.forgerock.opendj.ldap.GeneralizedTime;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
-import org.opends.server.admin.std.server.PasswordPolicyStateExtendedOperationHandlerCfg;
+import org.forgerock.opendj.server.config.server.PasswordPolicyStateExtendedOperationHandlerCfg;
import org.opends.server.api.AuthenticationPolicy;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ExtendedOperationHandler;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
index d34d52f..991e81c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
@@ -12,14 +12,14 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.std.server.
+import org.forgerock.opendj.server.config.server.
PasswordPolicySubentryVirtualAttributeCfg;
import org.opends.server.api.AuthenticationPolicy;
import org.opends.server.api.VirtualAttributeProvider;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java
index bde8dcb..53130a5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java
@@ -31,9 +31,9 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.PlainSASLMechanismHandlerCfg;
-import org.opends.server.admin.std.server.SASLMechanismHandlerCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.PlainSASLMechanismHandlerCfg;
+import org.forgerock.opendj.server.config.server.SASLMechanismHandlerCfg;
import org.opends.server.api.AuthenticationPolicyState;
import org.opends.server.api.IdentityMapper;
import org.opends.server.api.SASLMechanismHandler;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java
index a7b7d91..ff4e0bd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java
@@ -12,14 +12,14 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.RC4PasswordStorageSchemeCfg;
+import org.forgerock.opendj.server.config.server.RC4PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java
index 100acdd..ef2e150 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java
@@ -32,9 +32,9 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.PasswordGeneratorCfg;
-import org.opends.server.admin.std.server.RandomPasswordGeneratorCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.PasswordGeneratorCfg;
+import org.forgerock.opendj.server.config.server.RandomPasswordGeneratorCfg;
import org.opends.server.api.PasswordGenerator;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java
index 56d05a1..18e4535 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java
@@ -39,9 +39,9 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.IdentityMapperCfg;
-import org.opends.server.admin.std.server.RegularExpressionIdentityMapperCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.IdentityMapperCfg;
+import org.forgerock.opendj.server.config.server.RegularExpressionIdentityMapperCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.IdentityMapper;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java
index 46cd778..7ae194f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -26,8 +26,8 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.
RepeatedCharactersPasswordValidatorCfg;
import org.opends.server.api.PasswordValidator;
import org.opends.server.types.*;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java
index 40e9b75..c103a27 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -22,7 +22,7 @@
import java.util.Arrays;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.SHA1PasswordStorageSchemeCfg;
+import org.forgerock.opendj.server.config.server.SHA1PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
index 47f808c..5aeebee 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
@@ -38,9 +38,9 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.util.Utils;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.AccountStatusNotificationHandlerCfg;
-import org.opends.server.admin.std.server.SMTPAccountStatusNotificationHandlerCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.AccountStatusNotificationHandlerCfg;
+import org.forgerock.opendj.server.config.server.SMTPAccountStatusNotificationHandlerCfg;
import org.opends.server.api.AccountStatusNotificationHandler;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.AccountStatusNotification;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAlertHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAlertHandler.java
index 7f89dff..c7d8365 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAlertHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAlertHandler.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -26,9 +26,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.AlertHandlerCfg;
-import org.opends.server.admin.std.server.SMTPAlertHandlerCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.AlertHandlerCfg;
+import org.forgerock.opendj.server.config.server.SMTPAlertHandlerCfg;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.AlertHandler;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
index 92cb1fc..7e7dd34 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -23,7 +23,7 @@
import java.util.Random;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.SaltedMD5PasswordStorageSchemeCfg;
+import org.forgerock.opendj.server.config.server.SaltedMD5PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
index ca61616..5ce6dd7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2010-2015 ForgeRock AS.
+ * Portions Copyright 2010-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -23,7 +23,7 @@
import java.util.Random;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.SaltedSHA1PasswordStorageSchemeCfg;
+import org.forgerock.opendj.server.config.server.SaltedSHA1PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
index 91b444a..bf5f259 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2010-2015 ForgeRock AS.
+ * Portions Copyright 2010-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -23,7 +23,7 @@
import java.util.Random;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.SaltedSHA256PasswordStorageSchemeCfg;
+import org.forgerock.opendj.server.config.server.SaltedSHA256PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
index 65779f0..0eaa0e4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2010-2015 ForgeRock AS.
+ * Portions Copyright 2010-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -23,7 +23,7 @@
import java.util.Random;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.SaltedSHA384PasswordStorageSchemeCfg;
+import org.forgerock.opendj.server.config.server.SaltedSHA384PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
index 0d67316..4a9a7ba 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2010-2015 ForgeRock AS.
+ * Portions Copyright 2010-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -23,7 +23,7 @@
import java.util.Random;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.SaltedSHA512PasswordStorageSchemeCfg;
+import org.forgerock.opendj.server.config.server.SaltedSHA512PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java
index 18be36d..a9a1fc1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -29,8 +29,8 @@
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 org.forgerock.opendj.server.config.server.SimilarityBasedPasswordValidatorCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
/**
* This class provides a password validator that can ensure that the provided
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SoftReferenceEntryCache.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SoftReferenceEntryCache.java
index 4f45ef3..911f2b1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SoftReferenceEntryCache.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SoftReferenceEntryCache.java
@@ -33,9 +33,9 @@
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.util.Utils;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.EntryCacheCfg;
-import org.opends.server.admin.std.server.SoftReferenceEntryCacheCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.EntryCacheCfg;
+import org.forgerock.opendj.server.config.server.SoftReferenceEntryCacheCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.DirectoryThread;
import org.opends.server.api.EntryCache;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StartTLSExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StartTLSExtendedOperation.java
index 11c270d..dce63be 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StartTLSExtendedOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StartTLSExtendedOperation.java
@@ -12,12 +12,12 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
import org.forgerock.i18n.LocalizableMessageBuilder;
-import org.opends.server.admin.std.server.StartTLSExtendedOperationHandlerCfg;
+import org.forgerock.opendj.server.config.server.StartTLSExtendedOperationHandlerCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ExtendedOperationHandler;
import org.forgerock.opendj.config.server.ConfigException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java
index 4045ed1..3652f6a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java
@@ -36,8 +36,8 @@
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.util.Reject;
-import org.opends.server.admin.std.server.GroupImplementationCfg;
-import org.opends.server.admin.std.server.StaticGroupImplementationCfg;
+import org.forgerock.opendj.server.config.server.GroupImplementationCfg;
+import org.forgerock.opendj.server.config.server.StaticGroupImplementationCfg;
import org.opends.server.api.Group;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java
index 52791c8..4821a42 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -22,7 +22,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.std.server.StructuralObjectClassVirtualAttributeCfg;
+import org.forgerock.opendj.server.config.server.StructuralObjectClassVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.Attribute;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
index dc17701..8560858 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
@@ -39,15 +39,15 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
import org.forgerock.opendj.ldap.AVA;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.RDN;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.CertificateMapperCfg;
-import org.opends.server.admin.std.server.SubjectAttributeToUserAttributeCertificateMapperCfg;
+import org.forgerock.opendj.server.config.server.CertificateMapperCfg;
+import org.forgerock.opendj.server.config.server.SubjectAttributeToUserAttributeCertificateMapperCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.CertificateMapper;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
index 9fc49cc..af8976d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
@@ -34,9 +34,9 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.CertificateMapperCfg;
-import org.opends.server.admin.std.server.SubjectDNToUserAttributeCertificateMapperCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.CertificateMapperCfg;
+import org.forgerock.opendj.server.config.server.SubjectDNToUserAttributeCertificateMapperCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.CertificateMapper;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
index f65818b..9ed11af 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
@@ -23,7 +23,7 @@
import javax.security.auth.x500.X500Principal;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.SubjectEqualsDNCertificateMapperCfg;
+import org.forgerock.opendj.server.config.server.SubjectEqualsDNCertificateMapperCfg;
import org.opends.server.api.CertificateMapper;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
index aa87633..afb6426 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
@@ -23,7 +23,7 @@
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.std.server.SubschemaSubentryVirtualAttributeCfg;
+import org.forgerock.opendj.server.config.server.SubschemaSubentryVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java
index 63ac08e..9bb9373 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -34,8 +34,8 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
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.TraditionalWorkQueueCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.TraditionalWorkQueueCfg;
import org.opends.server.api.WorkQueue;
import org.opends.server.core.DirectoryServer;
import org.opends.server.monitors.TraditionalWorkQueueMonitor;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java
index cdd1116..b542122 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java
@@ -12,14 +12,14 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.TripleDESPasswordStorageSchemeCfg;
+import org.forgerock.opendj.server.config.server.TripleDESPasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java
index aa8d111..ca86d6f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -26,8 +26,8 @@
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.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.UniqueCharactersPasswordValidatorCfg;
import org.opends.server.api.PasswordValidator;
import org.opends.server.types.*;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
index 4dba075..3446230 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -23,8 +23,8 @@
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.UserDefinedVirtualAttributeCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.UserDefinedVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java
index 2dc115b..618c327 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java
@@ -28,7 +28,7 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.std.server.VirtualStaticGroupImplementationCfg;
+import org.forgerock.opendj.server.config.server.VirtualStaticGroupImplementationCfg;
import org.opends.server.api.Group;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/WhoAmIExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/WhoAmIExtendedOperation.java
index 6a2e8a1..9627960 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/WhoAmIExtendedOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/WhoAmIExtendedOperation.java
@@ -26,7 +26,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.std.server.WhoAmIExtendedOperationHandlerCfg;
+import org.forgerock.opendj.server.config.server.WhoAmIExtendedOperationHandlerCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ExtendedOperationHandler;
import org.opends.server.controls.ProxiedAuthV1Control;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractLogger.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractLogger.java
index a3067bb..5c3c314 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractLogger.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractLogger.java
@@ -29,11 +29,11 @@
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;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.std.server.LogPublisherCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.server.LogPublisherCfg;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
import org.forgerock.opendj.ldap.DN;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
index ea2da3d..e979639 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
@@ -34,13 +34,13 @@
import org.forgerock.opendj.ldap.AddressMask;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DN;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.std.meta.AccessLogFilteringCriteriaCfgDefn.LogRecordType;
-import org.opends.server.admin.std.meta.AccessLogPublisherCfgDefn.FilteringPolicy;
-import org.opends.server.admin.std.server.AccessLogFilteringCriteriaCfg;
-import org.opends.server.admin.std.server.AccessLogPublisherCfg;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.meta.AccessLogFilteringCriteriaCfgDefn.LogRecordType;
+import org.forgerock.opendj.server.config.meta.AccessLogPublisherCfgDefn.FilteringPolicy;
+import org.forgerock.opendj.server.config.server.AccessLogFilteringCriteriaCfg;
+import org.forgerock.opendj.server.config.server.AccessLogPublisherCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.Group;
import org.opends.server.authorization.dseecompat.PatternDN;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogPublisher.java
index 32cce95..a989bb3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogPublisher.java
@@ -12,14 +12,14 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.AccessLogPublisherCfg;
+import org.forgerock.opendj.server.config.server.AccessLogPublisherCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.core.*;
import org.opends.server.types.DisconnectReason;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogger.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogger.java
index 95d8a34..6322df3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogger.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogger.java
@@ -12,15 +12,15 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
import java.util.Collection;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.std.meta.AccessLogPublisherCfgDefn;
-import org.opends.server.admin.std.server.AccessLogPublisherCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.server.config.meta.AccessLogPublisherCfgDefn;
+import org.forgerock.opendj.server.config.server.AccessLogPublisherCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.core.*;
import org.opends.server.types.DisconnectReason;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAudit.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAudit.java
index d3caab6..4a44075 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAudit.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAudit.java
@@ -62,22 +62,21 @@
import org.forgerock.json.resource.RequestHandler;
import org.forgerock.opendj.config.ConfigurationFramework;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.server.CsvFileAccessLogPublisherCfg;
-import org.opends.server.admin.std.server.CsvFileHTTPAccessLogPublisherCfg;
-import org.opends.server.admin.std.server.ExternalAccessLogPublisherCfg;
-import org.opends.server.admin.std.server.ExternalHTTPAccessLogPublisherCfg;
-import org.opends.server.admin.std.server.FileCountLogRetentionPolicyCfg;
-import org.opends.server.admin.std.server.FixedTimeLogRotationPolicyCfg;
-import org.opends.server.admin.std.server.FreeDiskSpaceLogRetentionPolicyCfg;
-import org.opends.server.admin.std.server.LogPublisherCfg;
-import org.opends.server.admin.std.server.LogRetentionPolicyCfg;
-import org.opends.server.admin.std.server.LogRotationPolicyCfg;
-import org.opends.server.admin.std.server.RootCfg;
-import org.opends.server.admin.std.server.SizeLimitLogRetentionPolicyCfg;
-import org.opends.server.admin.std.server.SizeLimitLogRotationPolicyCfg;
-import org.opends.server.admin.std.server.TimeLimitLogRotationPolicyCfg;
-import org.opends.server.config.ConfigEntry;
+import org.forgerock.opendj.server.config.server.CsvFileAccessLogPublisherCfg;
+import org.forgerock.opendj.server.config.server.CsvFileHTTPAccessLogPublisherCfg;
+import org.forgerock.opendj.server.config.server.ExternalAccessLogPublisherCfg;
+import org.forgerock.opendj.server.config.server.ExternalHTTPAccessLogPublisherCfg;
+import org.forgerock.opendj.server.config.server.FileCountLogRetentionPolicyCfg;
+import org.forgerock.opendj.server.config.server.FixedTimeLogRotationPolicyCfg;
+import org.forgerock.opendj.server.config.server.FreeDiskSpaceLogRetentionPolicyCfg;
+import org.forgerock.opendj.server.config.server.LogPublisherCfg;
+import org.forgerock.opendj.server.config.server.LogRetentionPolicyCfg;
+import org.forgerock.opendj.server.config.server.LogRotationPolicyCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
+import org.forgerock.opendj.server.config.server.SizeLimitLogRetentionPolicyCfg;
+import org.forgerock.opendj.server.config.server.SizeLimitLogRotationPolicyCfg;
+import org.forgerock.opendj.server.config.server.TimeLimitLogRotationPolicyCfg;
+import org.opends.server.types.Entry;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.DN;
import org.opends.server.util.StaticUtils;
@@ -504,7 +503,7 @@
private void addCsvHandlerRotationConfig(PublisherConfig publisher, CsvConfigData config,
CsvAuditEventHandlerConfiguration auditConfig) throws ConfigException
{
- RootCfg root = ServerManagementContext.getInstance().getRootConfiguration();
+ RootCfg root = serverContext.getServerManagementContext().getRootConfiguration();
SortedSet<String> rotationPolicies = config.getRotationPolicies();
if (rotationPolicies.isEmpty())
{
@@ -542,7 +541,7 @@
private void addCsvHandlerRetentionConfig(PublisherConfig publisher, CsvConfigData config,
CsvAuditEventHandlerConfiguration auditConfig) throws ConfigException
{
- RootCfg root = ServerManagementContext.getInstance().getRootConfiguration();
+ RootCfg root = serverContext.getServerManagementContext().getRootConfiguration();
SortedSet<String> retentionPolicies = config.getRetentionPolicies();
if (retentionPolicies.isEmpty())
{
@@ -707,7 +706,7 @@
PublisherConfig(LogPublisherCfg config) throws ConfigException
{
this.config = config;
- ConfigEntry configEntry = DirectoryServer.getConfigEntry(config.dn());
+ Entry configEntry = DirectoryServer.getConfigEntry(config.dn());
if (configEntry.hasObjectClass("ds-cfg-csv-file-access-log-publisher"))
{
auditType = AuditType.CSV;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditAccessLogPublisher.java
index 5a7f358..fd7c6aa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditAccessLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditAccessLogPublisher.java
@@ -40,7 +40,7 @@
import org.forgerock.util.Pair;
import org.forgerock.util.promise.ExceptionHandler;
import org.forgerock.util.promise.RuntimeExceptionHandler;
-import org.opends.server.admin.std.server.AccessLogPublisherCfg;
+import org.forgerock.opendj.server.config.server.AccessLogPublisherCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ExtendedOperationHandler;
import org.opends.server.controls.TransactionIdControl;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditHTTPAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditHTTPAccessLogPublisher.java
index c23b857..bb7647c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditHTTPAccessLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditHTTPAccessLogPublisher.java
@@ -20,8 +20,8 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.json.resource.RequestHandler;
import org.forgerock.opendj.config.server.ConfigChangeResult;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.HTTPAccessLogPublisherCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.HTTPAccessLogPublisherCfg;
import org.opends.server.core.ServerContext;
import org.forgerock.opendj.ldap.DN;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ConsoleDebugLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ConsoleDebugLogPublisher.java
index 607bc3e..f58f889 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ConsoleDebugLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ConsoleDebugLogPublisher.java
@@ -20,7 +20,7 @@
import java.text.DateFormat;
import java.text.SimpleDateFormat;
-import org.opends.server.admin.std.server.DebugLogPublisherCfg;
+import org.forgerock.opendj.server.config.server.DebugLogPublisherCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ServerContext;
import org.forgerock.opendj.ldap.DN;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/CsvFileAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/CsvFileAccessLogPublisher.java
index b4585d0..0c60beb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/CsvFileAccessLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/CsvFileAccessLogPublisher.java
@@ -27,9 +27,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageDescriptor;
import org.forgerock.opendj.config.server.ConfigChangeResult;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.CsvFileAccessLogPublisherCfg;
import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.CsvFileAccessLogPublisherCfg;
/**
* Common Audit publisher which publishes access events to CSV files.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogPublisher.java
index ba801c1..1dcb57b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogPublisher.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -22,7 +22,7 @@
import java.util.TreeMap;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.DebugLogPublisherCfg;
+import org.forgerock.opendj.server.config.server.DebugLogPublisherCfg;
/**
* This class defines the set of methods and structures that must be
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogger.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogger.java
index 02f8cb1..18c64ab 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogger.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogger.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2007-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -25,10 +25,10 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.std.meta.DebugLogPublisherCfgDefn;
-import org.opends.server.admin.std.server.DebugLogPublisherCfg;
import org.opends.server.core.ServerContext;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.server.config.meta.DebugLogPublisherCfgDefn;
+import org.forgerock.opendj.server.config.server.DebugLogPublisherCfg;
/**
* A logger for debug and trace logging. DebugLogger provides a debugging
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogPublisher.java
index 6e72638..4fa9bf1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogPublisher.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -27,7 +27,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.messages.Severity;
-import org.opends.server.admin.std.server.ErrorLogPublisherCfg;
+import org.forgerock.opendj.server.config.server.ErrorLogPublisherCfg;
/**
* This class defines the set of methods and structures that must be implemented
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogger.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogger.java
index f015deb..1251462 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogger.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogger.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -22,9 +22,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.messages.Severity;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.std.meta.ErrorLogPublisherCfgDefn;
-import org.opends.server.admin.std.server.ErrorLogPublisherCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.server.config.meta.ErrorLogPublisherCfgDefn;
+import org.forgerock.opendj.server.config.server.ErrorLogPublisherCfg;
import org.opends.server.api.DirectoryThread;
import org.opends.server.backends.task.Task;
import org.opends.server.core.ServerContext;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ExternalAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ExternalAccessLogPublisher.java
index 6934656..8e212ef 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ExternalAccessLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ExternalAccessLogPublisher.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2015 ForgeRock AS.
+ * Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -19,8 +19,8 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigChangeResult;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.ExternalAccessLogPublisherCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.ExternalAccessLogPublisherCfg;
/**
* Common audit publisher which publishes access events to some external
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java
index 87615fc..32008f4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
import static org.opends.messages.LoggerMessages.*;
@@ -23,8 +23,8 @@
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.FileCountLogRetentionPolicyCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.FileCountLogRetentionPolicyCfg;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FixedTimeRotationPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FixedTimeRotationPolicy.java
index 4744444..4a0d85c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FixedTimeRotationPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FixedTimeRotationPolicy.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
import java.util.Arrays;
@@ -21,8 +21,8 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.FixedTimeLogRotationPolicyCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.FixedTimeLogRotationPolicyCfg;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.util.TimeThread;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
index 30b3576..d169d89 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -26,8 +26,8 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.FreeDiskSpaceLogRetentionPolicyCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.FreeDiskSpaceLogRetentionPolicyCfg;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogPublisher.java
index 9df9e76..c616e07 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogPublisher.java
@@ -11,14 +11,14 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.HTTPAccessLogPublisherCfg;
+import org.forgerock.opendj.server.config.server.HTTPAccessLogPublisherCfg;
/**
* This class defines the set of methods and structures that must be implemented
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogger.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogger.java
index 605f858..330ed77 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogger.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogger.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -19,9 +19,9 @@
import java.util.Collection;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.std.meta.HTTPAccessLogPublisherCfgDefn;
-import org.opends.server.admin.std.server.HTTPAccessLogPublisherCfg;
+import org.forgerock.opendj.config.ClassPropertyDefinition;
+import org.forgerock.opendj.server.config.meta.HTTPAccessLogPublisherCfgDefn;
+import org.forgerock.opendj.server.config.server.HTTPAccessLogPublisherCfg;
/**
* This class defines the wrapper that will invoke all registered HTTP access
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/LogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/LogPublisher.java
index 810801a..719eac5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/LogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/LogPublisher.java
@@ -20,7 +20,7 @@
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.LogPublisherCfg;
+import org.forgerock.opendj.server.config.server.LogPublisherCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ServerContext;
import org.forgerock.opendj.ldap.DN;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java
index 9765891..1358b88 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -32,8 +32,8 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.SizeLimitLogRotationPolicyCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.SizeLimitLogRotationPolicyCfg;
import org.opends.server.api.DirectoryThread;
import org.opends.server.api.ServerShutdownListener;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/RetentionPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/RetentionPolicy.java
index 23d5607..ed23774 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/RetentionPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/RetentionPolicy.java
@@ -12,13 +12,13 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
import java.io.File;
-import org.opends.server.admin.std.server.LogRetentionPolicyCfg;
+import org.forgerock.opendj.server.config.server.LogRetentionPolicyCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationActionThread.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationActionThread.java
index c3e5c6c..5ff9bbf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationActionThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationActionThread.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -20,7 +20,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.DirectoryThread;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.types.Entry;
/**
* This thread is spawned off at the time of file rotation to
@@ -33,7 +33,7 @@
private ArrayList<ActionType> actions;
private String filename;
- private ConfigEntry configEntry;
+ private Entry configEntry;
/**
* Create the logger thread along with the specified file name,
@@ -46,7 +46,7 @@
*/
public RotationActionThread(String filename,
ArrayList<ActionType> actions,
- ConfigEntry configEntry)
+ Entry configEntry)
{
super("Logger Rotation Action Thread");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationPolicy.java
index 3f6f4c2..32f3e80 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationPolicy.java
@@ -12,11 +12,11 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
-import org.opends.server.admin.std.server.LogRotationPolicyCfg;
+import org.forgerock.opendj.server.config.server.LogRotationPolicyCfg;
import org.opends.server.types.InitializationException;
import org.forgerock.opendj.config.server.ConfigException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java
index f3a3cfc..1b87909 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
import static org.opends.messages.LoggerMessages.*;
@@ -23,8 +23,8 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.SizeLimitLogRetentionPolicyCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.SizeLimitLogRetentionPolicyCfg;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRotationPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRotationPolicy.java
index dfe643c..206e0dd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRotationPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRotationPolicy.java
@@ -12,14 +12,14 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.std.server.SizeLimitLogRotationPolicyCfg;
-import org.opends.server.admin.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.SizeLimitLogRotationPolicyCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
import org.opends.server.types.InitializationException;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java
index 41d25db..b6722d3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java
@@ -34,9 +34,9 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.util.Utils;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.FileBasedAccessLogPublisherCfgDefn.LogFormat;
-import org.opends.server.admin.std.server.FileBasedAccessLogPublisherCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.FileBasedAccessLogPublisherCfgDefn.LogFormat;
+import org.forgerock.opendj.server.config.server.FileBasedAccessLogPublisherCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ExtendedOperationHandler;
import org.opends.server.controls.TransactionIdControl;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAuditLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAuditLogPublisher.java
index f673152..80d4c84 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAuditLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAuditLogPublisher.java
@@ -31,8 +31,8 @@
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DN;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.FileBasedAuditLogPublisherCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.FileBasedAuditLogPublisherCfg;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextDebugLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextDebugLogPublisher.java
index ed06281..e3fe74e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextDebugLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextDebugLogPublisher.java
@@ -24,11 +24,11 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.std.server.DebugTargetCfg;
-import org.opends.server.admin.std.server.FileBasedDebugLogPublisherCfg;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.server.DebugTargetCfg;
+import org.forgerock.opendj.server.config.server.FileBasedDebugLogPublisherCfg;
import org.opends.server.api.DirectoryThread;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextErrorLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextErrorLogPublisher.java
index 1ca7a8e..2eea96a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextErrorLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextErrorLogPublisher.java
@@ -33,9 +33,9 @@
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.messages.Severity;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.ErrorLogPublisherCfgDefn;
-import org.opends.server.admin.std.server.FileBasedErrorLogPublisherCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.ErrorLogPublisherCfgDefn;
+import org.forgerock.opendj.server.config.server.FileBasedErrorLogPublisherCfg;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
import org.forgerock.opendj.ldap.DN;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextHTTPAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
index df24445..1670a06 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
@@ -35,8 +35,8 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.util.Utils;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.FileBasedHTTPAccessLogPublisherCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.FileBasedHTTPAccessLogPublisherCfg;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java
index 084a318..e6ad197 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java
@@ -19,7 +19,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.messages.Severity;
-import org.opends.server.admin.std.server.ErrorLogPublisherCfg;
+import org.forgerock.opendj.server.config.server.ErrorLogPublisherCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ServerContext;
import org.forgerock.opendj.ldap.DN;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeLimitRotationPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeLimitRotationPolicy.java
index 137b358..369738e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeLimitRotationPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeLimitRotationPolicy.java
@@ -12,14 +12,14 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.util.TimeThread;
-import org.opends.server.admin.std.server.TimeLimitLogRotationPolicyCfg;
-import org.opends.server.admin.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.TimeLimitLogRotationPolicyCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import java.util.List;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TraceSettings.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TraceSettings.java
index 84920c3..1c1dc3f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TraceSettings.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TraceSettings.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -20,8 +20,8 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigChangeResult;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.DebugTargetCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.DebugTargetCfg;
/** This class encapsulates the trace settings in effect at a given tracing scope. */
public class TraceSettings implements
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java
index 3408eb8..afd7cec 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java
@@ -23,7 +23,7 @@
import java.util.Collection;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.MonitorData;
import org.opends.server.api.MonitorProvider;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/ClientConnectionMonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/ClientConnectionMonitorProvider.java
index c826099..a87a8b6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/ClientConnectionMonitorProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/ClientConnectionMonitorProvider.java
@@ -21,7 +21,7 @@
import java.util.TreeMap;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.std.server.ClientConnectionMonitorProviderCfg;
+import org.forgerock.opendj.server.config.server.ClientConnectionMonitorProviderCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ConnectionHandler;
import org.opends.server.api.MonitorData;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/ConnectionHandlerMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/ConnectionHandlerMonitor.java
index b482054..15d1319 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/ConnectionHandlerMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/ConnectionHandlerMonitor.java
@@ -22,8 +22,8 @@
import java.util.Collection;
import java.util.LinkedList;
-import org.opends.server.admin.std.server.ConnectionHandlerCfg;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
+import org.forgerock.opendj.server.config.server.ConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ConnectionHandler;
import org.opends.server.api.MonitorData;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/EntryCacheMonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/EntryCacheMonitorProvider.java
index 61e00f4..f143f55 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/EntryCacheMonitorProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/EntryCacheMonitorProvider.java
@@ -21,8 +21,8 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.std.server.EntryCacheCfg;
-import org.opends.server.admin.std.server.EntryCacheMonitorProviderCfg;
+import org.forgerock.opendj.server.config.server.EntryCacheCfg;
+import org.forgerock.opendj.server.config.server.EntryCacheMonitorProviderCfg;
import org.opends.server.api.EntryCache;
import org.opends.server.api.MonitorData;
import org.opends.server.api.MonitorProvider;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/MemoryUsageMonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/MemoryUsageMonitorProvider.java
index 5ac492b..c11195a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/MemoryUsageMonitorProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/MemoryUsageMonitorProvider.java
@@ -26,8 +26,8 @@
import java.util.concurrent.TimeUnit;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.std.server.MemoryUsageMonitorProviderCfg;
import org.opends.server.api.MonitorData;
+import org.forgerock.opendj.server.config.server.MemoryUsageMonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.types.InitializationException;
@@ -50,6 +50,7 @@
/** {@inheritDoc} */
+ @Override
public void initializeMonitorProvider(
MemoryUsageMonitorProviderCfg configuration)
throws ConfigException, InitializationException
@@ -66,6 +67,7 @@
/** {@inheritDoc} */
+ @Override
public void run()
{
for (GarbageCollectorMXBean gc :
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/ParallelWorkQueueMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/ParallelWorkQueueMonitor.java
index 6fafe52..3c8a182 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/ParallelWorkQueueMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/ParallelWorkQueueMonitor.java
@@ -19,8 +19,8 @@
import java.util.concurrent.TimeUnit;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorData;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.extensions.ParallelWorkQueue;
import org.opends.server.types.InitializationException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/StackTraceMonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/StackTraceMonitorProvider.java
index 910f6f8..5a5d102 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/StackTraceMonitorProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/StackTraceMonitorProvider.java
@@ -22,8 +22,8 @@
import java.util.TreeMap;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.std.server.StackTraceMonitorProviderCfg;
import org.opends.server.api.MonitorData;
+import org.forgerock.opendj.server.config.server.StackTraceMonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.types.InitializationException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/SystemInfoMonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/SystemInfoMonitorProvider.java
index adb99d3..ca6622c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/SystemInfoMonitorProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/SystemInfoMonitorProvider.java
@@ -30,8 +30,8 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.std.server.SystemInfoMonitorProviderCfg;
import org.opends.server.api.MonitorData;
+import org.forgerock.opendj.server.config.server.SystemInfoMonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.InitializationException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/TraditionalWorkQueueMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/TraditionalWorkQueueMonitor.java
index c2413b3..8cfaab7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/TraditionalWorkQueueMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/TraditionalWorkQueueMonitor.java
@@ -19,8 +19,8 @@
import java.util.concurrent.TimeUnit;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorData;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.extensions.TraditionalWorkQueue;
import org.opends.server.types.InitializationException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/VersionMonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/VersionMonitorProvider.java
index cb46f19..c11d816 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/VersionMonitorProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/VersionMonitorProvider.java
@@ -17,8 +17,8 @@
package org.opends.server.monitors;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.std.server.VersionMonitorProviderCfg;
import org.opends.server.api.MonitorData;
+import org.forgerock.opendj.server.config.server.VersionMonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.types.InitializationException;
import org.opends.server.util.DynamicConstants;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java
index afd35c1..a88a393 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java
@@ -35,9 +35,9 @@
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.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.AttributeCleanupPluginCfg;
+import org.forgerock.opendj.server.config.server.PluginCfg;
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java
index a3506ee..29518ca 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java
@@ -25,10 +25,10 @@
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.io.ASN1Writer;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.PluginCfgDefn;
-import org.opends.server.admin.std.server.ChangeNumberControlPluginCfg;
-import org.opends.server.admin.std.server.PluginCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.PluginCfgDefn;
+import org.forgerock.opendj.server.config.server.ChangeNumberControlPluginCfg;
+import org.forgerock.opendj.server.config.server.PluginCfg;
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/EntryUUIDPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/EntryUUIDPlugin.java
index 923e63a..84885d6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/EntryUUIDPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/EntryUUIDPlugin.java
@@ -27,10 +27,10 @@
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.PluginCfgDefn;
-import org.opends.server.admin.std.server.EntryUUIDPluginCfg;
-import org.opends.server.admin.std.server.PluginCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.PluginCfgDefn;
+import org.forgerock.opendj.server.config.server.EntryUUIDPluginCfg;
+import org.forgerock.opendj.server.config.server.PluginCfg;
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java
index d4c7a59..bf1e680 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java
@@ -22,10 +22,10 @@
import java.util.Set;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.PluginCfgDefn;
-import org.opends.server.admin.std.server.LDAPAttributeDescriptionListPluginCfg;
-import org.opends.server.admin.std.server.PluginCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.PluginCfgDefn;
+import org.forgerock.opendj.server.config.server.LDAPAttributeDescriptionListPluginCfg;
+import org.forgerock.opendj.server.config.server.PluginCfg;
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.api.plugin.PluginResult;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java
index 170f3fd..266c2ec 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java
@@ -27,10 +27,10 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ModificationType;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.PluginCfgDefn;
-import org.opends.server.admin.std.server.LastModPluginCfg;
-import org.opends.server.admin.std.server.PluginCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.PluginCfgDefn;
+import org.forgerock.opendj.server.config.server.LastModPluginCfg;
+import org.forgerock.opendj.server.config.server.PluginCfg;
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java
index 54023ce..0eae274 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java
@@ -33,14 +33,14 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.PluginCfgDefn;
-import org.opends.server.admin.std.server.PasswordPolicyImportPluginCfg;
-import org.opends.server.admin.std.server.PluginCfg;
+import org.forgerock.opendj.server.config.meta.PluginCfgDefn;
+import org.forgerock.opendj.server.config.server.PasswordPolicyImportPluginCfg;
+import org.forgerock.opendj.server.config.server.PluginCfg;
import org.opends.server.api.AuthenticationPolicy;
import org.opends.server.api.Backend;
import org.opends.server.api.ImportTaskListener;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index 49e4949..9e86496 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -50,11 +50,11 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.PluginCfgDefn;
-import org.opends.server.admin.std.meta.ReferentialIntegrityPluginCfgDefn.CheckReferencesScopeCriteria;
-import org.opends.server.admin.std.server.PluginCfg;
-import org.opends.server.admin.std.server.ReferentialIntegrityPluginCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.PluginCfgDefn;
+import org.forgerock.opendj.server.config.meta.ReferentialIntegrityPluginCfgDefn.CheckReferencesScopeCriteria;
+import org.forgerock.opendj.server.config.server.PluginCfg;
+import org.forgerock.opendj.server.config.server.ReferentialIntegrityPluginCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.DirectoryThread;
import org.opends.server.api.ServerShutdownListener;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java
index 90c4325..2828199 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java
@@ -31,10 +31,10 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ModificationType;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.PluginCfgDefn;
-import org.opends.server.admin.std.meta.SambaPasswordPluginCfgDefn.PwdSyncPolicy;
-import org.opends.server.admin.std.server.SambaPasswordPluginCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.PluginCfgDefn;
+import org.forgerock.opendj.server.config.meta.SambaPasswordPluginCfgDefn.PwdSyncPolicy;
+import org.forgerock.opendj.server.config.server.SambaPasswordPluginCfg;
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java
index 9bab045..5f43c39 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java
@@ -32,10 +32,10 @@
import org.forgerock.opendj.ldap.RDN;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.PluginCfgDefn;
-import org.opends.server.admin.std.server.PluginCfg;
-import org.opends.server.admin.std.server.SevenBitCleanPluginCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.PluginCfgDefn;
+import org.forgerock.opendj.server.config.server.SevenBitCleanPluginCfg;
+import org.forgerock.opendj.server.config.server.PluginCfg;
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java
index 091bbb1..32ed0ac 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java
@@ -35,10 +35,10 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.PluginCfgDefn;
-import org.opends.server.admin.std.server.PluginCfg;
-import org.opends.server.admin.std.server.UniqueAttributePluginCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.PluginCfgDefn;
+import org.forgerock.opendj.server.config.server.PluginCfg;
+import org.forgerock.opendj.server.config.server.UniqueAttributePluginCfg;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.Backend;
import org.opends.server.api.plugin.DirectoryServerPlugin;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerPlugin.java
index 8b1b66a..61132b8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerPlugin.java
@@ -25,10 +25,10 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.PluginCfgDefn;
-import org.opends.server.admin.std.server.PluginCfg;
-import org.opends.server.admin.std.server.ProfilerPluginCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.PluginCfgDefn;
+import org.forgerock.opendj.server.config.server.PluginCfg;
+import org.forgerock.opendj.server.config.server.ProfilerPluginCfg;
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java
index a65b286..cfe8729 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java
@@ -25,9 +25,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.ConnectionHandlerCfg;
-import org.opends.server.admin.std.server.LDIFConnectionHandlerCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.ConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.server.LDIFConnectionHandlerCfg;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ConnectionHandler;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/CollectClientConnectionsFilter.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/CollectClientConnectionsFilter.java
index d0b1daf..f8101ed 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/CollectClientConnectionsFilter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/CollectClientConnectionsFilter.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2013-2015 ForgeRock AS.
+ * Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.protocols.http;
@@ -50,7 +50,7 @@
import org.forgerock.util.promise.NeverThrowsException;
import org.forgerock.util.promise.Promise;
import org.forgerock.util.promise.Promises;
-import org.opends.server.admin.std.server.ConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.server.ConnectionHandlerCfg;
import org.opends.server.core.ServerContext;
import org.opends.server.schema.SchemaConstants;
import org.opends.server.types.DisconnectReason;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPConnectionHandler.java
index 6b85eb3..72580b0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPConnectionHandler.java
@@ -59,9 +59,9 @@
import org.glassfish.grizzly.ssl.SSLEngineConfigurator;
import org.glassfish.grizzly.strategies.SameThreadIOStrategy;
import org.glassfish.grizzly.utils.Charsets;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.ConnectionHandlerCfg;
-import org.opends.server.admin.std.server.HTTPConnectionHandlerCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.ConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.server.HTTPConnectionHandlerCfg;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ConnectionHandler;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalConnectionHandler.java
index 5f9a50c..7f52d4d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalConnectionHandler.java
@@ -23,7 +23,7 @@
import java.util.Collection;
import java.util.LinkedList;
-import org.opends.server.admin.std.server.*;
+import org.forgerock.opendj.server.config.server.*;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ConnectionHandler;
import org.opends.server.core.ServerContext;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java
index f72f975..134eaad 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java
@@ -32,9 +32,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.ConnectionHandlerCfg;
-import org.opends.server.admin.std.server.JMXConnectionHandlerCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.ConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.server.JMXConnectionHandlerCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ConnectionHandler;
import org.opends.server.api.ServerShutdownListener;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
index e9f7472..94bb43f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
@@ -41,9 +41,9 @@
import org.forgerock.opendj.ldap.AddressMask;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.ConnectionHandlerCfg;
-import org.opends.server.admin.std.server.LDAPConnectionHandlerCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.ConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.server.LDAPConnectionHandlerCfg;
import org.opends.server.api.*;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java
index 1325fa0..17adf1d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java
@@ -24,8 +24,8 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorData;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.types.DirectoryConfig;
import org.opends.server.types.ObjectClass;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ExternalChangelogDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ExternalChangelogDomain.java
index e748190..5c0ecd6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ExternalChangelogDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ExternalChangelogDomain.java
@@ -23,10 +23,10 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.RDN;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.std.server.ExternalChangelogDomainCfg;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.server.ExternalChangelogDomainCfg;
/** This class specifies the external changelog feature for a replication domain. */
public class ExternalChangelogDomain
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java
index ed6c98c..4d020e9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java
@@ -28,14 +28,13 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.server.config.server.FractionalLDIFImportPluginCfg;
+import org.forgerock.opendj.server.config.server.PluginCfg;
+import org.forgerock.opendj.server.config.server.ReplicationDomainCfg;
+import org.forgerock.opendj.server.config.server.ReplicationSynchronizationProviderCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.forgerock.util.Utils;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.server.FractionalLDIFImportPluginCfg;
-import org.opends.server.admin.std.server.PluginCfg;
-import org.opends.server.admin.std.server.ReplicationDomainCfg;
-import org.opends.server.admin.std.server.ReplicationSynchronizationProviderCfg;
-import org.opends.server.admin.std.server.RootCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
@@ -169,13 +168,8 @@
* (not a replicated domain).
*/
private static FractionalConfig getStaticReplicationDomainFractionalConfig(
- Entry entry) throws Exception {
-
- // Retrieve the configuration
- ServerManagementContext context = ServerManagementContext.getInstance();
- RootCfg root = context.getRootConfiguration();
-
-
+ Entry entry) throws Exception {
+ RootCfg root = serverContext.getServerManagementContext().getRootConfiguration();
ReplicationSynchronizationProviderCfg sync =
(ReplicationSynchronizationProviderCfg)
root.getSynchronizationProvider("Multimaster Synchronization");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRuleFactory.java
index 0ab2f7c..c93e1a4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRuleFactory.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.replication.plugin;
@@ -20,7 +20,7 @@
import java.util.Collections;
import org.opends.server.api.MatchingRuleFactory;
-import org.opends.server.admin.std.server.MatchingRuleCfg;
+import org.forgerock.opendj.server.config.server.MatchingRuleCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.schema.CoreSchema;
import org.forgerock.opendj.ldap.schema.MatchingRule;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index 3ed7603..a981d2d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -69,11 +69,10 @@
import org.forgerock.opendj.ldap.RDN;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
-import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.IsolationPolicy;
-import org.opends.server.admin.std.server.ExternalChangelogDomainCfg;
-import org.opends.server.admin.std.server.ReplicationDomainCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.ReplicationDomainCfgDefn.IsolationPolicy;
+import org.forgerock.opendj.server.config.server.ExternalChangelogDomainCfg;
+import org.forgerock.opendj.server.config.server.ReplicationDomainCfg;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.Backend;
import org.opends.server.api.Backend.BackendOperation;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java
index 66b717e..64f4b46 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java
@@ -38,11 +38,11 @@
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.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.std.server.ReplicationDomainCfg;
-import org.opends.server.admin.std.server.ReplicationSynchronizationProviderCfg;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.server.ReplicationDomainCfg;
+import org.forgerock.opendj.server.config.server.ReplicationSynchronizationProviderCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.BackupTaskListener;
import org.opends.server.api.ExportTaskListener;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationServerListener.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationServerListener.java
index e9c4296..d7d6d87 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationServerListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationServerListener.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.replication.plugin;
@@ -21,10 +21,10 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.std.server.ReplicationServerCfg;
-import org.opends.server.admin.std.server.ReplicationSynchronizationProviderCfg;
+import org.forgerock.opendj.config.server.ConfigurationAddListener;
+import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
+import org.forgerock.opendj.server.config.server.ReplicationServerCfg;
+import org.forgerock.opendj.server.config.server.ReplicationSynchronizationProviderCfg;
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.replication.service.DSRSShutdownSync;
import org.forgerock.opendj.config.server.ConfigChangeResult;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ChangelogBaseDNVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ChangelogBaseDNVirtualAttributeProvider.java
index e8331fe..365a071 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ChangelogBaseDNVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ChangelogBaseDNVirtualAttributeProvider.java
@@ -12,12 +12,12 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.replication.server;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.std.server.UserDefinedVirtualAttributeCfg;
+import org.forgerock.opendj.server.config.server.UserDefinedVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.Attribute;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/FirstChangeNumberVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/FirstChangeNumberVirtualAttributeProvider.java
index 653e4ae..c58eebe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/FirstChangeNumberVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/FirstChangeNumberVirtualAttributeProvider.java
@@ -12,13 +12,13 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.replication.server;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.std.server.UserDefinedVirtualAttributeCfg;
+import org.forgerock.opendj.server.config.server.UserDefinedVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.Attribute;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/LastChangeNumberVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/LastChangeNumberVirtualAttributeProvider.java
index e43c838..c61c55a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/LastChangeNumberVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/LastChangeNumberVirtualAttributeProvider.java
@@ -12,13 +12,13 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.replication.server;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.std.server.UserDefinedVirtualAttributeCfg;
+import org.forgerock.opendj.server.config.server.UserDefinedVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.Attribute;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/LastCookieVirtualProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/LastCookieVirtualProvider.java
index 2f80de4..34faa83 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/LastCookieVirtualProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/LastCookieVirtualProvider.java
@@ -12,13 +12,13 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.replication.server;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.std.server.UserDefinedVirtualAttributeCfg;
+import org.forgerock.opendj.server.config.server.UserDefinedVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.Attribute;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/LightweightServerHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/LightweightServerHandler.java
index a956b92..19e549b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/LightweightServerHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/LightweightServerHandler.java
@@ -21,8 +21,8 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorData;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.common.DSInfo;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java
index 04004d1..ee0f711 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java
@@ -24,8 +24,8 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorData;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.common.CSN;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java
index 963e9a2..fde7ee9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java
@@ -32,10 +32,10 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn.ConflictBehavior;
-import org.opends.server.admin.std.server.ReplicationServerCfg;
-import org.opends.server.admin.std.server.UserDefinedVirtualAttributeCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.VirtualAttributeCfgDefn.ConflictBehavior;
+import org.forgerock.opendj.server.config.server.ReplicationServerCfg;
+import org.forgerock.opendj.server.config.server.UserDefinedVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.backends.ChangelogBackend;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java
index 652d106..2e14a40 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -37,8 +37,8 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorData;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.common.CSN;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java
index 4af0ae1..ca65e02 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java
@@ -28,8 +28,8 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorData;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.common.AssuredMode;
import org.opends.server.replication.common.CSN;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDB.java
index 5671374..c9ec958 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDB.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDB.java
@@ -26,8 +26,8 @@
import org.forgerock.opendj.ldap.ByteSequenceReader;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorData;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.common.CSN;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileReplicaDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileReplicaDB.java
index c746294..23228b8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileReplicaDB.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileReplicaDB.java
@@ -24,8 +24,8 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorData;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.common.CSN;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java
index 1960b27..9553f8e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java
@@ -35,7 +35,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.util.Utils;
-import org.opends.server.admin.std.server.ReplicationDomainCfg;
+import org.forgerock.opendj.server.config.server.ReplicationDomainCfg;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.common.*;
import org.opends.server.replication.plugin.MultimasterReplication;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java
index 54ab267..d7b4d6a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java
@@ -46,8 +46,8 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.AssuredType;
-import org.opends.server.admin.std.server.ReplicationDomainCfg;
+import org.forgerock.opendj.server.config.meta.ReplicationDomainCfgDefn.AssuredType;
+import org.forgerock.opendj.server.config.server.ReplicationDomainCfg;
import org.opends.server.api.DirectoryThread;
import org.opends.server.api.MonitorData;
import org.opends.server.backends.task.Task;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationMonitor.java
index ed6d4bd..28719db 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationMonitor.java
@@ -21,8 +21,8 @@
import java.util.Map;
import java.util.Map.Entry;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorData;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.replication.service.ReplicationDomain.ImportExportContext;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/AciSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/AciSyntax.java
index 7eb8e72..af3d996 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/AciSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/AciSyntax.java
@@ -22,7 +22,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.SchemaBuilder;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.ServerContext;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/AttributeTypeSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/AttributeTypeSyntax.java
index 043926d..049af28 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/AttributeTypeSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/AttributeTypeSyntax.java
@@ -26,8 +26,8 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.AttributeTypeDescriptionAttributeSyntaxCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.AttributeTypeDescriptionAttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.ServerContext;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleFactory.java
index bc6ab42..700eace 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleFactory.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -22,7 +22,7 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.schema.CoreSchema;
import org.forgerock.opendj.ldap.schema.SchemaBuilder;
-import org.opends.server.admin.std.server.MatchingRuleCfg;
+import org.forgerock.opendj.server.config.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.types.InitializationException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordSyntax.java
index 8f3da89..a3855d3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
import static org.opends.messages.SchemaMessages.*;
@@ -23,7 +23,7 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/BinarySyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/BinarySyntax.java
index 31697c8..ceb6eb4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/BinarySyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/BinarySyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringSyntax.java
index 9af6748..e015099 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanSyntax.java
index 087ecee..394a613 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -21,7 +21,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.util.ServerConstants;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactAssertionSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactAssertionSyntax.java
index e22825c..a28e327 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactAssertionSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactAssertionSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
* Portions Copyright 2013-2014 Manuel Gaupp
*/
package org.opends.server.schema;
@@ -21,7 +21,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateListSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateListSyntax.java
index 9a60088..2a792f0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateListSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateListSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificatePairSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificatePairSyntax.java
index 8e57516..8b85963 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificatePairSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificatePairSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateSyntax.java
index c3015ba..d3ba13d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateSyntax.java
@@ -27,8 +27,8 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.SchemaOptions;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.CertificateAttributeSyntaxCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.CertificateAttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.ServerContext;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CollationMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CollationMatchingRuleFactory.java
index 18f893e..b5dde3b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CollationMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CollationMatchingRuleFactory.java
@@ -33,13 +33,13 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
import org.forgerock.opendj.ldap.schema.ConflictingSchemaElementException;
import org.forgerock.opendj.ldap.schema.CoreSchema;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.SchemaBuilder;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.CollationMatchingRuleCfg;
+import org.forgerock.opendj.server.config.server.CollationMatchingRuleCfg;
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CountryStringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CountryStringSyntax.java
index 100294b..4e8099b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CountryStringSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CountryStringSyntax.java
@@ -27,8 +27,8 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.CountryStringAttributeSyntaxCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.CountryStringAttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.ServerContext;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/DITContentRuleSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DITContentRuleSyntax.java
index fca4497..4112cba 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/DITContentRuleSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/DITContentRuleSyntax.java
@@ -32,7 +32,7 @@
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.ObjectClassType;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DITContentRule;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/DITStructureRuleSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DITStructureRuleSyntax.java
index b80b59a..36b94ad 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/DITStructureRuleSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/DITStructureRuleSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.schema;
import static org.opends.messages.SchemaMessages.*;
@@ -28,7 +28,7 @@
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DITStructureRule;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/DeliveryMethodSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DeliveryMethodSyntax.java
index b86df1c..134843c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/DeliveryMethodSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/DeliveryMethodSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringSyntax.java
index 6c7891c..b1cef82 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringSyntax.java
@@ -26,8 +26,8 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.DirectoryStringAttributeSyntaxCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.DirectoryStringAttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.ServerContext;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameSyntax.java
index c5f51a6..a3ad3c0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/EnhancedGuideSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/EnhancedGuideSyntax.java
index 2215060..57b1a74 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/EnhancedGuideSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/EnhancedGuideSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/FaxNumberSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/FaxNumberSyntax.java
index efe312a..8bb9894 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/FaxNumberSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/FaxNumberSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/FaxSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/FaxSyntax.java
index 764a33a..b5ef45a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/FaxSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/FaxSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeSyntax.java
index ab4d22c..2852277 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeSyntax.java
@@ -13,7 +13,7 @@
*
* Copyright 2006-2009 Sun Microsystems, Inc.
* Portions Copyright 2009 D. J. Hagberg, Millibits Consulting, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -33,7 +33,7 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/GuideSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/GuideSyntax.java
index 0218090..e9366c8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/GuideSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/GuideSyntax.java
@@ -12,11 +12,11 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
import org.opends.server.api.AttributeSyntax;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/IA5StringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/IA5StringSyntax.java
index 949c9e1..965186e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/IA5StringSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/IA5StringSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerSyntax.java
index b45782b..299413b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/JPEGSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/JPEGSyntax.java
index e88ac7a..3d143c6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/JPEGSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/JPEGSyntax.java
@@ -26,8 +26,8 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.SchemaOptions;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.JPEGAttributeSyntaxCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.JPEGAttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.ServerContext;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
index 5ef8902..7925966 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
@@ -34,7 +34,7 @@
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.opendj.ldap.schema.SchemaBuilder;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.CommonSchemaElements;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleSyntax.java
index 025c8a7..c872bcd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleSyntax.java
@@ -12,14 +12,14 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.schema;
import static org.opends.server.schema.SchemaConstants.*;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleUseSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleUseSyntax.java
index d9510d0..6f97218 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleUseSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleUseSyntax.java
@@ -30,7 +30,7 @@
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/NameAndOptionalUIDSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/NameAndOptionalUIDSyntax.java
index 211416a..188e205 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/NameAndOptionalUIDSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/NameAndOptionalUIDSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/NameFormSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/NameFormSyntax.java
index 7bc8dca..7b1bc5b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/NameFormSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/NameFormSyntax.java
@@ -32,7 +32,7 @@
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.ObjectClassType;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSyntax.java
index b187d6a..ca26285 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/OIDSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/OIDSyntax.java
index 44f7a01..cd3d729 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/OIDSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/OIDSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java
index 59b9ace..3cdaca6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java
@@ -36,7 +36,7 @@
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.ObjectClassType;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.CommonSchemaElements;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSyntax.java
index 59bede1..e3ab988 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/OtherMailboxSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/OtherMailboxSyntax.java
index f46b480..779a1a3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/OtherMailboxSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/OtherMailboxSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/PostalAddressSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/PostalAddressSyntax.java
index c743677..61f159b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/PostalAddressSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/PostalAddressSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressSyntax.java
index d2831a9..713ff74 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/PrintableStringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/PrintableStringSyntax.java
index c85f4fd..861b3fc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/PrintableStringSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/PrintableStringSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationSyntax.java
index 54717df..ba012be 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/SubstringAssertionSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/SubstringAssertionSyntax.java
index e0a9b28..895ea42 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/SubstringAssertionSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/SubstringAssertionSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/SubtreeSpecificationSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/SubtreeSpecificationSyntax.java
index a128984..c099a84 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/SubtreeSpecificationSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/SubtreeSpecificationSyntax.java
@@ -25,7 +25,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.SchemaBuilder;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.ServerContext;
import org.forgerock.opendj.ldap.DN;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/SupportedAlgorithmSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/SupportedAlgorithmSyntax.java
index 62a1ff9..dd3e69b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/SupportedAlgorithmSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/SupportedAlgorithmSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSyntax.java
index 68b6899..38f0b46 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSyntax.java
@@ -26,8 +26,8 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.SchemaOptions;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.TelephoneNumberAttributeSyntaxCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.TelephoneNumberAttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.ServerContext;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
index 13a5478..1b9a73f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/TelexNumberSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/TelexNumberSyntax.java
index dd7c350..9972bd2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/TelexNumberSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/TelexNumberSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/UTCTimeSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UTCTimeSyntax.java
index 7362c9c..f3bef95 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/UTCTimeSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/UTCTimeSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDSyntax.java
index ee64037..ef70bec 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -21,7 +21,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleFactory.java
index d328af8..f43996f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleFactory.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -20,7 +20,7 @@
import java.util.Collections;
import org.opends.server.api.MatchingRuleFactory;
-import org.opends.server.admin.std.server.MatchingRuleCfg;
+import org.forgerock.opendj.server.config.server.MatchingRuleCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.schema.CoreSchema;
import org.forgerock.opendj.ldap.schema.MatchingRule;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordSyntax.java
index f722213..2839d14 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordSyntax.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.schema;
import static org.opends.messages.SchemaMessages.*;
@@ -25,7 +25,7 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.types.DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/AddSchemaFileTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/AddSchemaFileTask.java
index 46ace25..17abc64 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/AddSchemaFileTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/AddSchemaFileTask.java
@@ -27,7 +27,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.std.server.SynchronizationProviderCfg;
+import org.forgerock.opendj.server.config.server.SynchronizationProviderCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.SynchronizationProvider;
import org.opends.server.backends.task.Task;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/BackupTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/BackupTask.java
index 6482b21..5edf8ca 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/BackupTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/BackupTask.java
@@ -39,13 +39,12 @@
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.messages.Severity;
import org.opends.messages.TaskMessages;
-import org.opends.server.admin.std.server.BackendCfg;
+import org.forgerock.opendj.server.config.server.BackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.Backend.BackendOperation;
import org.opends.server.api.ClientConnection;
import org.opends.server.backends.task.Task;
import org.opends.server.backends.task.TaskState;
-import org.opends.server.config.ConfigEntry;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
import org.opends.server.types.BackupConfig;
@@ -101,7 +100,7 @@
* All the backend configuration entries defined in the server mapped
* by their backend ID.
*/
- private Map<String,ConfigEntry> configEntries;
+ private Map<String,Entry> configEntries;
private ArrayList<Backend<?>> backendsToArchive;
@@ -254,7 +253,7 @@
if (backUpAll)
{
- for (Map.Entry<String,ConfigEntry> mapEntry : configEntries.entrySet())
+ for (Map.Entry<String,Entry> mapEntry : configEntries.entrySet())
{
Backend<?> b = DirectoryServer.getBackend(mapEntry.getKey());
if (b != null && b.supports(BackendOperation.BACKUP))
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/RestoreTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/RestoreTask.java
index e8a83fd..859b767 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/RestoreTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/RestoreTask.java
@@ -38,7 +38,6 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.backends.task.Task;
import org.opends.server.backends.task.TaskState;
-import org.opends.server.config.ConfigEntry;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
import org.opends.server.types.Attribute;
@@ -249,7 +248,7 @@
// Get the DN of the backend configuration entry from the backup.
DN configEntryDN = backupDir.getConfigEntryDN();
- ConfigEntry configEntry;
+ Entry configEntry;
try
{
// Get the backend configuration entry.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/TaskUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/TaskUtils.java
index b4a327a..b2403c0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/TaskUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/TaskUtils.java
@@ -27,11 +27,12 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.requests.ModifyRequest;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.server.BackendCfg;
-import org.opends.server.admin.std.server.RootCfg;
+import org.opends.messages.TaskMessages;
+import org.forgerock.opendj.config.server.ServerManagementContext;
+import org.forgerock.opendj.server.config.server.BackendCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.api.Backend;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.types.Entry;
import org.opends.server.config.StringConfigAttribute;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
@@ -65,7 +66,7 @@
* @param configEntry A backend configuration entry.
* @return The backend ID.
*/
- public static String getBackendID(ConfigEntry configEntry)
+ public static String getBackendID(Entry configEntry)
{
try
{
@@ -80,12 +81,12 @@
}
catch (org.opends.server.config.ConfigException ce)
{
- logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, configEntry.getDN(), ce.getMessage());
+ logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, configEntry.getName(), ce.getMessage());
return null;
}
catch (Exception e)
{
- logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, configEntry.getDN(), getExceptionMessage(e));
+ logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, configEntry.getName(), getExceptionMessage(e));
return null;
}
}
@@ -95,9 +96,9 @@
* by their backend ID.
* @return A map of backend IDs to their corresponding configuration entries.
*/
- public static Map<String,ConfigEntry> getBackendConfigEntries()
+ public static Map<String,Entry> getBackendConfigEntries()
{
- Map<String,ConfigEntry> configEntries = new HashMap<>();
+ Map<String,Entry> configEntries = new HashMap<>();
// FIXME The error messages should not be the LDIF import messages
@@ -113,7 +114,7 @@
return configEntries;
}
- ConfigEntry baseEntry;
+ Entry baseEntry;
try
{
baseEntry = DirectoryServer.getConfigEntry(backendBaseDN);
@@ -132,7 +133,7 @@
// Iterate through the immediate children, attempting to parse them as
// backends.
- for (ConfigEntry configEntry : baseEntry.getChildren().values())
+ for (Entry configEntry : baseEntry.getChildren().values())
{
// Get the backend ID attribute from the entry. If there isn't one, then
// skip the entry.
@@ -154,12 +155,12 @@
}
catch (org.opends.server.config.ConfigException ce)
{
- logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, configEntry.getDN(), ce.getMessage());
+ logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, configEntry.getName(), ce.getMessage());
continue;
}
catch (Exception e)
{
- logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, configEntry.getDN(), getExceptionMessage(e));
+ logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, configEntry.getName(), getExceptionMessage(e));
continue;
}
@@ -203,7 +204,7 @@
throws DirectoryException
{
DN configEntryDN;
- RootCfg root = ServerManagementContext.getInstance().getRootConfiguration();
+ RootCfg root = serverContext.getServerManagementContext().getRootConfiguration();
try
{
BackendCfg cfg = root.getBackend(backendID);
@@ -239,7 +240,7 @@
public static void disableBackend(String backendID) throws DirectoryException
{
DN configEntryDN;
- RootCfg root = ServerManagementContext.getInstance().getRootConfiguration();
+ RootCfg root = serverContext.getServerManagementContext().getRootConfiguration();
try
{
BackendCfg cfg = root.getBackend(backendID);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java
index 1de632e..e4d5ae3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java
@@ -39,7 +39,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.util.Utils;
-import org.opends.server.admin.std.server.BackendCfg;
+import org.forgerock.opendj.server.config.server.BackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.Backend.BackendOperation;
import org.opends.server.core.CoreConfigManager;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/BackendToolUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/BackendToolUtils.java
index 83ff96b..8236d0c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/BackendToolUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/BackendToolUtils.java
@@ -21,11 +21,11 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.DN;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.server.BackendCfg;
-import org.opends.server.admin.std.server.RootCfg;
+import org.forgerock.opendj.config.server.ServerManagementContext;
+import org.forgerock.opendj.server.config.server.BackendCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.api.Backend;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.types.Entry;
import org.opends.server.config.DNConfigAttribute;
import org.opends.server.config.StringConfigAttribute;
import org.opends.server.core.DirectoryServer;
@@ -65,11 +65,11 @@
try
{
final DN backendBaseDN = getBackendBaseDN();
- final ConfigEntry baseEntry = getBaseEntry(backendBaseDN);
+ final Entry baseEntry = getBaseEntry(backendBaseDN);
// Iterate through the immediate children, attempting to parse them as backends.
final RootCfg root = ServerManagementContext.getInstance().getRootConfiguration();
- for (final ConfigEntry configEntry : baseEntry.getChildren().values())
+ for (final Entry configEntry : baseEntry.getChildren().values())
{
final String backendID = getBackendID(configEntry);
final String backendClassName = getBackendClassName(configEntry);
@@ -91,7 +91,7 @@
catch (final Exception e)
{
logger.error(
- ERR_CANNOT_INSTANTIATE_BACKEND_CLASS, backendClassName, configEntry.getDN(), getExceptionMessage(e));
+ ERR_CANNOT_INSTANTIATE_BACKEND_CLASS, backendClassName, configEntry.getName(), getExceptionMessage(e));
return ERROR;
}
@@ -109,7 +109,7 @@
}
}
- private static List<DN> getBaseDNsForEntry(final ConfigEntry configEntry) throws Exception
+ private static List<DN> getBaseDNsForEntry(final Entry configEntry) throws Exception
{
try
{
@@ -120,17 +120,17 @@
{
return baseDNAttr.activeValues();
}
- logger.error(ERR_NO_BASES_FOR_BACKEND, configEntry.getDN());
+ logger.error(ERR_NO_BASES_FOR_BACKEND, configEntry.getName());
return null;
}
catch (final Exception e)
{
- logger.error(ERR_CANNOT_DETERMINE_BASES_FOR_BACKEND, configEntry.getDN(), getExceptionMessage(e));
+ logger.error(ERR_CANNOT_DETERMINE_BASES_FOR_BACKEND, configEntry.getName(), getExceptionMessage(e));
throw e;
}
}
- private static Class<?> getBackendClass(String backendClassName, ConfigEntry configEntry) throws Exception
+ private static Class<?> getBackendClass(String backendClassName, Entry configEntry) throws Exception
{
try
{
@@ -138,12 +138,12 @@
}
catch (final Exception e)
{
- logger.error(ERR_CANNOT_LOAD_BACKEND_CLASS, backendClassName, configEntry.getDN(), getExceptionMessage(e));
+ logger.error(ERR_CANNOT_LOAD_BACKEND_CLASS, backendClassName, configEntry.getName(), getExceptionMessage(e));
throw e;
}
}
- private static String getBackendClassName(final ConfigEntry configEntry) throws Exception
+ private static String getBackendClassName(final Entry configEntry) throws Exception
{
try
{
@@ -154,17 +154,17 @@
}
catch (final org.opends.server.config.ConfigException ce)
{
- logger.error(ERR_CANNOT_DETERMINE_BACKEND_CLASS, configEntry.getDN(), ce.getMessage());
+ logger.error(ERR_CANNOT_DETERMINE_BACKEND_CLASS, configEntry.getName(), ce.getMessage());
throw ce;
}
catch (final Exception e)
{
- logger.error(ERR_CANNOT_DETERMINE_BACKEND_CLASS, configEntry.getDN(), getExceptionMessage(e));
+ logger.error(ERR_CANNOT_DETERMINE_BACKEND_CLASS, configEntry.getName(), getExceptionMessage(e));
throw e;
}
}
- private static String getBackendID(final ConfigEntry configEntry) throws Exception
+ private static String getBackendID(final Entry configEntry) throws Exception
{
try
{
@@ -175,17 +175,17 @@
}
catch (final org.opends.server.config.ConfigException ce)
{
- logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, configEntry.getDN(), ce.getMessage());
+ logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, configEntry.getName(), ce.getMessage());
throw ce;
}
catch (final Exception e)
{
- logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, configEntry.getDN(), getExceptionMessage(e));
+ logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, configEntry.getName(), getExceptionMessage(e));
throw e;
}
}
- private static ConfigEntry getBaseEntry(final DN backendBaseDN) throws Exception
+ private static Entry getBaseEntry(final DN backendBaseDN) throws Exception
{
try
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java
index 56979fa..ab74ca1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java
@@ -52,13 +52,13 @@
import org.forgerock.opendj.server.config.client.BackendCfgClient;
import org.forgerock.opendj.server.config.server.BackendCfg;
import org.opends.quicksetup.installer.Installer;
-import org.opends.server.admin.DefaultBehaviorProvider;
-import org.opends.server.admin.DefinedDefaultBehaviorProvider;
-import org.opends.server.admin.StringPropertyDefinition;
-import org.opends.server.admin.std.meta.CryptoManagerCfgDefn;
+import org.forgerock.opendj.config.DefaultBehaviorProvider;
+import org.forgerock.opendj.config.DefinedDefaultBehaviorProvider;
+import org.forgerock.opendj.config.StringPropertyDefinition;
+import org.forgerock.opendj.server.config.meta.CryptoManagerCfgDefn;
import org.opends.server.api.ConfigHandler;
import org.opends.server.config.BooleanConfigAttribute;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.types.Entry;
import org.opends.server.config.DNConfigAttribute;
import org.opends.server.config.IntegerConfigAttribute;
import org.opends.server.config.StringConfigAttribute;
@@ -779,7 +779,7 @@
final IntegerConfigAttribute portAttr = new IntegerConfigAttribute(
ATTR_LISTEN_PORT, INFO_LDAP_CONNHANDLER_DESCRIPTION_LISTEN_PORT.get(),
true, false, true, true, 1, true, 65535, ldapPort.getIntValue());
- final ConfigEntry configEntry = configHandler.getConfigEntry(DN.valueOf(DN_LDAP_CONNECTION_HANDLER));
+ final Entry configEntry = configHandler.getConfigEntry(DN.valueOf(DN_LDAP_CONNECTION_HANDLER));
configEntry.putConfigAttribute(portAttr);
}
catch (final Exception e)
@@ -798,7 +798,7 @@
final IntegerConfigAttribute portAttr = new IntegerConfigAttribute(
ATTR_LISTEN_PORT, INFO_LDAP_CONNHANDLER_DESCRIPTION_LISTEN_PORT.get(),
true, false, true, true, 1, true, 65535, adminConnectorPort.getIntValue());
- final ConfigEntry configEntry = configHandler.getConfigEntry(DN.valueOf(DN_ADMIN_CONNECTOR));
+ final Entry configEntry = configHandler.getConfigEntry(DN.valueOf(DN_ADMIN_CONNECTOR));
configEntry.putConfigAttribute(portAttr);
}
catch (final Exception e)
@@ -817,7 +817,7 @@
final IntegerConfigAttribute portAttr = new IntegerConfigAttribute(
ATTR_LISTEN_PORT, INFO_LDAP_CONNHANDLER_DESCRIPTION_LISTEN_PORT.get(),
true, false, true, true, 1, true, 65535, ldapsPort.getIntValue());
- final ConfigEntry configEntry = configHandler.getConfigEntry(DN.valueOf(DN_LDAPS_CONNECTION_HANDLER));
+ final Entry configEntry = configHandler.getConfigEntry(DN.valueOf(DN_LDAPS_CONNECTION_HANDLER));
configEntry.putConfigAttribute(portAttr);
final BooleanConfigAttribute enablePortAttr = new BooleanConfigAttribute(
@@ -841,7 +841,7 @@
final IntegerConfigAttribute portAttr = new IntegerConfigAttribute(
ATTR_LISTEN_PORT, INFO_JMX_CONNHANDLER_DESCRIPTION_LISTEN_PORT.get(),
true, false, true, true, 1, true, 65535, jmxPort.getIntValue());
- final ConfigEntry configEntry = configHandler.getConfigEntry(DN.valueOf(DN_JMX_CONNECTION_HANDLER));
+ final Entry configEntry = configHandler.getConfigEntry(DN.valueOf(DN_JMX_CONNECTION_HANDLER));
configEntry.putConfigAttribute(portAttr);
final BooleanConfigAttribute enablePortAttr = new BooleanConfigAttribute(
@@ -863,7 +863,7 @@
{
final BooleanConfigAttribute startTLS = new BooleanConfigAttribute(
ATTR_ALLOW_STARTTLS, INFO_LDAP_CONNHANDLER_DESCRIPTION_ALLOW_STARTTLS.get(), true, true);
- final ConfigEntry configEntry = configHandler.getConfigEntry(DN.valueOf(DN_LDAP_CONNECTION_HANDLER));
+ final Entry configEntry = configHandler.getConfigEntry(DN.valueOf(DN_LDAP_CONNECTION_HANDLER));
configEntry.putConfigAttribute(startTLS);
}
catch (final Exception e)
@@ -884,7 +884,7 @@
// Enable the key manager
final BooleanConfigAttribute enableAttr = new BooleanConfigAttribute(
ATTR_KEYMANAGER_ENABLED, INFO_CONFIG_KEYMANAGER_DESCRIPTION_ENABLED.get(), true, true);
- final ConfigEntry configEntry = configHandler.getConfigEntry(DN.valueOf(keyManagerProviderDN.getValue()));
+ final Entry configEntry = configHandler.getConfigEntry(DN.valueOf(keyManagerProviderDN.getValue()));
configEntry.putConfigAttribute(enableAttr);
}
catch (final Exception e)
@@ -904,7 +904,7 @@
final StringConfigAttribute pathAttr = new StringConfigAttribute(
ATTR_KEYSTORE_FILE, INFO_FILE_KEYMANAGER_DESCRIPTION_FILE.get(),
true, true, true, keyManagerPath.getValue());
- final ConfigEntry configEntry = configHandler.getConfigEntry(DN.valueOf(keyManagerProviderDN.getValue()));
+ final Entry configEntry = configHandler.getConfigEntry(DN.valueOf(keyManagerProviderDN.getValue()));
configEntry.putConfigAttribute(pathAttr);
}
catch (final Exception e)
@@ -925,7 +925,7 @@
final StringConfigAttribute keyManagerProviderAttr = new StringConfigAttribute(
ATTR_KEYMANAGER_DN, INFO_LDAP_CONNHANDLER_DESCRIPTION_KEYMANAGER_DN.get(),
false, false, true, keyManagerProviderDN.getValue());
- final ConfigEntry configEntry = configHandler.getConfigEntry(DN.valueOf(attributeDN));
+ final Entry configEntry = configHandler.getConfigEntry(DN.valueOf(attributeDN));
configEntry.putConfigAttribute(keyManagerProviderAttr);
}
catch (final Exception e)
@@ -945,7 +945,7 @@
{
final BooleanConfigAttribute enableAttr = new BooleanConfigAttribute(
ATTR_TRUSTMANAGER_ENABLED, ERR_CONFIG_TRUSTMANAGER_DESCRIPTION_ENABLED.get(), true, true);
- final ConfigEntry configEntry = configHandler.getConfigEntry(DN.valueOf(trustManagerProviderDN.getValue()));
+ final Entry configEntry = configHandler.getConfigEntry(DN.valueOf(trustManagerProviderDN.getValue()));
configEntry.putConfigAttribute(enableAttr);
}
catch (final Exception e)
@@ -991,7 +991,7 @@
final StringConfigAttribute trustManagerProviderAttr = new StringConfigAttribute(
ATTR_TRUSTMANAGER_DN, INFO_LDAP_CONNHANDLER_DESCRIPTION_TRUSTMANAGER_DN.get(),
false, false, true, trustManagerProviderDN.getValue());
- final ConfigEntry configEntry = configHandler.getConfigEntry(DN.valueOf(attributeDN));
+ final Entry configEntry = configHandler.getConfigEntry(DN.valueOf(attributeDN));
configEntry.putConfigAttribute(trustManagerProviderAttr);
}
catch (final Exception e)
@@ -1006,7 +1006,7 @@
{
try
{
- ConfigEntry configEntry = configHandler.getConfigEntry(DN.valueOf(attributeDN));
+ Entry configEntry = configHandler.getConfigEntry(DN.valueOf(attributeDN));
if (arg.isPresent())
{
configEntry.putConfigAttribute(configAttr);
@@ -1026,7 +1026,7 @@
{
try
{
- final ConfigEntry configEntry = configHandler.getConfigEntry(DN.valueOf(attributeDN));
+ final Entry configEntry = configHandler.getConfigEntry(DN.valueOf(attributeDN));
configEntry.removeConfigAttribute(ATTR_SSL_CERT_NICKNAME.toLowerCase());
}
catch (final Exception e)
@@ -1044,7 +1044,7 @@
final DNConfigAttribute bindDNAttr = new DNConfigAttribute(
ATTR_ROOTDN_ALTERNATE_BIND_DN, INFO_CONFIG_ROOTDN_DESCRIPTION_ALTERNATE_BIND_DN.get(),
false, true, false, rootDN);
- final ConfigEntry configEntry = configHandler.getConfigEntry(DN.valueOf(DN_ROOT_USER));
+ final Entry configEntry = configHandler.getConfigEntry(DN.valueOf(DN_ROOT_USER));
configEntry.putConfigAttribute(bindDNAttr);
final String encodedPassword = SaltedSHA512PasswordStorageScheme.encodeOffline(getBytes(rootPW));
@@ -1066,7 +1066,7 @@
{
final StringConfigAttribute fqdnAttr = new StringConfigAttribute(
"ds-cfg-server-fqdn", LocalizableMessage.EMPTY, false, false, false, hostName.getValue());
- final ConfigEntry configEntry = configHandler.getConfigEntry(DN.valueOf(DN_DIGEST_MD5_SASL_MECHANISM));
+ final Entry configEntry = configHandler.getConfigEntry(DN.valueOf(DN_DIGEST_MD5_SASL_MECHANISM));
configEntry.putConfigAttribute(fqdnAttr);
}
catch (final Exception e)
@@ -1116,7 +1116,7 @@
final StringConfigAttribute keyWrappingTransformation = new StringConfigAttribute(
ATTR_CRYPTO_CIPHER_KEY_WRAPPING_TRANSFORMATION, LocalizableMessage.EMPTY,
false, false, true, alternativeCipher);
- final ConfigEntry configEntry = configHandler.getConfigEntry(DN.valueOf(DN_CRYPTO_MANAGER));
+ final Entry configEntry = configHandler.getConfigEntry(DN.valueOf(DN_CRYPTO_MANAGER));
configEntry.putConfigAttribute(keyWrappingTransformation);
}
catch (final Exception e)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java
index 851c142..482929c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java
@@ -38,15 +38,15 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DN;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.server.BackendCfg;
-import org.opends.server.admin.std.server.LDIFBackendCfg;
-import org.opends.server.admin.std.server.RootCfg;
-import org.opends.server.admin.std.server.TrustStoreBackendCfg;
+import org.forgerock.opendj.config.server.ServerManagementContext;
+import org.forgerock.opendj.server.config.server.BackendCfg;
+import org.forgerock.opendj.server.config.server.LDIFBackendCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
+import org.forgerock.opendj.server.config.server.TrustStoreBackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigConstants;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.types.Entry;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler;
@@ -714,9 +714,9 @@
private static void initializeServerBackends(DirectoryServer directoryServer, PrintStream err)
throws InitializationException, ConfigException {
directoryServer.initializeRootDSE();
- ServerManagementContext context = ServerManagementContext.getInstance();
- RootCfg root = context.getRootConfiguration();
- ConfigEntry backendRoot;
+
+ RootCfg root = serverContext.getServerManagementContext().getRootConfiguration();
+ Entry backendRoot;
try {
DN configEntryDN = DN.valueOf(ConfigConstants.DN_BACKEND_BASE);
backendRoot = DirectoryServer.getConfigEntry(configEntryDN);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ExportLDIF.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ExportLDIF.java
index 1c9b06f..c9ee057 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ExportLDIF.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ExportLDIF.java
@@ -33,7 +33,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.std.server.BackendCfg;
+import org.forgerock.opendj.server.config.server.BackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.Backend.BackendOperation;
import org.opends.server.api.plugin.PluginType;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
index 3f6132e..9ee6fd9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
@@ -37,7 +37,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.std.server.BackendCfg;
+import org.forgerock.opendj.server.config.server.BackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.Backend.BackendOperation;
import org.opends.server.api.plugin.PluginType;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ListBackends.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ListBackends.java
index 21b42c3..8173903 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ListBackends.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ListBackends.java
@@ -36,7 +36,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.DN;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.types.Entry;
import org.opends.server.config.DNConfigAttribute;
import org.opends.server.config.StringConfigAttribute;
import org.opends.server.core.DirectoryServer;
@@ -467,7 +467,7 @@
throw new ConfigException(message, e);
}
- ConfigEntry baseEntry = null;
+ Entry baseEntry = null;
try
{
baseEntry = DirectoryServer.getConfigEntry(backendBaseDN);
@@ -488,7 +488,7 @@
// Iterate through the immediate children, attempting to parse them as backends.
TreeMap<String,TreeSet<DN>> backendMap = new TreeMap<>();
- for (ConfigEntry configEntry : baseEntry.getChildren().values())
+ for (Entry configEntry : baseEntry.getChildren().values())
{
// Get the backend ID attribute from the entry. If there isn't one, then
// skip the entry.
@@ -512,12 +512,12 @@
}
catch (ConfigException ce)
{
- LocalizableMessage message = ERR_CANNOT_DETERMINE_BACKEND_ID.get(configEntry.getDN(), ce.getMessage());
+ LocalizableMessage message = ERR_CANNOT_DETERMINE_BACKEND_ID.get(configEntry.getName(), ce.getMessage());
throw new ConfigException(message, ce);
}
catch (Exception e)
{
- LocalizableMessage message = ERR_CANNOT_DETERMINE_BACKEND_ID.get(configEntry.getDN(), getExceptionMessage(e));
+ LocalizableMessage message = ERR_CANNOT_DETERMINE_BACKEND_ID.get(configEntry.getName(), getExceptionMessage(e));
throw new ConfigException(message, e);
}
@@ -541,7 +541,7 @@
catch (Exception e)
{
LocalizableMessage message = ERR_CANNOT_DETERMINE_BASES_FOR_BACKEND.get(
- configEntry.getDN(), getExceptionMessage(e));
+ configEntry.getName(), getExceptionMessage(e));
throw new ConfigException(message, e);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java
index cdf12fc..a2a951a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java
@@ -33,7 +33,7 @@
import org.forgerock.i18n.LocalizableMessageDescriptor.Arg1;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.std.server.BackendCfg;
+import org.forgerock.opendj.server.config.server.BackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.Backend.BackendOperation;
import org.opends.server.backends.RebuildConfig;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java
index 70b1881..594acd5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java
@@ -36,7 +36,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.std.server.BackendCfg;
+import org.forgerock.opendj.server.config.server.BackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.Backend.BackendOperation;
import org.opends.server.core.CoreConfigManager;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/VerifyIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/VerifyIndex.java
index 8e42c07..713e71a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/VerifyIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/VerifyIndex.java
@@ -31,7 +31,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.DN;
-import org.opends.server.admin.std.server.BackendCfg;
+import org.forgerock.opendj.server.config.server.BackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.Backend.BackendOperation;
import org.opends.server.backends.VerifyConfig;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index 96946ef..c4d39dd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -87,13 +87,13 @@
import org.opends.quicksetup.installer.offline.OfflineInstaller;
import org.opends.quicksetup.util.PlainTextProgressMessageFormatter;
import org.opends.server.admin.*;
-import org.opends.server.admin.client.ManagementContext;
+import org.forgerock.opendj.config.client.ManagementContext;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
-import org.opends.server.admin.client.ldap.LDAPManagementContext;
-import org.opends.server.admin.std.client.*;
-import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn;
-import org.opends.server.admin.std.meta.ReplicationServerCfgDefn;
-import org.opends.server.admin.std.meta.ReplicationSynchronizationProviderCfgDefn;
+import org.forgerock.opendj.config.client.ldap.LDAPManagementContext;
+import org.forgerock.opendj.server.config.client.*;
+import org.forgerock.opendj.server.config.meta.ReplicationDomainCfgDefn;
+import org.forgerock.opendj.server.config.meta.ReplicationServerCfgDefn;
+import org.forgerock.opendj.server.config.meta.ReplicationSynchronizationProviderCfgDefn;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tasks.PurgeConflictsHistoricalTask;
import org.opends.server.tools.dsreplication.EnableReplicationUserData.EnableReplicationServerData;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryConfig.java
index 1af407f..dbef5ba 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryConfig.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryConfig.java
@@ -33,7 +33,6 @@
import org.opends.server.api.ExtendedOperationHandler;
import org.opends.server.api.SASLMechanismHandler;
import org.opends.server.api.ServerShutdownListener;
-import org.opends.server.config.ConfigEntry;
import org.opends.server.core.DirectoryServer;
import com.forgerock.opendj.util.OperatingSystem;
@@ -107,7 +106,7 @@
* @throws ConfigException If a problem occurs while trying to
* retrieve the requested entry.
*/
- public static ConfigEntry getConfigEntry(DN entryDN)
+ public static Entry getConfigEntry(DN entryDN)
throws ConfigException
{
return DirectoryServer.getConfigEntry(entryDN);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/VirtualAttributeRule.java b/opendj-server-legacy/src/main/java/org/opends/server/types/VirtualAttributeRule.java
index 720f9cb..59f7112 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/VirtualAttributeRule.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/VirtualAttributeRule.java
@@ -26,8 +26,8 @@
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.util.Utils;
-import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn;
-import org.opends.server.admin.std.server.VirtualAttributeCfg;
+import org.forgerock.opendj.server.config.meta.VirtualAttributeCfgDefn;
+import org.forgerock.opendj.server.config.server.VirtualAttributeCfg;
import org.opends.server.api.Group;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
index dbf9386..294c304 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
@@ -26,7 +26,7 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.admin.std.meta.PasswordPolicyCfgDefn;
+import org.forgerock.opendj.server.config.meta.PasswordPolicyCfgDefn;
import org.opends.server.api.AuthenticationPolicyState;
import org.opends.server.api.Backend;
import org.opends.server.api.ClientConnection;
diff --git a/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java b/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java
index 796a06e..fa699c1 100644
--- a/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java
+++ b/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.snmp;
@@ -33,7 +33,7 @@
import javax.management.ObjectName;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.admin.std.server.SNMPConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.server.SNMPConnectionHandlerCfg;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.util.StaticUtils;
diff --git a/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java b/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java
index b006af3..7b78067 100644
--- a/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java
+++ b/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java
@@ -27,14 +27,14 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.admin.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ConnectionHandler;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.HostPort;
-import org.opends.server.admin.std.server.SNMPConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.server.SNMPConnectionHandlerCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
diff --git a/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPInetAddressAcl.java b/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPInetAddressAcl.java
index bb4bbaf..bf75ee5 100644
--- a/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPInetAddressAcl.java
+++ b/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPInetAddressAcl.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions copyright 2013-2014 ForgeRock AS.
+ * Portions copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.snmp;
@@ -25,7 +25,7 @@
import java.util.SortedSet;
import java.util.Vector;
-import org.opends.server.admin.std.server.SNMPConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.server.SNMPConnectionHandlerCfg;
/**
* This class allows to manage the IP-ACL based access rights
diff --git a/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPUserAcl.java b/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPUserAcl.java
index d4af291..cf9df8c 100644
--- a/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPUserAcl.java
+++ b/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPUserAcl.java
@@ -12,14 +12,14 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.snmp;
import com.sun.management.snmp.UserAcl;
import java.util.SortedSet;
-import org.opends.server.admin.std.meta.SNMPConnectionHandlerCfgDefn.*;
-import org.opends.server.admin.std.server.SNMPConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.meta.SNMPConnectionHandlerCfgDefn.*;
+import org.forgerock.opendj.server.config.server.SNMPConnectionHandlerCfg;
/**
* The SNMP User ACL.
diff --git a/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java b/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java
index 053eba0..8d91849 100644
--- a/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java
@@ -52,7 +52,7 @@
import org.forgerock.opendj.ldap.responses.Result;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn.Scope;
+import org.forgerock.opendj.server.config.meta.VirtualAttributeCfgDefn.Scope;
import org.opends.server.core.BindOperation;
import org.opends.server.core.CompareOperation;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java b/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
index 40cf51a..8f66b3d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
@@ -39,11 +39,11 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.client.ManagementContext;
+import org.forgerock.opendj.config.client.ManagementContext;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
-import org.opends.server.admin.client.ldap.LDAPConnection;
-import org.opends.server.admin.client.ldap.LDAPManagementContext;
-import org.opends.server.admin.std.client.RootCfgClient;
+import org.forgerock.opendj.config.client.ldap.LDAPConnection;
+import org.forgerock.opendj.config.client.ldap.LDAPManagementContext;
+import org.forgerock.opendj.server.config.client.RootCfgClient;
import org.opends.server.api.Backend;
import org.opends.server.api.WorkQueue;
import org.opends.server.api.plugin.PluginType;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AdminTestCaseUtils.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AdminTestCaseUtils.java
index c48bdac..25bad04 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AdminTestCaseUtils.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AdminTestCaseUtils.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.admin.server;
@@ -26,9 +26,9 @@
import org.opends.server.admin.ManagedObjectPath;
import org.opends.server.admin.RelationDefinition;
import org.opends.server.admin.SingletonRelationDefinition;
-import org.opends.server.admin.std.meta.RootCfgDefn;
import org.opends.server.config.ConfigEntry;
import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.server.config.meta.RootCfgDefn;
import org.opends.server.types.Entry;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java
index 4658347..82f4f19 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java
@@ -26,9 +26,9 @@
import org.testng.annotations.Test;
import org.testng.annotations.BeforeClass;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.PluginCfgDefn;
-import org.opends.server.admin.std.server.PluginCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.PluginCfgDefn;
+import org.forgerock.opendj.server.config.server.PluginCfg;
import org.opends.server.plugins.NullPlugin;
import org.opends.server.types.DisconnectReason;
import org.forgerock.opendj.ldap.DN;
@@ -68,7 +68,7 @@
sigList.add("initializePlugin");
sigList.add("void");
sigList.add("java.util.Set");
- sigList.add("org.opends.server.admin.std.server.PluginCfg");
+ sigList.add("org.forgerock.opendj.server.config.server.PluginCfg");
sigList.add("org.forgerock.opendj.config.server.ConfigException");
sigList.add("org.opends.server.types.InitializationException");
expectedAbstractMethods.add(sigList);
@@ -550,6 +550,7 @@
sigList = new LinkedList<>();
sigList.add("initializeInternal");
sigList.add("void");
+ sigList.add("org.opends.server.core.ServerContext");
sigList.add("org.forgerock.opendj.ldap.DN");
sigList.add("java.util.Set");
sigList.add("boolean");
@@ -631,7 +632,7 @@
sigList = new LinkedList<>();
sigList.add("isConfigurationAcceptable");
sigList.add("boolean");
- sigList.add("org.opends.server.admin.std.server.PluginCfg");
+ sigList.add("org.forgerock.opendj.server.config.server.PluginCfg");
sigList.add("java.util.List");
expectedPublicMethods.add(sigList);
@@ -700,7 +701,7 @@
fail("It appears that set of methods defined in the plugin API has " +
"been altered in a manner that could impact backward " +
"compatibility. This will only be allowed under extremely " +
- "limited circumstances.");
+ "limited circumstances. Missing expected methods:" + expectedPublicMethods);
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
index 41f392e..94f7f7f 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
@@ -49,7 +49,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
-import org.opends.server.admin.std.server.ExternalChangelogDomainCfg;
+import org.forgerock.opendj.server.config.server.ExternalChangelogDomainCfg;
import org.opends.server.api.Backend;
import org.opends.server.backends.ChangelogBackend.ChangeNumberRange;
import org.opends.server.controls.EntryChangelogNotificationControl;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/JETestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/JETestCase.java
index 3844fa7..4e95f97 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/JETestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/JETestCase.java
@@ -11,14 +11,14 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2015 ForgeRock AS.
+ * Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.backends.jeb;
import static org.mockito.Mockito.when;
import static org.opends.server.ConfigurationMock.legacyMockCfg;
-import org.opends.server.admin.std.server.JEBackendCfg;
+import org.forgerock.opendj.server.config.server.JEBackendCfg;
import org.opends.server.backends.pluggable.PluggableBackendImplTestCase;
import org.testng.annotations.Test;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/pdb/PDBStorageTest.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/pdb/PDBStorageTest.java
index acb48d2..6903555 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/pdb/PDBStorageTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/pdb/PDBStorageTest.java
@@ -24,7 +24,7 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.server.PDBBackendCfg;
+import org.forgerock.opendj.server.config.server.PDBBackendCfg;
import org.opends.server.backends.pluggable.spi.AccessMode;
import org.opends.server.backends.pluggable.spi.TreeName;
import org.opends.server.backends.pluggable.spi.WriteOperation;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ControlsTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ControlsTestCase.java
index 4a8135f..9c029e7 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ControlsTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ControlsTestCase.java
@@ -38,9 +38,9 @@
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.BackendVLVIndexCfgDefn.Scope;
-import org.opends.server.admin.std.server.BackendVLVIndexCfg;
-import org.opends.server.admin.std.server.PDBBackendCfg;
+import org.forgerock.opendj.server.config.meta.BackendVLVIndexCfgDefn.Scope;
+import org.forgerock.opendj.server.config.server.BackendVLVIndexCfg;
+import org.forgerock.opendj.server.config.server.PDBBackendCfg;
import org.opends.server.backends.pdb.PDBBackend;
import org.opends.server.controls.ServerSideSortRequestControl;
import org.opends.server.controls.ServerSideSortResponseControl;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/DN2IDTest.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/DN2IDTest.java
index 5dd42c0..e68bbcb 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/DN2IDTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/DN2IDTest.java
@@ -30,9 +30,9 @@
import org.forgerock.util.promise.PromiseImpl;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.BackendIndexCfgDefn.IndexType;
-import org.opends.server.admin.std.server.BackendIndexCfg;
-import org.opends.server.admin.std.server.PDBBackendCfg;
+import org.forgerock.opendj.server.config.meta.BackendIndexCfgDefn.IndexType;
+import org.forgerock.opendj.server.config.server.BackendIndexCfg;
+import org.forgerock.opendj.server.config.server.PDBBackendCfg;
import org.opends.server.backends.pdb.PDBStorage;
import org.opends.server.backends.pluggable.spi.AccessMode;
import org.opends.server.backends.pluggable.spi.Cursor;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ID2ChildrenCountTest.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ID2ChildrenCountTest.java
index 922b0d8..6c25d8f 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ID2ChildrenCountTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ID2ChildrenCountTest.java
@@ -31,9 +31,9 @@
import org.forgerock.util.promise.PromiseImpl;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.BackendIndexCfgDefn.IndexType;
-import org.opends.server.admin.std.server.BackendIndexCfg;
-import org.opends.server.admin.std.server.PDBBackendCfg;
+import org.forgerock.opendj.server.config.meta.BackendIndexCfgDefn.IndexType;
+import org.forgerock.opendj.server.config.server.BackendIndexCfg;
+import org.forgerock.opendj.server.config.server.PDBBackendCfg;
import org.opends.server.backends.pdb.PDBStorage;
import org.opends.server.backends.pluggable.spi.AccessMode;
import org.opends.server.backends.pluggable.spi.ReadOperation;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/PluggableBackendImplTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/PluggableBackendImplTestCase.java
index 961f32e..be09f12 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/PluggableBackendImplTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/PluggableBackendImplTestCase.java
@@ -46,11 +46,11 @@
import org.mockito.stubbing.Answer;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.BackendIndexCfgDefn.IndexType;
-import org.opends.server.admin.std.meta.BackendVLVIndexCfgDefn.Scope;
-import org.opends.server.admin.std.server.BackendIndexCfg;
-import org.opends.server.admin.std.server.BackendVLVIndexCfg;
-import org.opends.server.admin.std.server.PluggableBackendCfg;
+import org.forgerock.opendj.server.config.meta.BackendIndexCfgDefn.IndexType;
+import org.forgerock.opendj.server.config.meta.BackendVLVIndexCfgDefn.Scope;
+import org.forgerock.opendj.server.config.server.BackendIndexCfg;
+import org.forgerock.opendj.server.config.server.BackendVLVIndexCfg;
+import org.forgerock.opendj.server.config.server.PluggableBackendCfg;
import org.opends.server.api.Backend.BackendOperation;
import org.opends.server.api.ClientConnection;
import org.opends.server.backends.RebuildConfig;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/StateTest.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/StateTest.java
index 6c31ca9..1f12499 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/StateTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/StateTest.java
@@ -26,9 +26,9 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.BackendIndexCfgDefn.IndexType;
-import org.opends.server.admin.std.server.BackendIndexCfg;
-import org.opends.server.admin.std.server.PDBBackendCfg;
+import org.forgerock.opendj.server.config.meta.BackendIndexCfgDefn.IndexType;
+import org.forgerock.opendj.server.config.server.BackendIndexCfg;
+import org.forgerock.opendj.server.config.server.PDBBackendCfg;
import org.opends.server.backends.pdb.PDBStorage;
import org.opends.server.backends.pluggable.State.IndexFlag;
import org.opends.server.backends.pluggable.spi.AccessMode;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/pdb/PDBTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/pdb/PDBTestCase.java
index 57ee2e9..8bed2ce 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/pdb/PDBTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/pdb/PDBTestCase.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2015 ForgeRock AS.
+ * Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.backends.pluggable.pdb;
@@ -19,7 +19,7 @@
import static org.mockito.Mockito.when;
import static org.opends.server.ConfigurationMock.legacyMockCfg;
-import org.opends.server.admin.std.server.PDBBackendCfg;
+import org.forgerock.opendj.server.config.server.PDBBackendCfg;
import org.opends.server.backends.pdb.PDBBackend;
import org.opends.server.backends.pluggable.PluggableBackendImplTestCase;
import org.testng.annotations.Test;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/ConfigurationHandlerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/ConfigurationHandlerTestCase.java
index ba98e87..49cc7ff 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/ConfigurationHandlerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/ConfigurationHandlerTestCase.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2014-2015 ForgeRock AS.
+ * Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.core;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/GroupManagerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/GroupManagerTestCase.java
index 1c3958f..64b8036 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/GroupManagerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/GroupManagerTestCase.java
@@ -26,7 +26,7 @@
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.requests.ModifyRequest;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.server.GroupImplementationCfg;
+import org.forgerock.opendj.server.config.server.GroupImplementationCfg;
import org.opends.server.api.Group;
import org.opends.server.extensions.DynamicGroup;
import org.opends.server.extensions.StaticGroup;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/PasswordPolicyTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/PasswordPolicyTestCase.java
index db5b099..135cb2f 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/PasswordPolicyTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/PasswordPolicyTestCase.java
@@ -25,11 +25,11 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.PasswordPolicyCfgDefn;
-import org.opends.server.admin.std.server.PasswordPolicyCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.PasswordPolicyCfgDefn;
+import org.forgerock.opendj.server.config.server.PasswordPolicyCfg;
import org.opends.server.api.PasswordStorageScheme;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.types.Entry;
import org.opends.server.schema.UserPasswordSyntax;
import org.opends.server.tools.LDAPModify;
import org.opends.server.types.Attribute;
@@ -2163,12 +2163,12 @@
throws Exception
{
DN parentDN = DN.valueOf("cn=Password Policies,cn=config");
- ConfigEntry parentEntry = DirectoryServer.getConfigEntry(parentDN);
- ConfigEntry configEntry = new ConfigEntry(e, parentEntry);
+ Entry parentEntry = DirectoryServer.getConfigEntry(parentDN);
+ Entry configEntry = new Entry(e, parentEntry);
PasswordPolicyCfg configuration =
AdminTestCaseUtils.getConfiguration(PasswordPolicyCfgDefn.getInstance(),
- configEntry.getEntry());
+ configEntry);
new PasswordPolicyFactory().createAuthenticationPolicy(configuration);
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/AESPasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/AESPasswordStorageSchemeTestCase.java
index 0a791c1..d39858d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/AESPasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/AESPasswordStorageSchemeTestCase.java
@@ -12,14 +12,15 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.opends.server.extensions;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.AESPasswordStorageSchemeCfgDefn;
-import org.opends.server.admin.std.server.AESPasswordStorageSchemeCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.AESPasswordStorageSchemeCfgDefn;
+import org.forgerock.opendj.server.config.server.AESPasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
@@ -55,7 +56,7 @@
AESPasswordStorageSchemeCfg configuration =
AdminTestCaseUtils.getConfiguration(
AESPasswordStorageSchemeCfgDefn.getInstance(),
- configEntry.getEntry());
+ configEntry);
scheme.initializePasswordStorageScheme(configuration);
return scheme;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java
index 26bc52b..a10b6e7 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java
@@ -28,9 +28,9 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ModificationType;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.AttributeValuePasswordValidatorCfgDefn;
-import org.opends.server.admin.std.server.AttributeValuePasswordValidatorCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.AttributeValuePasswordValidatorCfgDefn;
+import org.forgerock.opendj.server.config.server.AttributeValuePasswordValidatorCfg;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Attributes;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java
index 49b3cda..367bf29 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java
@@ -12,14 +12,15 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.opends.server.extensions;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.Base64PasswordStorageSchemeCfgDefn;
-import org.opends.server.admin.std.server.Base64PasswordStorageSchemeCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.Base64PasswordStorageSchemeCfgDefn;
+import org.forgerock.opendj.server.config.server.Base64PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
@@ -55,7 +56,7 @@
Base64PasswordStorageSchemeCfg configuration =
AdminTestCaseUtils.getConfiguration(
Base64PasswordStorageSchemeCfgDefn.getInstance(),
- configEntry.getEntry()
+ configEntry
);
scheme.initializePasswordStorageScheme(configuration);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/BcryptPasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/BcryptPasswordStorageSchemeTestCase.java
index 87e5b77..71d182b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/BcryptPasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/BcryptPasswordStorageSchemeTestCase.java
@@ -15,9 +15,9 @@
*/
package org.opends.server.extensions;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.BcryptPasswordStorageSchemeCfgDefn;
-import org.opends.server.admin.std.server.BcryptPasswordStorageSchemeCfg;
+import org.forgerock.opendj.server.config.meta.BcryptPasswordStorageSchemeCfgDefn;
+import org.forgerock.opendj.server.config.server.BcryptPasswordStorageSchemeCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
import org.opends.server.api.PasswordStorageScheme;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/BlowfishPasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/BlowfishPasswordStorageSchemeTestCase.java
index 27f0652..04e31a9 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/BlowfishPasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/BlowfishPasswordStorageSchemeTestCase.java
@@ -12,14 +12,15 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.opends.server.extensions;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.BlowfishPasswordStorageSchemeCfgDefn;
-import org.opends.server.admin.std.server.BlowfishPasswordStorageSchemeCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.BlowfishPasswordStorageSchemeCfgDefn;
+import org.forgerock.opendj.server.config.server.BlowfishPasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
@@ -55,7 +56,7 @@
BlowfishPasswordStorageSchemeCfg configuration =
AdminTestCaseUtils.getConfiguration(
BlowfishPasswordStorageSchemeCfgDefn.getInstance(),
- configEntry.getEntry());
+ configEntry);
scheme.initializePasswordStorageScheme(configuration);
return scheme;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java
index 59b98dd..d2b785c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java
@@ -23,9 +23,9 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.CramMD5SASLMechanismHandlerCfgDefn;
-import org.opends.server.admin.std.server.CramMD5SASLMechanismHandlerCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.CramMD5SASLMechanismHandlerCfgDefn;
+import org.forgerock.opendj.server.config.server.CramMD5SASLMechanismHandlerCfg;
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java
index 0bd3c7b..e93bd56 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java
@@ -26,9 +26,9 @@
import org.opends.server.TestCaseUtils;
import org.forgerock.i18n.LocalizableMessageBuilder;
-import org.opends.server.admin.std.meta.CharacterSetPasswordValidatorCfgDefn;
-import org.opends.server.admin.std.server.CharacterSetPasswordValidatorCfg;
-import org.opends.server.admin.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.CharacterSetPasswordValidatorCfgDefn;
+import org.forgerock.opendj.server.config.server.CharacterSetPasswordValidatorCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java
index f72245b..69223b8 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java
@@ -12,14 +12,15 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.opends.server.extensions;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.ClearPasswordStorageSchemeCfgDefn;
-import org.opends.server.admin.std.server.ClearPasswordStorageSchemeCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.ClearPasswordStorageSchemeCfgDefn;
+import org.forgerock.opendj.server.config.server.ClearPasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
@@ -55,7 +56,7 @@
ClearPasswordStorageSchemeCfg configuration =
AdminTestCaseUtils.getConfiguration(
ClearPasswordStorageSchemeCfgDefn.getInstance(),
- configEntry.getEntry()
+ configEntry
);
scheme.initializePasswordStorageScheme(configuration);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/CommonEntryCacheTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CommonEntryCacheTestCase.java
index acfeaf8..c532eb7 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/CommonEntryCacheTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CommonEntryCacheTestCase.java
@@ -21,7 +21,7 @@
import java.util.ArrayList;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.server.EntryCacheCfg;
+import org.forgerock.opendj.server.config.server.EntryCacheCfg;
import org.opends.server.api.EntryCache;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.DN;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ConfigFileHandlerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ConfigFileHandlerTestCase.java
index 730235c..3f01b42 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ConfigFileHandlerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ConfigFileHandlerTestCase.java
@@ -25,7 +25,7 @@
import org.testng.annotations.Test;
import org.opends.server.TestCaseUtils;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.types.Entry;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.DN;
@@ -132,15 +132,15 @@
* @param violatingDNs A list to which the DN of any entry containing the
* extensibleObject class should be added.
*/
- private void recursivelyTestNoExtensibleObjects(ConfigEntry configEntry,
+ private void recursivelyTestNoExtensibleObjects(Entry configEntry,
ArrayList<DN> violatingDNs)
{
if (configEntry.hasObjectClass("extensibleObject"))
{
- violatingDNs.add(configEntry.getDN());
+ violatingDNs.add(configEntry.getName());
}
- for (ConfigEntry ce : configEntry.getChildren().values())
+ for (Entry ce : configEntry.getChildren().values())
{
recursivelyTestNoExtensibleObjects(ce, violatingDNs);
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java
index a637807..2052a2f 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java
@@ -12,16 +12,16 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2010-2015 ForgeRock AS.
+ * Portions Copyright 2010-2016 ForgeRock AS.
* Portions Copyright 2012 Dariusz Janny <dariusz.janny@gmail.com>
*/
package org.opends.server.extensions;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.CryptPasswordStorageSchemeCfgDefn;
-import org.opends.server.admin.std.server.CryptPasswordStorageSchemeCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.CryptPasswordStorageSchemeCfgDefn;
+import org.forgerock.opendj.server.config.server.CryptPasswordStorageSchemeCfg;
import org.opends.server.types.Entry;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java
index 35a70ea..a8e545b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java
@@ -24,10 +24,10 @@
import java.util.TreeMap;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
import org.testng.annotations.BeforeClass;
-import org.opends.server.admin.std.meta.*;
-import org.opends.server.admin.std.server.EntryCacheCfg;
+import org.forgerock.opendj.server.config.meta.*;
+import org.forgerock.opendj.server.config.server.EntryCacheCfg;
import org.opends.server.api.EntryCache;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.DN;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java
index 62e68a3..d6dc909 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java
@@ -28,9 +28,9 @@
import org.opends.server.TestCaseUtils;
import org.forgerock.i18n.LocalizableMessageBuilder;
-import org.opends.server.admin.std.meta.DictionaryPasswordValidatorCfgDefn;
-import org.opends.server.admin.std.server.DictionaryPasswordValidatorCfg;
-import org.opends.server.admin.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.DictionaryPasswordValidatorCfgDefn;
+import org.forgerock.opendj.server.config.server.DictionaryPasswordValidatorCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java
index d665399..8ca1220 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java
@@ -22,9 +22,9 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.DigestMD5SASLMechanismHandlerCfgDefn;
-import org.opends.server.admin.std.server.DigestMD5SASLMechanismHandlerCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.DigestMD5SASLMechanismHandlerCfgDefn;
+import org.forgerock.opendj.server.config.server.DigestMD5SASLMechanismHandlerCfg;
import org.opends.server.core.BindOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/DummyAlertHandler.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/DummyAlertHandler.java
index 8ba52b2..181b691 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/DummyAlertHandler.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/DummyAlertHandler.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -21,8 +21,8 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.AlertHandlerCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.AlertHandlerCfg;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.AlertHandler;
import org.forgerock.opendj.config.server.ConfigChangeResult;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java
index 7d98b6a..2e7caae 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java
@@ -33,13 +33,15 @@
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.mockito.ArgumentCaptor;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.EntityTagVirtualAttributeCfgDefn.ChecksumAlgorithm;
-import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn;
-import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn.ConflictBehavior;
-import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn.Scope;
-import org.opends.server.admin.std.server.EntityTagVirtualAttributeCfg;
-import org.opends.server.admin.std.server.VirtualAttributeCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.EntityTagVirtualAttributeCfgDefn.ChecksumAlgorithm;
+import org.forgerock.opendj.server.config.meta.VirtualAttributeCfgDefn;
+import org.forgerock.opendj.server.config.meta.VirtualAttributeCfgDefn.ConflictBehavior;
+import org.forgerock.opendj.server.config.meta.VirtualAttributeCfgDefn.Scope;
+import org.forgerock.opendj.server.config.server.EntityTagVirtualAttributeCfg;
+import org.forgerock.opendj.server.config.server.VirtualAttributeCfg;
+import org.opends.server.controls.LDAPAssertionRequestControl;
+import org.opends.server.controls.LDAPPostReadRequestControl;
import org.opends.server.controls.LDAPPostReadResponseControl;
import org.opends.server.controls.LDAPPreReadResponseControl;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
index 1a309e9..180ce52 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
@@ -25,7 +25,7 @@
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn;
+import org.forgerock.opendj.server.config.meta.VirtualAttributeCfgDefn;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalSearchOperation;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
index 18df220..b626304 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
@@ -23,7 +23,7 @@
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn;
+import org.forgerock.opendj.server.config.meta.VirtualAttributeCfgDefn;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.internal.SearchRequest;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java
index d7d96d5..40de27d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java
@@ -23,12 +23,12 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.ErrorLogAccountStatusNotificationHandlerCfgDefn;
-import org.opends.server.admin.std.server.ErrorLogAccountStatusNotificationHandlerCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.ErrorLogAccountStatusNotificationHandlerCfgDefn;
+import org.forgerock.opendj.server.config.server.ErrorLogAccountStatusNotificationHandlerCfg;
import org.opends.server.api.AccountStatusNotificationHandler;
import org.opends.server.api.AuthenticationPolicy;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.types.Entry;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.PasswordPolicy;
import org.opends.server.types.AccountStatusNotification;
@@ -142,15 +142,15 @@
{
DN parentDN =
DN.valueOf("cn=Account Status Notification Handlers,cn=config");
- ConfigEntry parentEntry = DirectoryServer.getConfigEntry(parentDN);
- ConfigEntry configEntry = new ConfigEntry(e, parentEntry);
+ Entry parentEntry = DirectoryServer.getConfigEntry(parentDN);
+ Entry configEntry = new Entry(e, parentEntry);
ErrorLogAccountStatusNotificationHandler handler =
new ErrorLogAccountStatusNotificationHandler();
ErrorLogAccountStatusNotificationHandlerCfg configuration =
AdminTestCaseUtils.getConfiguration(
ErrorLogAccountStatusNotificationHandlerCfgDefn.getInstance(),
- configEntry.getEntry()
+ configEntry
);
handler.initializeStatusNotificationHandler(configuration);
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
index 3cfb5ca..7516d5d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
@@ -26,9 +26,9 @@
import org.forgerock.opendj.ldap.requests.ModifyRequest;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.ExactMatchIdentityMapperCfgDefn;
-import org.opends.server.admin.std.server.ExactMatchIdentityMapperCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.ExactMatchIdentityMapperCfgDefn;
+import org.forgerock.opendj.server.config.server.ExactMatchIdentityMapperCfg;
import org.opends.server.api.IdentityMapper;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
index b589821..2c4b1fb 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
@@ -27,9 +27,9 @@
import org.forgerock.opendj.ldap.ModificationType;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.ExternalSASLMechanismHandlerCfgDefn;
-import org.opends.server.admin.std.server.ExternalSASLMechanismHandlerCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.ExternalSASLMechanismHandlerCfgDefn;
+import org.forgerock.opendj.server.config.server.ExternalSASLMechanismHandlerCfg;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
import org.opends.server.protocols.internal.InternalClientConnection;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/FIFOEntryCacheTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/FIFOEntryCacheTestCase.java
index a2d1e51..b826009 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/FIFOEntryCacheTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/FIFOEntryCacheTestCase.java
@@ -21,10 +21,10 @@
import java.util.ArrayList;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
import org.testng.annotations.BeforeClass;
-import org.opends.server.admin.std.meta.*;
-import org.opends.server.admin.std.server.FIFOEntryCacheCfg;
+import org.forgerock.opendj.server.config.meta.*;
+import org.forgerock.opendj.server.config.server.FIFOEntryCacheCfg;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.Entry;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java
index d0473fd..8eecf50 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -24,9 +24,9 @@
import org.testng.annotations.Test;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.FileBasedKeyManagerProviderCfgDefn;
-import org.opends.server.admin.std.server.FileBasedKeyManagerProviderCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.FileBasedKeyManagerProviderCfgDefn;
+import org.forgerock.opendj.server.config.server.FileBasedKeyManagerProviderCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Entry;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java
index c34d611..f2813e8 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -26,9 +26,9 @@
import org.testng.annotations.Test;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.FileBasedTrustManagerProviderCfgDefn;
-import org.opends.server.admin.std.server.FileBasedTrustManagerProviderCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.FileBasedTrustManagerProviderCfgDefn;
+import org.forgerock.opendj.server.config.server.FileBasedTrustManagerProviderCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Entry;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
index 981d00c..53ba24b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
@@ -28,9 +28,9 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.requests.ModifyRequest;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.FingerprintCertificateMapperCfgDefn;
-import org.opends.server.admin.std.server.FingerprintCertificateMapperCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.FingerprintCertificateMapperCfgDefn;
+import org.forgerock.opendj.server.config.server.FingerprintCertificateMapperCfg;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
import org.opends.server.tools.LDAPSearch;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
index f44e18e..96b4e49 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
@@ -22,7 +22,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn;
+import org.forgerock.opendj.server.config.meta.VirtualAttributeCfgDefn;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalSearchOperation;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
index a21bee4..ce5cad2 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
@@ -25,7 +25,7 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn;
+import org.forgerock.opendj.server.config.meta.VirtualAttributeCfgDefn;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
index 21c3c97..8acfc35 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
@@ -46,10 +46,10 @@
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.LDAPPassThroughAuthenticationPolicyCfgDefn.MappingPolicy;
-import org.opends.server.admin.std.server.AuthenticationPolicyCfg;
-import org.opends.server.admin.std.server.LDAPPassThroughAuthenticationPolicyCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.LDAPPassThroughAuthenticationPolicyCfgDefn.MappingPolicy;
+import org.forgerock.opendj.server.config.server.AuthenticationPolicyCfg;
+import org.forgerock.opendj.server.config.server.LDAPPassThroughAuthenticationPolicyCfg;
import org.opends.server.api.AuthenticationPolicy;
import org.opends.server.api.AuthenticationPolicyState;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java
index 5915f3e..19b7d54 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java
@@ -29,9 +29,9 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.LengthBasedPasswordValidatorCfgDefn;
-import org.opends.server.admin.std.server.LengthBasedPasswordValidatorCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.LengthBasedPasswordValidatorCfgDefn;
+import org.forgerock.opendj.server.config.server.LengthBasedPasswordValidatorCfg;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.types.Attributes;
import org.opends.server.types.Control;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java
index 7901ded..d09810f 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java
@@ -12,14 +12,15 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.opends.server.extensions;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.MD5PasswordStorageSchemeCfgDefn;
-import org.opends.server.admin.std.server.MD5PasswordStorageSchemeCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.MD5PasswordStorageSchemeCfgDefn;
+import org.forgerock.opendj.server.config.server.MD5PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
@@ -55,7 +56,7 @@
MD5PasswordStorageSchemeCfg configuration =
AdminTestCaseUtils.getConfiguration(
MD5PasswordStorageSchemeCfgDefn.getInstance(),
- configEntry.getEntry()
+ configEntry
);
scheme.initializePasswordStorageScheme(configuration);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/PBKDF2PasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/PBKDF2PasswordStorageSchemeTestCase.java
index a14c6b4..2f1b5aa 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/PBKDF2PasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/PBKDF2PasswordStorageSchemeTestCase.java
@@ -11,13 +11,13 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2014 ForgeRock AS.
+ * Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.PBKDF2PasswordStorageSchemeCfgDefn;
-import org.opends.server.admin.std.server.PBKDF2PasswordStorageSchemeCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.PBKDF2PasswordStorageSchemeCfgDefn;
+import org.forgerock.opendj.server.config.server.PBKDF2PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.types.DirectoryException;
import org.testng.annotations.DataProvider;
@@ -69,7 +69,7 @@
PBKDF2PasswordStorageSchemeCfg configuration =
AdminTestCaseUtils.getConfiguration(
PBKDF2PasswordStorageSchemeCfgDefn.getInstance(),
- configEntry.getEntry()
+ configEntry
);
scheme.initializePasswordStorageScheme(configuration);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/PKCS5S2PasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/PKCS5S2PasswordStorageSchemeTestCase.java
index 454b683..345f460 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/PKCS5S2PasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/PKCS5S2PasswordStorageSchemeTestCase.java
@@ -11,13 +11,13 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2014 ForgeRock AS.
+ * Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.PKCS5S2PasswordStorageSchemeCfgDefn;
-import org.opends.server.admin.std.server.PKCS5S2PasswordStorageSchemeCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.PKCS5S2PasswordStorageSchemeCfgDefn;
+import org.forgerock.opendj.server.config.server.PKCS5S2PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.types.DirectoryException;
import org.testng.annotations.DataProvider;
@@ -72,7 +72,7 @@
PKCS5S2PasswordStorageSchemeCfg configuration =
AdminTestCaseUtils.getConfiguration(
PKCS5S2PasswordStorageSchemeCfgDefn.getInstance(),
- configEntry.getEntry()
+ configEntry
);
scheme.initializePasswordStorageScheme(configuration);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
index 537c616..21f7aea 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
@@ -28,9 +28,9 @@
import org.forgerock.opendj.ldap.requests.Requests;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.PasswordModifyExtendedOperationHandlerCfgDefn;
-import org.opends.server.admin.std.server.PasswordModifyExtendedOperationHandlerCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.PasswordModifyExtendedOperationHandlerCfgDefn;
+import org.forgerock.opendj.server.config.server.PasswordModifyExtendedOperationHandlerCfg;
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ExtendedOperation;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
index a66032f..7ba895d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
@@ -23,7 +23,7 @@
import org.forgerock.opendj.ldap.requests.Requests;
import org.opends.server.TestCaseUtils;
import org.opends.server.api.PasswordStorageScheme;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.types.Entry;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.PasswordPolicy;
@@ -45,7 +45,7 @@
extends ExtensionsTestCase
{
/** The configuration entry for this password storage scheme. */
- protected ConfigEntry configEntry;
+ protected Entry configEntry;
/**
* The string representation of the DN of the configuration entry for this
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/RC4PasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/RC4PasswordStorageSchemeTestCase.java
index 40c8f03..ec85652 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/RC4PasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/RC4PasswordStorageSchemeTestCase.java
@@ -12,14 +12,15 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.opends.server.extensions;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.RC4PasswordStorageSchemeCfgDefn;
-import org.opends.server.admin.std.server.RC4PasswordStorageSchemeCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.RC4PasswordStorageSchemeCfgDefn;
+import org.forgerock.opendj.server.config.server.RC4PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
@@ -55,7 +56,7 @@
RC4PasswordStorageSchemeCfg configuration =
AdminTestCaseUtils.getConfiguration(
RC4PasswordStorageSchemeCfgDefn.getInstance(),
- configEntry.getEntry());
+ configEntry);
scheme.initializePasswordStorageScheme(configuration);
return scheme;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java
index e7d20ce..406f96c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java
@@ -25,10 +25,10 @@
import org.testng.annotations.Test;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.RandomPasswordGeneratorCfgDefn;
-import org.opends.server.admin.std.server.RandomPasswordGeneratorCfg;
-import org.opends.server.config.ConfigEntry;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.RandomPasswordGeneratorCfgDefn;
+import org.forgerock.opendj.server.config.server.RandomPasswordGeneratorCfg;
+import org.opends.server.types.Entry;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.DN;
@@ -70,13 +70,13 @@
{
DN dn = DN.valueOf("cn=Random Password Generator,cn=Password Generators," +
"cn=config");
- ConfigEntry configEntry = DirectoryServer.getConfigEntry(dn);
+ Entry configEntry = DirectoryServer.getConfigEntry(dn);
assertNotNull(configEntry);
RandomPasswordGeneratorCfg configuration =
AdminTestCaseUtils.getConfiguration(
RandomPasswordGeneratorCfgDefn.getInstance(),
- configEntry.getEntry());
+ configEntry);
RandomPasswordGenerator generator = new RandomPasswordGenerator();
generator.initializePasswordGenerator(configuration);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java
index 9fdcf15..d39770d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java
@@ -25,10 +25,10 @@
import org.opends.server.TestCaseUtils;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.
RegularExpressionIdentityMapperCfgDefn;
-import org.opends.server.admin.std.server.RegularExpressionIdentityMapperCfg;
+import org.forgerock.opendj.server.config.server.RegularExpressionIdentityMapperCfg;
import org.opends.server.api.IdentityMapper;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java
index 140672e..0fed521 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java
@@ -32,9 +32,9 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.RepeatedCharactersPasswordValidatorCfgDefn;
-import org.opends.server.admin.std.server.RepeatedCharactersPasswordValidatorCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.RepeatedCharactersPasswordValidatorCfgDefn;
+import org.forgerock.opendj.server.config.server.RepeatedCharactersPasswordValidatorCfg;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.types.Attributes;
import org.opends.server.types.Control;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java
index 219cc68..63f229d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java
@@ -12,14 +12,15 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.opends.server.extensions;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.SHA1PasswordStorageSchemeCfgDefn;
-import org.opends.server.admin.std.server.SHA1PasswordStorageSchemeCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.SHA1PasswordStorageSchemeCfgDefn;
+import org.forgerock.opendj.server.config.server.SHA1PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
@@ -55,7 +56,7 @@
SHA1PasswordStorageSchemeCfg configuration =
AdminTestCaseUtils.getConfiguration(
SHA1PasswordStorageSchemeCfgDefn.getInstance(),
- configEntry.getEntry()
+ configEntry
);
scheme.initializePasswordStorageScheme(configuration);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java
index c6e1cfd..98745df 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java
@@ -12,15 +12,15 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
import org.testng.annotations.Test;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.SaltedMD5PasswordStorageSchemeCfgDefn;
-import org.opends.server.admin.std.server.SaltedMD5PasswordStorageSchemeCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.SaltedMD5PasswordStorageSchemeCfgDefn;
+import org.forgerock.opendj.server.config.server.SaltedMD5PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.forgerock.opendj.ldap.ByteString;
@@ -53,7 +53,7 @@
SaltedMD5PasswordStorageSchemeCfg configuration =
AdminTestCaseUtils.getConfiguration(
SaltedMD5PasswordStorageSchemeCfgDefn.getInstance(),
- configEntry.getEntry()
+ configEntry
);
scheme.initializePasswordStorageScheme(configuration);
@@ -73,7 +73,7 @@
SaltedMD5PasswordStorageSchemeCfg configuration =
AdminTestCaseUtils.getConfiguration(
SaltedMD5PasswordStorageSchemeCfgDefn.getInstance(),
- configEntry.getEntry()
+ configEntry
);
scheme.initializePasswordStorageScheme(configuration);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java
index 4bc716f..f012195 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java
@@ -12,13 +12,13 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.SaltedSHA1PasswordStorageSchemeCfgDefn;
-import org.opends.server.admin.std.server.SaltedSHA1PasswordStorageSchemeCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.SaltedSHA1PasswordStorageSchemeCfgDefn;
+import org.forgerock.opendj.server.config.server.SaltedSHA1PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.types.DirectoryException;
@@ -53,7 +53,7 @@
SaltedSHA1PasswordStorageSchemeCfg configuration =
AdminTestCaseUtils.getConfiguration(
SaltedSHA1PasswordStorageSchemeCfgDefn.getInstance(),
- configEntry.getEntry()
+ configEntry
);
scheme.initializePasswordStorageScheme(configuration);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA256PasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA256PasswordStorageSchemeTestCase.java
index 31710b8..6d835d6 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA256PasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA256PasswordStorageSchemeTestCase.java
@@ -12,13 +12,13 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2010-2014 ForgeRock AS.
+ * Portions Copyright 2010-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.SaltedSHA256PasswordStorageSchemeCfgDefn;
-import org.opends.server.admin.std.server.SaltedSHA256PasswordStorageSchemeCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.SaltedSHA256PasswordStorageSchemeCfgDefn;
+import org.forgerock.opendj.server.config.server.SaltedSHA256PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -56,7 +56,7 @@
SaltedSHA256PasswordStorageSchemeCfg configuration =
AdminTestCaseUtils.getConfiguration(
SaltedSHA256PasswordStorageSchemeCfgDefn.getInstance(),
- configEntry.getEntry()
+ configEntry
);
scheme.initializePasswordStorageScheme(configuration);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA384PasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA384PasswordStorageSchemeTestCase.java
index 0f173c2..ecf3942 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA384PasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA384PasswordStorageSchemeTestCase.java
@@ -12,13 +12,13 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2010-2014 ForgeRock AS.
+ * Portions Copyright 2010-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.SaltedSHA384PasswordStorageSchemeCfgDefn;
-import org.opends.server.admin.std.server.SaltedSHA384PasswordStorageSchemeCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.SaltedSHA384PasswordStorageSchemeCfgDefn;
+import org.forgerock.opendj.server.config.server.SaltedSHA384PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -56,7 +56,7 @@
SaltedSHA384PasswordStorageSchemeCfg configuration =
AdminTestCaseUtils.getConfiguration(
SaltedSHA384PasswordStorageSchemeCfgDefn.getInstance(),
- configEntry.getEntry()
+ configEntry
);
scheme.initializePasswordStorageScheme(configuration);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA512PasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA512PasswordStorageSchemeTestCase.java
index 5b87cdd..9996af0 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA512PasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA512PasswordStorageSchemeTestCase.java
@@ -12,13 +12,13 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2010-2014 ForgeRock AS.
+ * Portions Copyright 2010-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.SaltedSHA512PasswordStorageSchemeCfgDefn;
-import org.opends.server.admin.std.server.SaltedSHA512PasswordStorageSchemeCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.SaltedSHA512PasswordStorageSchemeCfgDefn;
+import org.forgerock.opendj.server.config.server.SaltedSHA512PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.types.DirectoryException;
import org.testng.annotations.DataProvider;
@@ -57,7 +57,7 @@
SaltedSHA512PasswordStorageSchemeCfg configuration =
AdminTestCaseUtils.getConfiguration(
SaltedSHA512PasswordStorageSchemeCfgDefn.getInstance(),
- configEntry.getEntry()
+ configEntry
);
scheme.initializePasswordStorageScheme(configuration);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java
index afc8849..6aad6fa 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java
@@ -38,9 +38,9 @@
import static org.forgerock.opendj.ldap.ModificationType.*;
import static org.opends.server.util.CollectionUtils.*;
import static org.testng.Assert.*;
-import org.opends.server.admin.std.meta.SimilarityBasedPasswordValidatorCfgDefn;
-import org.opends.server.admin.std.server.SimilarityBasedPasswordValidatorCfg;
-import org.opends.server.admin.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.SimilarityBasedPasswordValidatorCfgDefn;
+import org.forgerock.opendj.server.config.server.SimilarityBasedPasswordValidatorCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
/**
* A set of test cases for the Similarity-Based Password Reject.
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java
index 6860de2..e95620a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -20,10 +20,10 @@
import java.util.ArrayList;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
import org.testng.annotations.BeforeClass;
-import org.opends.server.admin.std.meta.*;
-import org.opends.server.admin.std.server.SoftReferenceEntryCacheCfg;
+import org.forgerock.opendj.server.config.meta.*;
+import org.forgerock.opendj.server.config.server.SoftReferenceEntryCacheCfg;
import org.opends.server.types.Entry;
import org.opends.server.util.ServerConstants;
import org.testng.annotations.AfterClass;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
index 2d682f3..80867df 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
@@ -22,7 +22,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn;
+import org.forgerock.opendj.server.config.meta.VirtualAttributeCfgDefn;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.internal.SearchRequest;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
index c74d911..8d3c7e6 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
@@ -29,9 +29,9 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.requests.ModifyRequest;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.SubjectAttributeToUserAttributeCertificateMapperCfgDefn;
-import org.opends.server.admin.std.server.SubjectAttributeToUserAttributeCertificateMapperCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.SubjectAttributeToUserAttributeCertificateMapperCfgDefn;
+import org.forgerock.opendj.server.config.server.SubjectAttributeToUserAttributeCertificateMapperCfg;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
import org.opends.server.tools.LDAPSearch;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
index 1672f92..fe15be1 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
@@ -28,9 +28,9 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.requests.ModifyRequest;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.SubjectDNToUserAttributeCertificateMapperCfgDefn;
-import org.opends.server.admin.std.server.SubjectDNToUserAttributeCertificateMapperCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.SubjectDNToUserAttributeCertificateMapperCfgDefn;
+import org.forgerock.opendj.server.config.server.SubjectDNToUserAttributeCertificateMapperCfg;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
import org.opends.server.tools.LDAPSearch;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
index f3df022..08deb88 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
@@ -22,7 +22,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn;
+import org.forgerock.opendj.server.config.meta.VirtualAttributeCfgDefn;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.internal.SearchRequest;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAccountStatusNotificationHandler.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAccountStatusNotificationHandler.java
index 6590868..fae58a1 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAccountStatusNotificationHandler.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAccountStatusNotificationHandler.java
@@ -12,13 +12,13 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
import java.util.concurrent.atomic.AtomicInteger;
-import org.opends.server.admin.std.server.
+import org.forgerock.opendj.server.config.server.
AccountStatusNotificationHandlerCfg;
import org.opends.server.api.AccountStatusNotificationHandler;
import org.opends.server.types.AccountStatusNotification;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java
index 3d9168d..0c7fc5e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -20,7 +20,7 @@
import java.util.Set;
-import org.opends.server.admin.std.server.PasswordValidatorCfg;
+import org.forgerock.opendj.server.config.server.PasswordValidatorCfg;
import org.opends.server.api.PasswordValidator;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TripleDESPasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TripleDESPasswordStorageSchemeTestCase.java
index 39f264e..35b9fac 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TripleDESPasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TripleDESPasswordStorageSchemeTestCase.java
@@ -12,14 +12,15 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.opends.server.extensions;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.TripleDESPasswordStorageSchemeCfgDefn;
-import org.opends.server.admin.std.server.TripleDESPasswordStorageSchemeCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.TripleDESPasswordStorageSchemeCfgDefn;
+import org.forgerock.opendj.server.config.server.TripleDESPasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
@@ -56,7 +57,7 @@
TripleDESPasswordStorageSchemeCfg configuration =
AdminTestCaseUtils.getConfiguration(
TripleDESPasswordStorageSchemeCfgDefn.getInstance(),
- configEntry.getEntry());
+ configEntry);
scheme.initializePasswordStorageScheme(configuration);
return scheme;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java
index 518f648..8082a7d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java
@@ -29,9 +29,9 @@
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.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.UniqueCharactersPasswordValidatorCfgDefn;
+import org.forgerock.opendj.server.config.server.UniqueCharactersPasswordValidatorCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/loggers/AbstractTextAccessLogPublisherTest.java b/opendj-server-legacy/src/test/java/org/opends/server/loggers/AbstractTextAccessLogPublisherTest.java
index e2fe46f..09bb55a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/loggers/AbstractTextAccessLogPublisherTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/loggers/AbstractTextAccessLogPublisherTest.java
@@ -26,8 +26,8 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.AccessLogFilteringCriteriaCfgDefn.LogRecordType;
-import org.opends.server.admin.std.server.AccessLogFilteringCriteriaCfg;
+import org.forgerock.opendj.server.config.meta.AccessLogFilteringCriteriaCfgDefn.LogRecordType;
+import org.forgerock.opendj.server.config.server.AccessLogFilteringCriteriaCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/monitors/BackendMonitorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/monitors/BackendMonitorTestCase.java
index d4fb0f8..52fe35a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/monitors/BackendMonitorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/monitors/BackendMonitorTestCase.java
@@ -12,11 +12,11 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.monitors;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.core.DirectoryServer;
import org.testng.annotations.Test;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java
index 4e6728e..31ea0b7 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java
@@ -23,7 +23,7 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.api.MonitorProvider;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.types.Entry;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.DN;
@@ -39,7 +39,7 @@
extends MonitorTestCase
{
/** The configuration entry for this test case. */
- protected ConfigEntry configEntry;
+ protected Entry configEntry;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/monitors/TestMonitorProvider.java b/opendj-server-legacy/src/test/java/org/opends/server/monitors/TestMonitorProvider.java
index 2d20e54..b3a86f6 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/monitors/TestMonitorProvider.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/monitors/TestMonitorProvider.java
@@ -18,8 +18,8 @@
package org.opends.server.monitors;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorData;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.types.InitializationException;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/AttributeCleanupPluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/AttributeCleanupPluginTestCase.java
index 8e9474b..fcffc56 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/AttributeCleanupPluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/AttributeCleanupPluginTestCase.java
@@ -26,9 +26,9 @@
import org.forgerock.opendj.ldap.ModificationType;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.AttributeCleanupPluginCfgDefn;
-import org.opends.server.admin.std.server.AttributeCleanupPluginCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.AttributeCleanupPluginCfgDefn;
+import org.forgerock.opendj.server.config.server.AttributeCleanupPluginCfg;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.core.AddOperationBasis;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/DelayPreOpPlugin.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/DelayPreOpPlugin.java
index fd51d3a..811a7ef 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/DelayPreOpPlugin.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/DelayPreOpPlugin.java
@@ -29,7 +29,7 @@
import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.admin.std.server.PluginCfg;
+import org.forgerock.opendj.server.config.server.PluginCfg;
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/DisconnectClientPlugin.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/DisconnectClientPlugin.java
index b25c5b3..d34ee75 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/DisconnectClientPlugin.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/DisconnectClientPlugin.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.plugins;
@@ -25,7 +25,7 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.admin.std.server.PluginCfg;
+import org.forgerock.opendj.server.config.server.PluginCfg;
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java
index 70604d7..6990a36 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java
@@ -26,9 +26,9 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.EntryUUIDPluginCfgDefn;
-import org.opends.server.admin.std.server.EntryUUIDPluginCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.EntryUUIDPluginCfgDefn;
+import org.forgerock.opendj.server.config.server.EntryUUIDPluginCfg;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.schema.AttributeType;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java
index 77e6720..4e3e49a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.plugins;
@@ -22,7 +22,7 @@
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-import org.opends.server.admin.std.server.PluginCfg;
+import org.forgerock.opendj.server.config.server.PluginCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.plugin.*;
import org.opends.server.types.DisconnectReason;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/LDAPADListPluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/LDAPADListPluginTestCase.java
index 4ef256d..1696445 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/LDAPADListPluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/LDAPADListPluginTestCase.java
@@ -29,9 +29,9 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.LDAPAttributeDescriptionListPluginCfgDefn;
-import org.opends.server.admin.std.server.LDAPAttributeDescriptionListPluginCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.LDAPAttributeDescriptionListPluginCfgDefn;
+import org.forgerock.opendj.server.config.server.LDAPAttributeDescriptionListPluginCfg;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.internal.SearchRequest;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/LastModPluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/LastModPluginTestCase.java
index 384613e..15473dc 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/LastModPluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/LastModPluginTestCase.java
@@ -28,9 +28,9 @@
import org.forgerock.opendj.ldap.ModificationType;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.LastModPluginCfgDefn;
-import org.opends.server.admin.std.server.LastModPluginCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.LastModPluginCfgDefn;
+import org.forgerock.opendj.server.config.server.LastModPluginCfg;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyDNOperation;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/NullPlugin.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/NullPlugin.java
index 6ebb37b..9282add 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/NullPlugin.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/NullPlugin.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.plugins;
@@ -20,7 +20,7 @@
import java.util.Set;
-import org.opends.server.admin.std.server.PluginCfg;
+import org.forgerock.opendj.server.config.server.PluginCfg;
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginType;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java
index 38c7030..3019445 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java
@@ -22,9 +22,9 @@
import java.util.List;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.PasswordPolicyImportPluginCfgDefn;
-import org.opends.server.admin.std.server.PasswordPolicyImportPluginCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.PasswordPolicyImportPluginCfgDefn;
+import org.forgerock.opendj.server.config.server.PasswordPolicyImportPluginCfg;
import org.opends.server.api.plugin.PluginType;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java
index 64c1fcb..2340690 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java
@@ -30,9 +30,9 @@
import org.forgerock.opendj.ldap.requests.Requests;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.ReferentialIntegrityPluginCfgDefn;
-import org.opends.server.admin.std.server.ReferentialIntegrityPluginCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.ReferentialIntegrityPluginCfgDefn;
+import org.forgerock.opendj.server.config.server.ReferentialIntegrityPluginCfg;
import org.opends.server.api.Group;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.controls.SubtreeDeleteControl;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/ShortCircuitPlugin.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/ShortCircuitPlugin.java
index 0dff176..2a04473 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/ShortCircuitPlugin.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/ShortCircuitPlugin.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.plugins;
@@ -33,7 +33,7 @@
import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.admin.std.server.PluginCfg;
+import org.forgerock.opendj.server.config.server.PluginCfg;
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java
index 1c4eeda..e89d91b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java
@@ -25,9 +25,9 @@
import org.forgerock.opendj.ldap.requests.ModifyDNRequest;
import org.forgerock.opendj.ldap.requests.ModifyRequest;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.UniqueAttributePluginCfgDefn;
-import org.opends.server.admin.std.server.UniqueAttributePluginCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.UniqueAttributePluginCfgDefn;
+import org.forgerock.opendj.server.config.server.UniqueAttributePluginCfg;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.core.AddOperation;
import org.opends.server.core.ModifyDNOperation;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java
index 8ab8cc9..34aae9b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java
@@ -23,7 +23,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.std.server.PluginCfg;
+import org.forgerock.opendj.server.config.server.PluginCfg;
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxConnectTest.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxConnectTest.java
index d0c7bbe..7b98b2c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxConnectTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxConnectTest.java
@@ -37,9 +37,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.JMXConnectionHandlerCfgDefn;
-import org.opends.server.admin.std.server.JMXConnectionHandlerCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.JMXConnectionHandlerCfgDefn;
+import org.forgerock.opendj.server.config.server.JMXConnectionHandlerCfg;
import org.opends.server.config.JMXMBean;
import org.opends.server.core.AddOperationBasis;
import org.opends.server.core.DeleteOperation;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LdapTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LdapTestCase.java
index 7765175..46f11c3 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LdapTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LdapTestCase.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap ;
@@ -25,9 +25,9 @@
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.LDAPConnectionHandlerCfgDefn;
-import org.opends.server.admin.std.server.LDAPConnectionHandlerCfg;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.LDAPConnectionHandlerCfgDefn;
+import org.forgerock.opendj.server.config.server.LDAPConnectionHandlerCfg;
import org.opends.server.core.ServerContext;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.Attribute;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java
index e230891..a5be2c1 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java
@@ -26,7 +26,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.server.LDAPConnectionHandlerCfg;
+import org.forgerock.opendj.server.config.server.LDAPConnectionHandlerCfg;
import org.opends.server.api.ClientConnection;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
@@ -124,7 +124,7 @@
}
/**
- * Start a handler an then give its hasAcceptableConfiguration a ConfigEntry with
+ * Start a handler an then give its hasAcceptableConfiguration a Entry with
* numerous invalid cases and single-valued attrs with duplicate values.
*
* @throws Exception if handler cannot be instantiated or the configuration is
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java
index 4cca725..089902e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java
@@ -37,7 +37,7 @@
import org.forgerock.opendj.ldap.requests.Requests;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.server.ReplicationDomainCfg;
+import org.forgerock.opendj.server.config.server.ReplicationDomainCfg;
import org.opends.server.backends.task.TaskState;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java
index 90f7960..74af23a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java
@@ -29,8 +29,8 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorData;
+import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/DomainFakeCfg.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/DomainFakeCfg.java
index 46be2e8..a46fd29 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/DomainFakeCfg.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/DomainFakeCfg.java
@@ -22,11 +22,11 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.DN;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.AssuredType;
-import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.IsolationPolicy;
-import org.opends.server.admin.std.server.ExternalChangelogDomainCfg;
-import org.opends.server.admin.std.server.ReplicationDomainCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.meta.ReplicationDomainCfgDefn.AssuredType;
+import org.forgerock.opendj.server.config.meta.ReplicationDomainCfgDefn.IsolationPolicy;
+import org.forgerock.opendj.server.config.server.ExternalChangelogDomainCfg;
+import org.forgerock.opendj.server.config.server.ReplicationDomainCfg;
/**
* This class implement a configuration object for the MultimasterDomain
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ExternalChangelogDomainFakeCfg.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ExternalChangelogDomainFakeCfg.java
index 7bbb8f7..d21be9c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ExternalChangelogDomainFakeCfg.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ExternalChangelogDomainFakeCfg.java
@@ -19,9 +19,9 @@
import java.util.SortedSet;
import java.util.TreeSet;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.ExternalChangelogDomainCfg;
import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.ExternalChangelogDomainCfg;
/**
* This class implement a configuration object for the ExternalChangelog domain
@@ -56,6 +56,7 @@
}
/** {@inheritDoc} */
+ @Override
public Class<? extends ExternalChangelogDomainCfg> configurationClass()
{
return null;
@@ -67,6 +68,7 @@
* @param listener
* The External Changelog Domain configuration change listener.
*/
+ @Override
public void addChangeListener(
ConfigurationChangeListener<ExternalChangelogDomainCfg> listener)
{}
@@ -79,17 +81,20 @@
* @param listener
* The External Changelog Domain configuration change listener.
*/
+ @Override
public void removeChangeListener(
ConfigurationChangeListener<ExternalChangelogDomainCfg> listener)
{}
+ @Override
public SortedSet<String> getECLInclude()
{
return this.pECLInclude;
}
+ @Override
public SortedSet<String> getECLIncludeForDeletes()
{
return this.pECLIncludeForDeletes;
@@ -114,6 +119,7 @@
*
* @return Returns the value of the "enabled" property.
*/
+ @Override
public boolean isEnabled()
{
return this.pEnabled;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
index 72967b9..66af35c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
@@ -33,7 +33,7 @@
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.opendj.ldap.schema.SchemaBuilder;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.AssuredType;
+import org.forgerock.opendj.server.config.meta.ReplicationDomainCfgDefn.AssuredType;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.CSN;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/IsolationTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/IsolationTest.java
index eaf1abd..099f4cf 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/IsolationTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/IsolationTest.java
@@ -27,7 +27,7 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.IsolationPolicy;
+import org.forgerock.opendj.server.config.meta.ReplicationDomainCfgDefn.IsolationPolicy;
import org.opends.server.core.ModifyOperation;
import org.opends.server.replication.ReplicationTestCase;
import org.testng.annotations.Test;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/NamingConflictTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/NamingConflictTest.java
index 87ba91e..42b1932 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/NamingConflictTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/NamingConflictTest.java
@@ -22,7 +22,7 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.IsolationPolicy;
+import org.forgerock.opendj.server.config.meta.ReplicationDomainCfgDefn.IsolationPolicy;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.replication.ReplicationTestCase;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java
index d2c696f..fd2959e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java
@@ -29,7 +29,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.server.ReplicationServerCfg;
+import org.forgerock.opendj.server.config.server.ReplicationServerCfg;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.server.ReplServerFakeConfiguration;
import org.opends.server.replication.server.ReplicationServer;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java
index d992c83..2ec5135 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java
@@ -27,9 +27,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.ReplicationSynchronizationProviderCfg;
-import org.opends.server.admin.std.server.SynchronizationProviderCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.ReplicationSynchronizationProviderCfg;
+import org.forgerock.opendj.server.config.server.SynchronizationProviderCfg;
import org.opends.server.api.SynchronizationProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.ReplicationTestCase;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/TopologyViewTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/TopologyViewTest.java
index 0578a1f..269a89f 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/TopologyViewTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/TopologyViewTest.java
@@ -32,7 +32,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.AssuredType;
+import org.forgerock.opendj.server.config.meta.ReplicationDomainCfgDefn.AssuredType;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.AssuredMode;
import org.opends.server.replication.common.DSInfo;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/AssuredReplicationServerTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/AssuredReplicationServerTest.java
index 1ff868b..b4cbc93 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/AssuredReplicationServerTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/AssuredReplicationServerTest.java
@@ -28,8 +28,8 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.AssuredType;
-import org.opends.server.admin.std.server.ReplicationDomainCfg;
+import org.forgerock.opendj.server.config.meta.ReplicationDomainCfgDefn.AssuredType;
+import org.forgerock.opendj.server.config.server.ReplicationDomainCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.*;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplServerFakeConfiguration.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplServerFakeConfiguration.java
index 0365cb2..3bc909d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplServerFakeConfiguration.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplServerFakeConfiguration.java
@@ -20,11 +20,11 @@
import java.util.SortedSet;
import java.util.TreeSet;
-import org.opends.server.admin.Configuration;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ServerManagedObject;
-import org.opends.server.admin.std.server.ReplicationServerCfg;
+import org.forgerock.opendj.config.Configuration;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.config.server.ServerManagedObject;
import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.server.config.server.ReplicationServerCfg;
/**
* This Class implements an object that can be used to instantiate
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDBTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDBTest.java
index eeff349..c3ac836 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDBTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDBTest.java
@@ -21,8 +21,8 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.server.config.server.ReplicationServerCfg;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.server.ReplicationServerCfg;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.server.ReplServerFakeConfiguration;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java
index 4383e2b..1d3a96b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java
@@ -16,10 +16,10 @@
*/
package org.opends.server.schema;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.SaltedMD5PasswordStorageSchemeCfgDefn;
-import org.opends.server.admin.std.server.SaltedMD5PasswordStorageSchemeCfg;
-import org.opends.server.config.ConfigEntry;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.SaltedMD5PasswordStorageSchemeCfgDefn;
+import org.forgerock.opendj.server.config.server.SaltedMD5PasswordStorageSchemeCfg;
+import org.opends.server.types.Entry;
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.SaltedMD5PasswordStorageScheme;
import org.forgerock.opendj.ldap.Assertion;
@@ -57,14 +57,14 @@
ByteString bytePassword = ByteString.valueOfUtf8(password);
SaltedMD5PasswordStorageScheme scheme = new SaltedMD5PasswordStorageScheme();
- ConfigEntry configEntry =
+ Entry configEntry =
DirectoryServer.getConfigEntry(
DN.valueOf("cn=Salted MD5,cn=Password Storage Schemes,cn=config"));
SaltedMD5PasswordStorageSchemeCfg configuration =
AdminTestCaseUtils.getConfiguration(
SaltedMD5PasswordStorageSchemeCfgDefn.getInstance(),
- configEntry.getEntry()
+ configEntry
);
scheme.initializePasswordStorageScheme(configuration);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/CertificateSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/CertificateSyntaxTest.java
index 1c45043..147caed 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/CertificateSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/CertificateSyntaxTest.java
@@ -19,9 +19,9 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.ServerContextBuilder;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
-import org.opends.server.admin.std.server.CertificateAttributeSyntaxCfg;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.CertificateAttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.ServerContext;
import org.forgerock.opendj.ldap.DN;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
index 72d11e2..48fcf0a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
@@ -12,14 +12,14 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.schema;
import static org.opends.server.schema.SchemaConstants.*;
import org.opends.server.TestCaseUtils;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.types.Entry;
import org.opends.server.util.RemoveOnceSDKSchemaIsUsed;
import org.testng.annotations.DataProvider;
@@ -35,7 +35,7 @@
public Object[][] createSyntaxTest() throws Exception
{
// some config object used later in the test
- ConfigEntry strictConfig = new ConfigEntry(TestCaseUtils.makeEntry(
+ Entry strictConfig = new Entry(TestCaseUtils.makeEntry(
"dn: cn=Telephone Number,cn=Syntaxes,cn=config",
"objectClass: top",
"objectClass: ds-cfg-telephone-number-attribute-syntax",
@@ -46,7 +46,7 @@
"cn: Telephone Number"
), null);
- ConfigEntry relaxedConfig = new ConfigEntry(TestCaseUtils.makeEntry(
+ Entry relaxedConfig = new Entry(TestCaseUtils.makeEntry(
"dn: cn=Telephone Number,cn=Syntaxes,cn=config",
"objectClass: top",
"objectClass: ds-cfg-telephone-number-attribute-syntax",
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/CountryStringSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/CountryStringSyntaxTest.java
index c1f21a0..362a701 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/CountryStringSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/CountryStringSyntaxTest.java
@@ -17,14 +17,14 @@
*/
package org.opends.server.schema;
+import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.ServerContextBuilder;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
-import org.opends.server.admin.std.server.CountryStringAttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
+import org.forgerock.opendj.server.config.server.CountryStringAttributeSyntaxCfg;
import org.opends.server.core.ServerContext;
-import org.forgerock.opendj.ldap.DN;
import org.opends.server.util.RemoveOnceSDKSchemaIsUsed;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java
index cd74099..1353d2b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java
@@ -16,10 +16,10 @@
*/
package org.opends.server.schema;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.SaltedMD5PasswordStorageSchemeCfgDefn;
-import org.opends.server.admin.std.server.SaltedMD5PasswordStorageSchemeCfg;
-import org.opends.server.config.ConfigEntry;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.SaltedMD5PasswordStorageSchemeCfgDefn;
+import org.forgerock.opendj.server.config.server.SaltedMD5PasswordStorageSchemeCfg;
+import org.opends.server.types.Entry;
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.SaltedMD5PasswordStorageScheme;
import org.forgerock.opendj.ldap.Assertion;
@@ -57,13 +57,13 @@
ByteString bytePassword = ByteString.valueOfUtf8(password);
SaltedMD5PasswordStorageScheme scheme = new SaltedMD5PasswordStorageScheme();
- ConfigEntry configEntry = DirectoryServer.getConfigEntry(
+ Entry configEntry = DirectoryServer.getConfigEntry(
DN.valueOf("cn=Salted MD5,cn=Password Storage Schemes,cn=config"));
SaltedMD5PasswordStorageSchemeCfg configuration =
AdminTestCaseUtils.getConfiguration(
SaltedMD5PasswordStorageSchemeCfgDefn.getInstance(),
- configEntry.getEntry());
+ configEntry);
scheme.initializePasswordStorageScheme(configuration);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java b/opendj-server-legacy/src/test/java/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java
index aa539bf..76b8ac1 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java
@@ -28,10 +28,10 @@
import java.util.ArrayList;
import java.util.Map.Entry;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.admin.AbstractManagedObjectDefinition;
-import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.SNMPConnectionHandlerCfgDefn;
-import org.opends.server.admin.std.server.SNMPConnectionHandlerCfg;
+import org.forgerock.opendj.config.AbstractManagedObjectDefinition;
+import org.forgerock.opendj.config.server.AdminTestCaseUtils;
+import org.forgerock.opendj.server.config.meta.SNMPConnectionHandlerCfgDefn;
+import org.forgerock.opendj.server.config.server.SNMPConnectionHandlerCfg;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.forgerock.opendj.config.server.ConfigChangeResult;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/ImportLDIFTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/ImportLDIFTestCase.java
index 54b7a7c..d814520 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/ImportLDIFTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/ImportLDIFTestCase.java
@@ -24,8 +24,8 @@
import java.io.PrintStream;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.server.RootCfg;
+import org.forgerock.opendj.config.server.ServerManagementContext;
+import org.forgerock.opendj.server.config.server.RootCfg;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tasks.TaskUtils;
import org.opends.server.types.Attribute;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/PrivilegeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/types/PrivilegeTestCase.java
index e5c7d83..c248f61 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/PrivilegeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/PrivilegeTestCase.java
@@ -37,8 +37,8 @@
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.requests.ModifyRequest;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.GlobalCfgDefn.DisabledPrivilege;
-import org.opends.server.admin.std.meta.RootDNCfgDefn;
+import org.forgerock.opendj.server.config.meta.GlobalCfgDefn.DisabledPrivilege;
+import org.forgerock.opendj.server.config.meta.RootDNCfgDefn;
import org.opends.server.api.ClientConnection;
import org.opends.server.backends.task.Task;
import org.opends.server.backends.task.TaskBackend;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeRuleTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeRuleTestCase.java
index 5c40945..1a11fd7 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeRuleTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeRuleTestCase.java
@@ -25,7 +25,7 @@
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn.ConflictBehavior;
+import org.forgerock.opendj.server.config.meta.VirtualAttributeCfgDefn.ConflictBehavior;
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.EntryDNVirtualAttributeProvider;
import org.opends.server.protocols.internal.InternalClientConnection;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java
index 2e6b43b..5632aee 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java
@@ -27,7 +27,7 @@
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn.ConflictBehavior;
+import org.forgerock.opendj.server.config.meta.VirtualAttributeCfgDefn.ConflictBehavior;
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.EntryDNVirtualAttributeProvider;
import org.testng.annotations.BeforeClass;
--
Gitblit v1.10.0