From a06fd90c9b6bfb5f9130146373ba18e5769593b6 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 29 Jan 2014 11:30:37 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java | 27
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java | 2
opendj3-server-dev/replace.rb | 111 +
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java | 20
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java | 11
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java | 40
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java | 50
opendj3-server-dev/src/server/org/opends/server/replication/server/ServerWriter.java | 13
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java | 13
opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java | 3
opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java | 7
opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java | 3
opendj3-server-dev/src/server/org/opends/server/tools/BackendToolUtils.java | 54
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java | 22
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupSearchThread.java | 9
opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java | 7
opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java | 7
opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPMonitor.java | 338 ++-
opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkerThread.java | 12
opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactAssertionSyntax.java | 11
opendj3-server-dev/src/server/org/opends/server/util/ExpirationCheckTrustManager.java | 26
opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Suffix.java | 9
opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroup.java | 5
opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java | 146
opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java | 7
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationDomainMonitor.java | 20
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/jeb/ExportJob.java | 11
opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java | 4
opendj3-server-dev/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java | 5
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java | 10
opendj3-server-dev/ivy.xml | 8
opendj3-server-dev/src/server/org/opends/server/core/SchemaConfigManager.java | 69
opendj3-server-dev/src/server/org/opends/server/replication/service/HeartbeatMonitor.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java | 13
opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java | 7
opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java | 12
opendj3-server-dev/src/server/org/opends/server/admin/ClassLoaderProvider.java | 7
opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java | 112
opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java | 16
opendj3-server-dev/src/server/org/opends/server/tasks/SetGenerationIdTask.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java | 8
opendj3-server-dev/src/server/org/opends/server/core/LoggerConfigManager.java | 10
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java | 9
opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java | 14
opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTask.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ComputeBestServerTest.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java | 29
opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java | 9
opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplayThread.java | 6
opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java | 32
opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java | 7
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java | 5
opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java | 37
opendj3-server-dev/src/server/org/opends/server/replication/server/ServerReader.java | 17
opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/IndexInputBuffer.java | 10
opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java | 5
opendj3-server-dev/src/server/org/opends/server/backends/task/TaskScheduler.java | 86
opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java | 22
opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java | 14
opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java | 3
opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java | 7
opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java | 21
opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java | 14
opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java | 14
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java | 20
opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java | 5
opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java | 17
opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java | 22
opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkQueue.java | 16
opendj3-server-dev/src/server/org/opends/server/tasks/RestoreTask.java | 50
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java | 12
opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java | 10
opendj3-server-dev/src/server/org/opends/server/api/ConnectionHandler.java | 10
opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java | 52
opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java | 3
opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerWriter.java | 8
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java | 10
opendj3-server-dev/src/server/org/opends/server/tasks/RebuildTask.java | 44
opendj3-server-dev/src/server/org/opends/server/tasks/ExportTask.java | 70
opendj3-server-dev/src/server/org/opends/server/config/IntegerConfigAttribute.java | 7
opendj3-server-dev/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java | 7
opendj3-server-dev/src/server/org/opends/server/extensions/EntryCacheCommon.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java | 11
opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java | 11
opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java | 7
opendj3-server-dev/src/server/org/opends/server/tasks/DisconnectClientTask.java | 9
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java | 8
opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java | 7
opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java | 5
opendj3-server-dev/src/server/org/opends/server/core/MonitorConfigManager.java | 8
opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java | 4
opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java | 5
opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java | 10
opendj3-server-dev/src/server/org/opends/server/admin/AdministrationConnector.java | 13
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java | 15
opendj3-server-dev/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java | 4
opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java | 43
opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java | 7
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java | 14
opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java | 13
opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java | 14
opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java | 9
opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java | 81
opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java | 11
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java | 9
opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java | 7
opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java | 7
opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 139
opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java | 13
opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java | 11
opendj3-server-dev/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java | 4
opendj3-server-dev/src/server/org/opends/server/types/Entry.java | 35
opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java | 9
opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkerThread.java | 12
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java | 33
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java | 13
opendj3-server-dev/src/server/org/opends/server/core/ExtensionConfigManager.java | 7
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java | 2
opendj3-server-dev/src/server/org/opends/server/core/IdleTimeLimitThread.java | 9
opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java | 21
opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java | 17
opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java | 12
opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java | 5
opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java | 3
opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java | 72
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java | 11
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java | 2
opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTargetTask.java | 4
opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java | 21
opendj3-server-dev/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java | 10
opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java | 11
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java | 2
opendj3-server-dev/src/server/org/opends/server/api/ErrorLogPublisher.java | 4
opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java | 3
opendj3-server-dev/src/server/org/opends/server/core/SubentryManager.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java | 9
opendj3-server-dev/src/server/org/opends/server/types/HostPort.java | 5
opendj3-server-dev/src/server/org/opends/server/loggers/debug/TextDebugLogPublisher.java | 3
opendj3-server-dev/src/server/org/opends/server/api/WorkQueue.java | 9
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/DNS.java | 15
opendj3-server-dev/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java | 7
opendj3-server-dev/src/server/org/opends/server/extensions/DiskSpaceMonitor.java | 4
opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java | 5
opendj3-server-dev/src/server/org/opends/server/config/StringConfigAttribute.java | 3
opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java | 16
opendj3-server-dev/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java | 7
opendj3-server-dev/src/server/org/opends/server/api/DirectoryThread.java | 5
opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java | 11
opendj3-server-dev/src/server/org/opends/server/admin/AggregationPropertyDefinition.java | 4
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java | 17
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java | 76
opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java | 3
opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java | 43
opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java | 7
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/jeb/ConfigurableEnvironment.java | 9
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java | 5
opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java | 90
opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java | 128
opendj3-server-dev/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java | 8
opendj3-server-dev/src/server/org/opends/server/tasks/PurgeConflictsHistoricalTask.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java | 9
opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java | 14
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java | 10
opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java | 27
opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java | 14
opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java | 10
opendj3-server-dev/src/server/org/opends/server/core/CertificateMapperConfigManager.java | 7
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java | 5
opendj3-server-dev/src/server/org/opends/server/config/DNConfigAttribute.java | 5
opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/core/SASLConfigManager.java | 7
opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java | 9
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java | 6
opendj3-server-dev/src/server/org/opends/server/backends/task/TaskThread.java | 12
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java | 5
opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java | 7
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java | 9
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java | 21
opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java | 11
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDB.java | 16
opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java | 15
opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java | 13
opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java | 8
opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java | 14
opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java | 7
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java | 23
opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java | 14
opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java | 33
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java | 12
opendj3-server-dev/src/server/org/opends/server/monitors/EntryCacheMonitorProvider.java | 20
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java | 2
opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java | 55
opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java | 45
opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java | 13
opendj3-server-dev/src/server/org/opends/server/tasks/BackupTask.java | 80
opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java | 8
opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java | 14
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java | 10
opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java | 13
opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java | 14
opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java | 7
opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java | 142 -
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java | 10
opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java | 27
opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java | 14
opendj3-server-dev/src/server/org/opends/server/types/Schema.java | 5
opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java | 12
opendj3-server-dev/src/server/org/opends/server/core/PasswordValidatorConfigManager.java | 8
opendj3-server-dev/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java | 7
opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java | 13
opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java | 9
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java | 3
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java | 14
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java | 13
opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java | 113
opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java | 6
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AuthMethod.java | 8
opendj3-server-dev/src/server/org/opends/server/backends/task/Task.java | 7
opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java | 11
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java | 10
opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java | 11
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TopologyViewTest.java | 2
opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java | 5
opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java | 11
opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java | 9
opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java | 13
opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java | 5
opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java | 81
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java | 6
opendj3-server-dev/src/server/org/opends/server/tasks/AddSchemaFileTask.java | 20
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java | 2
opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java | 48
opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java | 7
opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java | 13
opendj3-server-dev/src/server/org/opends/server/util/RuntimeInformation.java | 23
opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java | 11
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java | 14
opendj3-server-dev/src/server/org/opends/server/loggers/ErrorLogger.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java | 5
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java | 7
opendj3-server-dev/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java | 5
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java | 10
opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java | 12
opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java | 11
opendj3-server-dev/src/server/org/opends/server/core/AlertHandlerConfigManager.java | 7
opendj3-server-dev/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilter.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java | 11
/dev/null | 67
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java | 5
opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java | 5
opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java | 13
opendj3-server-dev/src/server/org/opends/server/replication/server/MsgQueue.java | 9
opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java | 8
263 files changed, 2,104 insertions(+), 2,763 deletions(-)
diff --git a/opendj3-server-dev/ivy.xml b/opendj3-server-dev/ivy.xml
index 0d7f620..e21db72 100644
--- a/opendj3-server-dev/ivy.xml
+++ b/opendj3-server-dev/ivy.xml
@@ -50,11 +50,17 @@
<!-- subsequent versions are not compatible with java 6, so force to use this version only -->
<dependency org="javax.servlet" name="javax.servlet-api" rev="[3.1-b02]" />
<dependency org="com.sleepycat" name="je" rev="5.0.97" />
- <dependency org="org.forgerock.opendj" name="opendj-rest2ldap-servlet" rev="&opendj.sdk.version;" conf="default->master,compile"/>
+ <dependency org="org.forgerock.opendj" name="opendj-rest2ldap-servlet" rev="&opendj.sdk.version;" conf="default->master,compile">
+ <exclude module="slf4j-jdk14"/>
+ </dependency>
+ <dependency org="org.forgerock.opendj" name="opendj-slf4j-adapter" rev="&opendj.sdk.version;">
+ <exclude module="opendj3-server-dev"/>
+ </dependency>
<dependency org="org.forgerock.commons" name="i18n-slf4j" rev="&i18n.version;" />
<dependency org="org.forgerock.opendj" name="opendj-server2x-adapter" rev="&opendj.sdk.version;">
<!-- This is the OpenDJ server module :) -->
<exclude module="opendj-server"/>
+ <exclude module="slf4j-jdk14"/>
</dependency>
<dependency org="org.glassfish.grizzly" name="grizzly-http-servlet" rev="&grizzly.version;">
<exclude module="javax.servlet-api" />
diff --git a/opendj3-server-dev/replace.rb b/opendj3-server-dev/replace.rb
index 2170e3a..a2116cf 100755
--- a/opendj3-server-dev/replace.rb
+++ b/opendj3-server-dev/replace.rb
@@ -259,12 +259,113 @@
if name.nil? then '' else name end
end
+ # Process provided directories
+ # Expects a processing block accepting a file as argument and returning a count of changes dones
+ def process_dirs(dirs, stopwords, extensions)
+ count_files = 0
+ count_total = 0
+ dirs.each { |directory|
+ files = files_under_directory(directory, extensions)
+ files.each { |file|
+ #puts file.to_s
+ exclude_file = stopwords.any? { |stopword| file.include?(stopword) }
+ next if exclude_file
+ count = yield file # call the block
+ if count > 0
+ count_files += 1
+ count_total += count
+ end
+ }
+ }
+ puts "Replaced in #{count_files} files, for a total of #{count_total} replacements"
+ end
+
+ # Process provided file
+ # Expects a processing block accepting a source string as argument and returning a count of changes + a new
+ # content
+ def process_file(file)
+ count = 0
+ File.open(file) { |source|
+ contents = source.read
+ count, new_contents = yield contents
+ File.open(file + ".copy", "w+") { |f| f.write(new_contents) }
+ }
+ FileUtils.mv(file + ".copy", file, :verbose => false)
+ count
+ end
+
+
# Return all files with provided extensions under the provided directory
# and all its subdirectories recursively
def files_under_directory(directory, extensions)
Dir[directory + '/**/*.{' + extensions.join(",") + '}']
end
+ def run_messages
+ prepare_messages
+ process_dirs(JAVA_DIRS, ["--nostopword--"], ['java']) { |file|
+ process_file(file) { |content|
+ count, new_content = process_message(content)
+ next count, new_content
+ }
+ }
+ end
+
+ def process_message(content)
+ has_logger = /LocalizedLogger\.getLoggerForThisClass/ =~ content
+ needs_logger = /logError/ =~ content
+ count = 0
+ if needs_logger && has_logger.nil?
+ count = 1
+
+ content.sub!(/class ([^{]+){/,
+ "class \\1{\n\n " +
+ "private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();\n")
+
+ content.sub!(/import (.*);/,
+ "import \\1;\nimport org.forgerock.i18n.slf4j.LocalizedLogger;")
+ end
+
+ if needs_logger
+ count = 1
+ pattern = /(final )?(LocalizableMessage )?message\s*=\s*(\w+)\s*.\s*get\(\s*([^;]*)\);\s+(ErrorLogger\.)?logError\(\w+\);/m
+ mdata = pattern.match(content)
+ while !mdata.nil? do
+ msg = mdata[3]
+ args = if mdata[4].nil? || mdata[4]=="" then "" else ", " + mdata[4] end
+ level = MESSAGES_MAP[msg]
+ puts "1... #{level} - #{msg}"
+ content.sub!(pattern, "logger.#{level}(#{msg}#{args});")
+ mdata = pattern.match(content)
+ end
+
+ pattern = /logError\((\w+).get\s*\(\s*/m
+ mdata = pattern.match(content)
+ stop = {}
+ while !mdata.nil? do
+ msg = mdata[1]
+ break if !stop[msg].nil?
+ stop[msg] = msg
+ level = MESSAGES_MAP[msg]
+ puts "2... #{level} - #{msg}"
+ if !level.nil?
+ content.sub!(pattern, "logger.#{level}(#{msg}.get(")
+ end
+ mdata = pattern.match(content)
+ end
+
+ # all remaining patterns
+ content.gsub!(/(ErrorLogger\.)?logError\(/, 'logger.error(')
+
+ end
+ return count, content
+ end
+
+ def prepare_messages
+ files = Dir['src/messages/messages/*.properties']
+ files.each do |file| messages(file) end
+ end
+
# Build a map of error messages and error level
def messages(message_file)
File.open(message_file).each { |line|
@@ -274,14 +375,16 @@
first, *rest = token[0].split "_"
level_label = if %w(INFO DEBUG NOTICE).include?(first) then first else first.to_s + "_" + rest[0].to_s end
level = LOG_LEVELS[level_label]
- label = first + rest.join("_")
- label = label.gsub("MILD", "").gsub("SEVERE", "").gsub("FATAL", "")
- puts "level #{level}, label #{label}"
+ label = first + "_" + rest.join("_")
+ label = label.gsub("MILD_", '').gsub("SEVERE_", '').gsub("FATAL_", '').gsub("NOTICE_", 'NOTE_').gsub(/_\d+$/, '')
+ MESSAGES_MAP[label] = level
+ #puts "#{label}=#{level} #{token}"
}
end
end
# Launch all replacements defined in the REPLACEMENTS constant
-Replace.new.messages("src/messages/messages/admin.properties")
+#Replace.new.messages("src/messages/messages/admin.properties")
+Replace.new.run_messages
#Replace.new.run
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationConnector.java b/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationConnector.java
index 4749f51..176255c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationConnector.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationConnector.java
@@ -26,7 +26,6 @@
*/
package org.opends.server.admin;
-import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.messages.AdminMessages.*;
import java.io.File;
import java.io.FileWriter;
@@ -62,7 +61,6 @@
import org.opends.server.util.SetupUtils;
import org.opends.server.admin.std.server.TrustManagerProviderCfg;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.FilePermission;
@@ -674,7 +672,7 @@
}
LocalizableMessage message = ERR_ADMIN_CERTIFICATE_GENERATION_MISSING_FILES
.get(err);
- logError(message);
+ logger.error(message);
throw new InitializationException(message);
}
@@ -724,16 +722,13 @@
new FilePermission(0600)))
{
// Log a warning that the permissions were not set.
- LocalizableMessage message = WARN_ADMIN_SET_PERMISSIONS_FAILED
- .get(pinFilePath);
- ErrorLogger.logError(message);
+ logger.warn(WARN_ADMIN_SET_PERMISSIONS_FAILED, pinFilePath);
}
}
catch (DirectoryException e)
{
// Log a warning that the permissions were not set.
- LocalizableMessage message = WARN_ADMIN_SET_PERMISSIONS_FAILED.get(pinFilePath);
- ErrorLogger.logError(message);
+ logger.warn(WARN_ADMIN_SET_PERMISSIONS_FAILED, pinFilePath);
}
}
@@ -749,7 +744,7 @@
{
logger.traceException(e);
LocalizableMessage message = ERR_ADMIN_CERTIFICATE_GENERATION.get(e.getMessage());
- logError(message);
+ logger.error(message);
throw new InitializationException(message);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/AggregationPropertyDefinition.java b/opendj3-server-dev/src/server/org/opends/server/admin/AggregationPropertyDefinition.java
index 1f22221..5e9d1c3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/AggregationPropertyDefinition.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/AggregationPropertyDefinition.java
@@ -59,7 +59,6 @@
import org.opends.server.admin.server.ServerManagementContext;
import org.opends.server.admin.std.meta.RootCfgDefn;
import org.opends.server.config.ConfigException;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
@@ -311,10 +310,9 @@
// The condition could not be evaluated.
logger.traceException(e);
- LocalizableMessage message = ERR_REFINT_UNABLE_TO_EVALUATE_TARGET_CONDITION.get(mo
+ logger.error(ERR_REFINT_UNABLE_TO_EVALUATE_TARGET_CONDITION, mo
.getManagedObjectDefinition().getUserFriendlyName(), String
.valueOf(mo.getDN()), StaticUtils.getExceptionMessage(e));
- ErrorLogger.logError(message);
unacceptableReasons.add(message);
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/ClassLoaderProvider.java b/opendj3-server-dev/src/server/org/opends/server/admin/ClassLoaderProvider.java
index b2148a1..0d48c80 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/ClassLoaderProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/ClassLoaderProvider.java
@@ -30,7 +30,6 @@
import static org.opends.messages.AdminMessages.*;
import static org.opends.messages.ExtensionMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.util.ServerConstants.EOL;
@@ -557,9 +556,7 @@
if (!extensionsPath.exists()) {
// The extensions directory does not exist. This is not a
// critical problem.
- LocalizableMessage message = ERR_ADMIN_NO_EXTENSIONS_DIR.get(
- String.valueOf(extensionsPath));
- logError(message);
+ logger.error(ERR_ADMIN_NO_EXTENSIONS_DIR, String.valueOf(extensionsPath));
return;
}
@@ -676,7 +673,7 @@
try {
// Log build information of extensions in the error log
String[] information = getBuildInformation(jarFile);
- logError(
+ logger.error(
NOTE_LOG_EXTENSION_INFORMATION.
get(jarFile.getName(),
information[1],
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java b/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java
index 1fb1921..95669d1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java
@@ -56,7 +56,6 @@
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
@@ -464,7 +463,7 @@
} else {
LocalizableMessage message = AdminMessages.ERR_ADMIN_MANAGED_OBJECT_DOES_NOT_EXIST
.get(String.valueOf(dn));
- ErrorLogger.logError(message);
+ logger.error(message);
}
} catch (ConfigException e) {
// The dependent entry could not be retrieved.
@@ -472,7 +471,7 @@
LocalizableMessage message = AdminMessages.ERR_ADMIN_CANNOT_GET_MANAGED_OBJECT.get(
String.valueOf(dn), StaticUtils.getExceptionMessage(e));
- ErrorLogger.logError(message);
+ logger.error(message);
}
return null;
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/ConnectionHandler.java b/opendj3-server-dev/src/server/org/opends/server/api/ConnectionHandler.java
index ba8d149..e9539ab 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/ConnectionHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/ConnectionHandler.java
@@ -27,8 +27,7 @@
package org.opends.server.api;
import static org.opends.messages.ProtocolMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
-
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -58,6 +57,9 @@
<T extends ConnectionHandlerCfg>
extends DirectoryThread
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/** The monitor associated with this connection handler. */
private ConnectionHandlerMonitor monitor;
@@ -313,10 +315,8 @@
int cpus = Runtime.getRuntime().availableProcessors();
int value = Math.max(2, cpus / 2);
- LocalizableMessage message =
- INFO_ERGONOMIC_SIZING_OF_REQUEST_HANDLER_THREADS.get(friendlyName,
+ logger.debug(INFO_ERGONOMIC_SIZING_OF_REQUEST_HANDLER_THREADS, friendlyName,
value);
- logError(message);
return value;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/DirectoryThread.java b/opendj3-server-dev/src/server/org/opends/server/api/DirectoryThread.java
index 0a23cf5..9da92f8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/DirectoryThread.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/DirectoryThread.java
@@ -246,9 +246,8 @@
}
logger.traceException(e);
- LocalizableMessage message = ERR_UNCAUGHT_THREAD_EXCEPTION.get(
- t.getName(), stackTraceToSingleLineString(e));
- logError(message);
+ LocalizableMessage message = ERR_UNCAUGHT_THREAD_EXCEPTION.get(t.getName(), stackTraceToSingleLineString(e));
+ logger.error(message);
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_UNCAUGHT_EXCEPTION, message);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/ErrorLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/api/ErrorLogPublisher.java
index 63db1bc..71c862d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/ErrorLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/ErrorLogPublisher.java
@@ -27,6 +27,7 @@
package org.opends.server.api;
import java.util.HashMap;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -51,6 +52,9 @@
public abstract class ErrorLogPublisher<T extends ErrorLogPublisherCfg>
implements LogPublisher<T>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* The hash map that will be used to define specific log severities
* for the various categories.
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/WorkQueue.java b/opendj3-server-dev/src/server/org/opends/server/api/WorkQueue.java
index 9beb46f..7533a8a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/WorkQueue.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/WorkQueue.java
@@ -27,8 +27,7 @@
package org.opends.server.api;
import static org.opends.messages.CoreMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
-
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.WorkQueueCfg;
import org.opends.server.config.ConfigException;
@@ -57,6 +56,9 @@
mayInvoke=true)
public abstract class WorkQueue<T extends WorkQueueCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* Initializes this work queue based on the information in the
* provided configuration entry.
@@ -167,8 +169,7 @@
int cpus = Runtime.getRuntime().availableProcessors();
int value = Math.max(24, cpus * 2);
- LocalizableMessage message = INFO_ERGONOMIC_SIZING_OF_WORKER_THREAD_POOL.get(value);
- logError(message);
+ logger.debug(INFO_ERGONOMIC_SIZING_OF_WORKER_THREAD_POOL, value);
return value;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
index a952451..30b3f11 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
@@ -31,7 +31,6 @@
import static org.opends.server.authorization.dseecompat.Aci.*;
import static org.opends.server.authorization.dseecompat.EnumEvalReason.*;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -633,8 +632,7 @@
catch (DirectoryException ex)
{
// Log a message and keep going.
- LocalizableMessage message = WARN_ACI_NOT_VALID_DN.get(DNString);
- logError(message);
+ logger.warn(WARN_ACI_NOT_VALID_DN, DNString);
}
}
@@ -821,10 +819,8 @@
&& !operation.getClientConnection().hasPrivilege(
Privilege.MODIFY_ACL, operation))
{
- LocalizableMessage message =
- INFO_ACI_MODIFY_FAILED_PRIVILEGE.get(String.valueOf(container
+ logger.debug(INFO_ACI_MODIFY_FAILED_PRIVILEGE, String.valueOf(container
.getResourceDN()), String.valueOf(container.getClientDN()));
- logError(message);
return false;
}
// This access check handles the case where all attributes of this
@@ -1001,10 +997,8 @@
final Lock entryLock = LockManager.lockRead(superiorDN);
if (entryLock == null)
{
- LocalizableMessage message =
- WARN_ACI_HANDLER_CANNOT_LOCK_NEW_SUPERIOR_USER.get(String
+ logger.warn(WARN_ACI_HANDLER_CANNOT_LOCK_NEW_SUPERIOR_USER, String
.valueOf(superiorDN));
- logError(message);
return false;
}
@@ -1219,10 +1213,8 @@
{
aciListenerMgr.logMsgsSetLockDownMode(failedACIMsgs);
}
- LocalizableMessage message =
- INFO_ACI_ADD_LIST_ACIS.get(Integer.toString(validAcis),
+ logger.debug(INFO_ACI_ADD_LIST_ACIS, Integer.toString(validAcis),
String.valueOf(baseDN));
- logError(message);
}
}
catch (Exception e)
@@ -1259,8 +1251,7 @@
if (globalAcis != null)
{
aciList.addAci(DN.rootDN(), globalAcis);
- logError(INFO_ACI_ADD_LIST_GLOBAL_ACIS.get(
- Integer.toString(globalAcis.size())));
+ logger.debug(INFO_ACI_ADD_LIST_GLOBAL_ACIS.get(Integer.toString(globalAcis.size())));
}
}
catch (Exception e)
@@ -1461,9 +1452,7 @@
if (!operation.getClientConnection().hasPrivilege(
Privilege.MODIFY_ACL, operation))
{
- LocalizableMessage message = INFO_ACI_ADD_FAILED_PRIVILEGE.get(
- String.valueOf(entry.getName()), String.valueOf(clientDN));
- logError(message);
+ logger.debug(INFO_ACI_ADD_FAILED_PRIVILEGE, String.valueOf(entry.getName()), String.valueOf(clientDN));
return false;
}
List<Attribute> attributeList =
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java
index 114333c..860f72d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java
@@ -27,9 +27,8 @@
package org.opends.server.authorization.dseecompat;
import static org.opends.messages.AccessControlMessages.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.authorization.dseecompat.AciHandler.*;
-import static org.opends.server.loggers.ErrorLogger.*;
-
import java.util.*;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -45,6 +44,9 @@
*/
public class AciList {
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
+
/**
* A map containing all the ACIs.
* We use the copy-on-write technique to avoid locking when reading.
@@ -449,9 +451,7 @@
//This should never happen since only a copy of the
//ACI with a new DN is being made. Log a message if it does and
//keep going.
- LocalizableMessage message = WARN_ACI_ADD_LIST_FAILED_DECODE.get(
- aci.toString(), String.valueOf(relocateDN), ex.getMessage());
- logError(message);
+ logger.warn(WARN_ACI_ADD_LIST_FAILED_DECODE, aci.toString(), String.valueOf(relocateDN), ex.getMessage());
}
}
tempAciList.put(relocateDN, acis);
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
index c0a2d655a..293794d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
@@ -43,7 +43,6 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPControl;
-import static org.opends.server.loggers.ErrorLogger.logError;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import static org.opends.messages.AccessControlMessages.*;
@@ -423,7 +422,7 @@
if (backend.getEntryCount() > 0
&& !backend.isIndexed(aciType, IndexType.PRESENCE))
{
- logError(WARN_ACI_ATTRIBUTE_NOT_INDEXED.get(backend
+ logger.warn(WARN_ACI_ATTRIBUTE_NOT_INDEXED.get(backend
.getBackendID(), "aci"));
}
@@ -477,10 +476,8 @@
failedACIMsgs);
if (!failedACIMsgs.isEmpty())
logMsgsSetLockDownMode(failedACIMsgs);
- LocalizableMessage message =
- INFO_ACI_ADD_LIST_ACIS.get(Integer.toString(validAcis),
+ logger.debug(INFO_ACI_ADD_LIST_ACIS, Integer.toString(validAcis),
String.valueOf(baseDN));
- logError(message);
}
}
}
@@ -561,8 +558,7 @@
for (LocalizableMessage msg : failedACIMsgs)
{
- LocalizableMessage message = WARN_ACI_SERVER_DECODE_FAILED.get(msg);
- logError(message);
+ logger.warn(WARN_ACI_SERVER_DECODE_FAILED, msg);
}
if (!inLockDownMode)
setLockDownMode();
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AuthMethod.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AuthMethod.java
index c46353a..a042c7e6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AuthMethod.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AuthMethod.java
@@ -26,8 +26,7 @@
*/
package org.opends.server.authorization.dseecompat;
import static org.opends.messages.AccessControlMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
-
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.core.DirectoryServer;
@@ -36,6 +35,9 @@
*/
public class AuthMethod implements KeywordBindRule {
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
+
/**
* Enumeration representing the authentication method.
*/
@@ -92,7 +94,7 @@
{
String saslMech = expr.substring(5);
if (DirectoryServer.getSASLMechanismHandler(saslMech) == null) {
- logError(NOTE_ACI_SYNTAX_DUBIOUS_AUTHMETHOD_SASL_MECHANISM.
+ logger.error(NOTE_ACI_SYNTAX_DUBIOUS_AUTHMETHOD_SASL_MECHANISM.
get(saslMech));
}
return new AuthMethod(EnumAuthMethod.AUTHMETHOD_SASL, saslMech, type);
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/DNS.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/DNS.java
index cf4596e..28af2bd 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/DNS.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/DNS.java
@@ -28,7 +28,6 @@
import static org.opends.messages.AccessControlMessages.*;
import static org.opends.server.authorization.dseecompat.Aci.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
import java.net.InetAddress;
@@ -126,18 +125,12 @@
{
dns.add(canonicalName);
- LocalizableMessage message =
- WARN_ACI_LOCALHOST_DOESNT_MATCH_CANONICAL_VALUE.
- get(expr, hn, canonicalName);
- logError(message);
+ logger.warn(WARN_ACI_LOCALHOST_DOESNT_MATCH_CANONICAL_VALUE, expr, hn, canonicalName);
}
else
{
- LocalizableMessage message =
- WARN_ACI_HOSTNAME_DOESNT_MATCH_CANONICAL_VALUE.
- get(expr, hn, addr.getHostAddress(),
+ logger.warn(WARN_ACI_HOSTNAME_DOESNT_MATCH_CANONICAL_VALUE, expr, hn, addr.getHostAddress(),
addr.getCanonicalHostName());
- logError(message);
}
}
}
@@ -146,9 +139,7 @@
{
logger.traceException(e);
- LocalizableMessage message = WARN_ACI_ERROR_CHECKING_CANONICAL_HOSTNAME.
- get(hn, expr, getExceptionMessage(e));
- logError(message);
+ logger.warn(WARN_ACI_ERROR_CHECKING_CANONICAL_HOSTNAME, hn, expr, getExceptionMessage(e));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java
index c6acca4..652fb33 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java
@@ -45,7 +45,6 @@
import org.forgerock.util.Reject;
import static org.opends.messages.BackendMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -1149,7 +1148,7 @@
{
LocalizableMessage m = ERR_LDIF_BACKEND_DUPLICATE_ENTRY.get(ldifFilePath,
currentConfig.dn().toString(), entryDN.toString());
- logError(m);
+ logger.error(m);
reader.rejectLastEntry(m);
continue;
}
@@ -1178,7 +1177,7 @@
{
LocalizableMessage m = ERR_LDIF_BACKEND_ENTRY_OUT_OF_SCOPE.get(ldifFilePath,
currentConfig.dn().toString(), entryDN.toString());
- logError(m);
+ logger.error(m);
reader.rejectLastEntry(m);
continue;
}
@@ -1188,7 +1187,7 @@
{
LocalizableMessage m = ERR_LDIF_BACKEND_MISSING_PARENT.get(ldifFilePath,
currentConfig.dn().toString(), entryDN.toString());
- logError(m);
+ logger.error(m);
reader.rejectLastEntry(m);
continue;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java
index 1b725b5..ee3cf59 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java
@@ -68,7 +68,6 @@
import static org.opends.messages.ConfigMessages.
ERR_CONFIG_BACKEND_ERROR_INTERACTING_WITH_BACKEND_ENTRY;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -233,9 +232,7 @@
Backend backend = DirectoryServer.getBackend(baseDN);
if (backend == null)
{
- LocalizableMessage message = WARN_ROOTDSE_NO_BACKEND_FOR_SUBORDINATE_BASE.get(
- String.valueOf(baseDN));
- logError(message);
+ logger.warn(WARN_ROOTDSE_NO_BACKEND_FOR_SUBORDINATE_BASE, String.valueOf(baseDN));
}
else
{
@@ -479,9 +476,7 @@
// This method should never be used to get anything other than the root DSE.
// If we got here, then that appears to be the case, so log a message.
- LocalizableMessage message =
- WARN_ROOTDSE_GET_ENTRY_NONROOT.get(String.valueOf(entryDN));
- logError(message);
+ logger.warn(WARN_ROOTDSE_GET_ENTRY_NONROOT, String.valueOf(entryDN));
// Go ahead and check the subordinate backends to see if we can find the
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
index e07803f..b5a06ba 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
@@ -71,7 +71,6 @@
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.SchemaConfigManager;
import org.opends.server.core.SearchOperation;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.schema.AttributeTypeSyntax;
import org.opends.server.schema.DITContentRuleSyntax;
@@ -93,7 +92,6 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -507,9 +505,7 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_SCHEMA_ERROR_DETERMINING_SCHEMA_CHANGES.get(
- getExceptionMessage(e));
- ErrorLogger.logError(message);
+ logger.error(ERR_SCHEMA_ERROR_DETERMINING_SCHEMA_CHANGES, getExceptionMessage(e));
}
@@ -1516,9 +1512,7 @@
// in the extraAttribute map. This in fact acts as a replace.
if (SchemaConfigManager.isSchemaAttribute(a))
{
- LocalizableMessage message = ERR_SCHEMA_INVALID_REPLACE_MODIFICATION.get(
- a.getNameWithOptions());
- ErrorLogger.logError(message);
+ logger.error(ERR_SCHEMA_INVALID_REPLACE_MODIFICATION, a.getNameWithOptions());
}
else
{
@@ -4432,17 +4426,11 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message =
- NOTE_SCHEMA_IMPORT_FAILED.get(
- attrType.toString(), de.getMessage());
- logError(message);
+ logger.info(NOTE_SCHEMA_IMPORT_FAILED, attrType.toString(), de.getMessage());
}
catch (Exception e)
{
- LocalizableMessage message =
- NOTE_SCHEMA_IMPORT_FAILED.get(
- attrType.toString(), e.getMessage());
- logError(message);
+ logger.info(NOTE_SCHEMA_IMPORT_FAILED, attrType.toString(), e.getMessage());
}
}
}
@@ -4551,17 +4539,11 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message =
- NOTE_SCHEMA_IMPORT_FAILED.get(
- newObjectClass.toString(), de.getMessage());
- logError(message);
+ logger.info(NOTE_SCHEMA_IMPORT_FAILED, newObjectClass.toString(), de.getMessage());
}
catch (Exception e)
{
- LocalizableMessage message =
- NOTE_SCHEMA_IMPORT_FAILED.get(
- newObjectClass.toString(), e.getMessage());
- logError(message);
+ logger.info(NOTE_SCHEMA_IMPORT_FAILED, newObjectClass.toString(), e.getMessage());
}
}
}
@@ -5295,16 +5277,11 @@
try
{
schemaBackupInstanceDir.renameTo(schemaInstanceDir);
- LocalizableMessage message =
- NOTE_SCHEMA_RESTORE_RESTORED_OLD_SCHEMA.get(
- schemaInstanceDirPath);
- logError(message);
+ logger.info(NOTE_SCHEMA_RESTORE_RESTORED_OLD_SCHEMA, schemaInstanceDirPath);
}
catch (Exception e2)
{
- LocalizableMessage message = ERR_SCHEMA_RESTORE_CANNOT_RESTORE_OLD_SCHEMA.get(
- schemaBackupInstanceDir.getPath());
- logError(message);
+ logger.error(ERR_SCHEMA_RESTORE_CANNOT_RESTORE_OLD_SCHEMA, schemaBackupInstanceDir.getPath());
}
}
@@ -5332,9 +5309,7 @@
// Tell the user where the previous schema was archived.
if (schemaBackupInstanceDir != null)
{
- LocalizableMessage message = ERR_SCHEMA_RESTORE_OLD_SCHEMA_SAVED.get(
- schemaBackupInstanceDir.getPath());
- logError(message);
+ logger.error(ERR_SCHEMA_RESTORE_OLD_SCHEMA_SAVED, schemaBackupInstanceDir.getPath());
}
LocalizableMessage message = ERR_SCHEMA_RESTORE_CANNOT_GET_ZIP_ENTRY.get(
@@ -5389,9 +5364,7 @@
// Tell the user where the previous schema was archived.
if (schemaBackupInstanceDir != null)
{
- LocalizableMessage message = ERR_SCHEMA_RESTORE_OLD_SCHEMA_SAVED.get(
- schemaBackupInstanceDir.getPath());
- logError(message);
+ logger.error(ERR_SCHEMA_RESTORE_OLD_SCHEMA_SAVED, schemaBackupInstanceDir.getPath());
}
LocalizableMessage message = ERR_SCHEMA_RESTORE_CANNOT_CREATE_FILE.get(
@@ -5450,9 +5423,7 @@
// Tell the user where the previous schema was archived.
if (schemaBackupInstanceDir != null)
{
- LocalizableMessage message = ERR_SCHEMA_RESTORE_OLD_SCHEMA_SAVED.get(
- schemaBackupInstanceDir.getPath());
- logError(message);
+ logger.error(ERR_SCHEMA_RESTORE_OLD_SCHEMA_SAVED, schemaBackupInstanceDir.getPath());
}
LocalizableMessage message = ERR_SCHEMA_RESTORE_CANNOT_PROCESS_ARCHIVE_FILE.get(
@@ -5485,17 +5456,14 @@
byte[] calculatedHash = digest.digest();
if (Arrays.equals(calculatedHash, unsignedHash))
{
- LocalizableMessage message = NOTE_SCHEMA_RESTORE_UNSIGNED_HASH_VALID.get();
- logError(message);
+ logger.info(NOTE_SCHEMA_RESTORE_UNSIGNED_HASH_VALID);
}
else
{
// Tell the user where the previous schema was archived.
if (schemaBackupInstanceDir != null)
{
- LocalizableMessage message = ERR_SCHEMA_RESTORE_OLD_SCHEMA_SAVED.get(
- schemaBackupInstanceDir.getPath());
- logError(message);
+ logger.error(ERR_SCHEMA_RESTORE_OLD_SCHEMA_SAVED, schemaBackupInstanceDir.getPath());
}
LocalizableMessage message =
@@ -5510,17 +5478,14 @@
byte[] calculatedSignature = mac.doFinal();
if (Arrays.equals(calculatedSignature, signedHash))
{
- LocalizableMessage message = NOTE_SCHEMA_RESTORE_SIGNED_HASH_VALID.get();
- logError(message);
+ logger.info(NOTE_SCHEMA_RESTORE_SIGNED_HASH_VALID);
}
else
{
// Tell the user where the previous schema was archived.
if (schemaBackupInstanceDir != null)
{
- LocalizableMessage message = ERR_SCHEMA_RESTORE_OLD_SCHEMA_SAVED.get(
- schemaBackupInstanceDir.getPath());
- logError(message);
+ logger.error(ERR_SCHEMA_RESTORE_OLD_SCHEMA_SAVED, schemaBackupInstanceDir.getPath());
}
LocalizableMessage message = ERR_SCHEMA_RESTORE_SIGNED_HASH_INVALID.get(backupID);
@@ -5533,9 +5498,7 @@
// If we are just verifying the archive, then we're done.
if (verifyOnly)
{
- LocalizableMessage message =
- NOTE_SCHEMA_RESTORE_VERIFY_SUCCESSFUL.get(backupID, backupPath);
- logError(message);
+ logger.info(NOTE_SCHEMA_RESTORE_VERIFY_SUCCESSFUL, backupID, backupPath);
return;
}
@@ -5548,8 +5511,7 @@
recursiveDelete(schemaBackupInstanceDir);
}
- LocalizableMessage message = NOTE_SCHEMA_RESTORE_SUCCESSFUL.get(backupID, backupPath);
- logError(message);
+ logger.info(NOTE_SCHEMA_RESTORE_SUCCESSFUL, backupID, backupPath);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java
index 1880c37..8ec5fc1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java
@@ -72,7 +72,6 @@
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.SearchOperation;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
@@ -1808,13 +1807,11 @@
new FilePermission(0600)))
{
// Log a warning that the permissions were not set.
- LocalizableMessage message = WARN_TRUSTSTORE_SET_PERMISSIONS_FAILED.get(path);
- ErrorLogger.logError(message);
+ logger.warn(WARN_TRUSTSTORE_SET_PERMISSIONS_FAILED, path);
}
} catch(DirectoryException e) {
// Log a warning that the permissions were not set.
- LocalizableMessage message = WARN_TRUSTSTORE_SET_PERMISSIONS_FAILED.get(path);
- ErrorLogger.logError(message);
+ logger.warn(WARN_TRUSTSTORE_SET_PERMISSIONS_FAILED, path);
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
index f1ea682..665452d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
@@ -50,7 +50,6 @@
import org.opends.server.config.ConfigException;
import static org.opends.messages.JebMessages.*;
import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.toLowerCase;
import org.opends.server.core.DirectoryServer;
@@ -273,10 +272,7 @@
toLowerCase(ruleName));
if(rule == null)
{
- LocalizableMessage message =
- ERR_CONFIG_INDEX_TYPE_NEEDS_VALID_MATCHING_RULE.get(
- String.valueOf(attrType),ruleName);
- logError(message);
+ logger.error(ERR_CONFIG_INDEX_TYPE_NEEDS_VALID_MATCHING_RULE, String.valueOf(attrType),ruleName);
continue;
}
Map<String,Index> indexMap = new HashMap<String,Index>();
@@ -2162,10 +2158,7 @@
toLowerCase(ruleName));
if(rule == null)
{
- LocalizableMessage message =
- ERR_CONFIG_INDEX_TYPE_NEEDS_VALID_MATCHING_RULE.get(
- String.valueOf(attrType),ruleName);
- logError(message);
+ logger.error(ERR_CONFIG_INDEX_TYPE_NEEDS_VALID_MATCHING_RULE, String.valueOf(attrType),ruleName);
continue;
}
validRules.add(rule);
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
index f230b3f..811e357 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
@@ -287,9 +287,7 @@
try
{
// Log an informational message about the number of entries.
- LocalizableMessage message = NOTE_JEB_BACKEND_STARTED.get(
- cfg.getBackendId(), rootContainer.getEntryCount());
- logError(message);
+ logger.info(NOTE_JEB_BACKEND_STARTED, cfg.getBackendId(), rootContainer.getEntryCount());
}
catch(DatabaseException databaseException)
{
@@ -373,8 +371,7 @@
catch (DatabaseException e)
{
logger.traceException(e);
- LocalizableMessage message = ERR_JEB_DATABASE_EXCEPTION.get(e.getMessage());
- logError(message);
+ logger.error(ERR_JEB_DATABASE_EXCEPTION, e.getMessage());
}
// Checksum this db environment and register its offline state id/checksum.
@@ -389,8 +386,7 @@
threadWriteCount.set(0);
// Log an informational message.
- LocalizableMessage message = NOTE_BACKEND_OFFLINE.get(cfg.getBackendId());
- logError(message);
+ logger.info(NOTE_BACKEND_OFFLINE, cfg.getBackendId());
}
/** {@inheritDoc} */
@@ -992,7 +988,7 @@
long closeTime = (finishTime - startTime) / 1000;
LocalizableMessage msg =
NOTE_JEB_IMPORT_LDIF_ROOTCONTAINER_CLOSE.get(closeTime);
- logError(msg);
+ logger.error(msg);
rootContainer = null;
}
@@ -1407,7 +1403,7 @@
DirectoryException createDirectoryException(DatabaseException e) {
if (e instanceof EnvironmentFailureException && !rootContainer.isValid()) {
LocalizableMessage message = NOTE_BACKEND_ENVIRONMENT_UNUSABLE.get(getBackendID());
- logError(message);
+ logger.info(message);
DirectoryServer.sendAlertNotification(DirectoryServer.getInstance(),
ALERT_TYPE_BACKEND_ENVIRONMENT_UNUSABLE, message);
}
@@ -1500,7 +1496,7 @@
LocalizableMessage msg = NOTE_JEB_DISK_SPACE_RESTORED.get(monitor.getFreeSpace(),
monitor.getDirectory().getPath(), cfg.getBackendId(),
Math.max(monitor.getLowThreshold(), monitor.getFullThreshold()));
- logError(msg);
+ logger.error(msg);
}
private void checkDiskSpace(Operation operation) throws DirectoryException
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java
index a546705..a71831b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java
@@ -53,7 +53,6 @@
import java.util.zip.ZipOutputStream;
import org.opends.server.types.*;
-import static org.opends.server.loggers.ErrorLogger.logError;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.JebMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -218,9 +217,7 @@
// No incremental backup ID: log a message informing that a backup
// could not be found and that a normal backup will be done.
incremental = false;
- LocalizableMessage message = WARN_BACKUPDB_INCREMENTAL_NOT_FOUND_DOING_NORMAL.get(
- backupDir.getPath());
- logError(message);
+ logger.warn(WARN_BACKUPDB_INCREMENTAL_NOT_FOUND_DOING_NORMAL, backupDir.getPath());
}
else
{
@@ -395,8 +392,7 @@
break;
}
- message = NOTE_JEB_BACKUP_FILE_UNCHANGED.get(logFileName);
- logError(message);
+ logger.info(NOTE_JEB_BACKUP_FILE_UNCHANGED, logFileName);
unchangedList.add(logFileName);
@@ -493,9 +489,7 @@
Arrays.sort(logFiles);
- message = NOTE_JEB_BACKUP_CLEANER_ACTIVITY.get(
- String.valueOf(logFiles.length));
- logError(message);
+ logger.info(NOTE_JEB_BACKUP_CLEANER_ACTIVITY, String.valueOf(logFiles.length));
}
else
{
@@ -921,8 +915,7 @@
{
if (verifyOnly)
{
- LocalizableMessage message = NOTE_JEB_BACKUP_VERIFY_FILE.get(zipEntry.getName());
- logError(message);
+ logger.info(NOTE_JEB_BACKUP_VERIFY_FILE, zipEntry.getName());
}
// The file name is part of the hash.
@@ -966,9 +959,7 @@
{
outputStream.close();
- LocalizableMessage message = NOTE_JEB_BACKUP_RESTORED_FILE.get(
- zipEntry.getName(), totalBytesRead);
- logError(message);
+ logger.info(NOTE_JEB_BACKUP_RESTORED_FILE, zipEntry.getName(), totalBytesRead);
}
}
@@ -1063,8 +1054,7 @@
// Finish the zip entry.
zipStream.closeEntry();
- LocalizableMessage message = NOTE_JEB_BACKUP_ARCHIVED_FILE.get(zipEntry.getName());
- logError(message);
+ logger.info(NOTE_JEB_BACKUP_ARCHIVED_FILE, zipEntry.getName());
return totalBytesRead;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ConfigurableEnvironment.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ConfigurableEnvironment.java
index 2560bdf..d6c6ece 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ConfigurableEnvironment.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ConfigurableEnvironment.java
@@ -51,7 +51,6 @@
import static org.opends.messages.BackendMessages.*;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.JebMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
/**
* This class maps JE properties to configuration attributes.
@@ -338,11 +337,9 @@
int cpus = Runtime.getRuntime().availableProcessors();
value = Integer.valueOf(Math.max(24, cpus * 2));
- LocalizableMessage message =
- INFO_ERGONOMIC_SIZING_OF_JE_CLEANER_THREADS.get(String
+ logger.debug(INFO_ERGONOMIC_SIZING_OF_JE_CLEANER_THREADS, String
.valueOf(cfg.dn().rdn().getAttributeValue(0)),
(Number) value);
- logError(message);
}
else if (attrName.equals(ATTR_NUM_LOCK_TABLES)
&& value == null)
@@ -356,11 +353,9 @@
BigInteger tmp = BigInteger.valueOf((cleaners + workers) * 2);
value = tmp.nextProbablePrime();
- LocalizableMessage message =
- INFO_ERGONOMIC_SIZING_OF_JE_LOCK_TABLES.get(String
+ logger.debug(INFO_ERGONOMIC_SIZING_OF_JE_LOCK_TABLES, String
.valueOf(cfg.dn().rdn().getAttributeValue(0)),
(Number) value);
- logError(message);
}
return String.valueOf(value);
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java
index 7ba5239..fed1113 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java
@@ -33,8 +33,6 @@
import com.sleepycat.je.LockMode;
import com.sleepycat.je.OperationStatus;
import java.util.Collection;
-import org.forgerock.i18n.LocalizableMessage;
-
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
@@ -52,7 +50,6 @@
import org.opends.server.types.Entry;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.util.StaticUtils.*;
-import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.messages.ExtensionMessages.*;
/**
@@ -168,7 +165,7 @@
*/
protected void preload()
{
- logError(NOTE_CACHE_PRELOAD_PROGRESS_START.get(jeb.getBackendID()));
+ logger.info(NOTE_CACHE_PRELOAD_PROGRESS_START.get(jeb.getBackendID()));
// Start collector thread first.
collector.start();
// Kick off a single worker.
@@ -184,9 +181,7 @@
if (processedEntries.get() > 0) {
long freeMemory =
Runtime.getRuntime().freeMemory() / bytesPerMegabyte;
- LocalizableMessage message = NOTE_CACHE_PRELOAD_PROGRESS_REPORT.get(
- jeb.getBackendID(), processedEntries.get(), freeMemory);
- logError(message);
+ logger.info(NOTE_CACHE_PRELOAD_PROGRESS_REPORT, jeb.getBackendID(), processedEntries.get(), freeMemory);
}
}
};
@@ -238,9 +233,7 @@
}
// Cancel progress report task and report done.
timer.cancel();
- LocalizableMessage message = NOTE_CACHE_PRELOAD_PROGRESS_DONE.get(
- jeb.getBackendID(), processedEntries.get());
- logError(message);
+ logger.info(NOTE_CACHE_PRELOAD_PROGRESS_DONE, jeb.getBackendID(), processedEntries.get());
} catch (InterruptedException ex) {
logger.traceException(ex);
// Interrupt the collector.
@@ -249,8 +242,7 @@
for (Thread thread : preloadThreads) {
thread.interrupt();
}
- logError(WARN_CACHE_PRELOAD_INTERRUPTED.get(
- jeb.getBackendID()));
+ logger.warn(WARN_CACHE_PRELOAD_INTERRUPTED.get(jeb.getBackendID()));
} finally {
// Kill the timer task.
timer.cancel();
@@ -294,11 +286,9 @@
processedEntries.getAndIncrement();
} catch (Exception ex) {
logger.traceException(ex);
- LocalizableMessage message = ERR_CACHE_PRELOAD_ENTRY_FAILED.get(
- entry.getName().toNormalizedString(),
+ logger.error(ERR_CACHE_PRELOAD_ENTRY_FAILED, entry.getName().toNormalizedString(),
(ex.getCause() != null ? ex.getCause().getMessage() :
stackTraceToSingleLineString(ex)));
- logError(message);
}
} catch (Exception ex) {
break;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
index 074813fa..e5c1e10 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -28,7 +28,6 @@
package org.opends.server.backends.jeb;
import static org.opends.messages.JebMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
import com.sleepycat.je.*;
@@ -554,7 +553,7 @@
}
id2subtree.open(); // No-op
- logError(NOTE_JEB_SUBORDINATE_INDEXES_DISABLED.get(backend
+ logger.info(NOTE_JEB_SUBORDINATE_INDEXES_DISABLED.get(backend
.getBackendID()));
}
@@ -571,8 +570,7 @@
index.open();
if(!index.isTrusted())
{
- logError(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(
- index.getName()));
+ logger.info(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(index.getName()));
}
attrIndexMap.put(indexCfg.getAttribute(), index);
}
@@ -586,7 +584,7 @@
if(!vlvIndex.isTrusted())
{
- logError(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(
+ logger.error(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(
vlvIndex.getName()));
}
@@ -3597,7 +3595,7 @@
state.putIndexTrustState(null, id2subtree, false);
id2subtree.open(); // No-op
- logError(NOTE_JEB_SUBORDINATE_INDEXES_DISABLED
+ logger.error(NOTE_JEB_SUBORDINATE_INDEXES_DISABLED
.get(cfg.getBackendId()));
}
}
@@ -3825,7 +3823,7 @@
id2children.open();
if (!id2children.isTrusted())
{
- logError(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(id2children
+ logger.error(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(id2children
.getName()));
}
id2subtree = new Index(databasePrefix + "_" + ID2SUBTREE_DATABASE_NAME,
@@ -3834,7 +3832,7 @@
id2subtree.open();
if (!id2subtree.isTrusted())
{
- logError(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(id2subtree.getName()));
+ logger.error(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(id2subtree.getName()));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ExportJob.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ExportJob.java
index 985487f..dd10249 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ExportJob.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ExportJob.java
@@ -25,8 +25,6 @@
* Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.backends.jeb;
-import org.forgerock.i18n.LocalizableMessage;
-
import com.sleepycat.je.Cursor;
import com.sleepycat.je.CursorConfig;
import com.sleepycat.je.DatabaseEntry;
@@ -42,7 +40,6 @@
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
-import static org.opends.server.loggers.ErrorLogger.logError;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.JebMessages.*;
@@ -169,9 +166,7 @@
rate = 1000f*exportedCount / totalTime;
}
- LocalizableMessage message = NOTE_JEB_EXPORT_FINAL_STATUS.get(
- exportedCount, skippedCount, totalTime/1000, rate);
- logError(message);
+ logger.info(NOTE_JEB_EXPORT_FINAL_STATUS, exportedCount, skippedCount, totalTime/1000, rate);
}
@@ -307,9 +302,7 @@
float rate = 1000f*deltaCount / deltaTime;
- LocalizableMessage message =
- NOTE_JEB_EXPORT_PROGRESS_REPORT.get(latestCount, skippedCount, rate);
- logError(message);
+ logger.info(NOTE_JEB_EXPORT_PROGRESS_REPORT, latestCount, skippedCount, rate);
previousCount = latestCount;
previousTime = latestTime;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java
index 5f40a6a..1ed8847 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java
@@ -27,8 +27,6 @@
package org.opends.server.backends.jeb;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.server.loggers.ErrorLogger.*;
-
import com.sleepycat.je.*;
import org.opends.server.types.*;
@@ -567,7 +565,7 @@
}
setTrusted(txn, false);
- logError(ERR_JEB_INDEX_CORRUPT_REQUIRES_REBUILD.get(name));
+ logger.error(ERR_JEB_INDEX_CORRUPT_REQUIRES_REBUILD.get(name));
}
if((rebuildRunning || trusted) && addedIDs != null &&
@@ -690,7 +688,7 @@
}
setTrusted(txn, false);
- logError(ERR_JEB_INDEX_CORRUPT_REQUIRES_REBUILD.get(name));
+ logger.error(ERR_JEB_INDEX_CORRUPT_REQUIRES_REBUILD.get(name));
}
if((rebuildRunning || trusted) && addedIDs != null && addedIDs.size() > 0)
@@ -796,7 +794,7 @@
}
setTrusted(txn, false);
- logError(ERR_JEB_INDEX_CORRUPT_REQUIRES_REBUILD.get(name));
+ logger.error(ERR_JEB_INDEX_CORRUPT_REQUIRES_REBUILD.get(name));
}
}
}
@@ -845,7 +843,7 @@
}
setTrusted(txn, false);
- logError(ERR_JEB_INDEX_CORRUPT_REQUIRES_REBUILD.get(name));
+ logger.error(ERR_JEB_INDEX_CORRUPT_REQUIRES_REBUILD.get(name));
}
else
{
@@ -880,7 +878,7 @@
}
setTrusted(txn, false);
- logError(ERR_JEB_INDEX_CORRUPT_REQUIRES_REBUILD.get(name));
+ logger.error(ERR_JEB_INDEX_CORRUPT_REQUIRES_REBUILD.get(name));
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java
index 1cfa531..17aa335 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java
@@ -43,7 +43,6 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.core.DirectoryServer;
import org.opends.server.config.ConfigException;
-import static org.opends.server.loggers.ErrorLogger.logError;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.InitializationException;
import static org.opends.messages.JebMessages.*;
@@ -194,17 +193,13 @@
{
if(!FilePermission.setPermissions(backendDirectory, backendPermission))
{
- LocalizableMessage message = WARN_JEB_UNABLE_SET_PERMISSIONS.get(
- backendPermission.toString(), backendDirectory.toString());
- logError(message);
+ logger.warn(WARN_JEB_UNABLE_SET_PERMISSIONS, backendPermission.toString(), backendDirectory.toString());
}
}
catch(Exception e)
{
// Log an warning that the permissions were not set.
- LocalizableMessage message = WARN_JEB_SET_PERMISSIONS_FAILED.get(
- backendDirectory.toString(), e.toString());
- logError(message);
+ logger.warn(WARN_JEB_SET_PERMISSIONS_FAILED, backendDirectory.toString(), e.toString());
}
}
@@ -409,9 +404,7 @@
PreloadConfig preloadConfig = new PreloadConfig();
preloadConfig.setLoadLNs(true);
- LocalizableMessage message =
- NOTE_JEB_CACHE_PRELOAD_STARTED.get(backend.getBackendID());
- logError(message);
+ logger.info(NOTE_JEB_CACHE_PRELOAD_STARTED, backend.getBackendID());
boolean isInterrupted = false;
@@ -440,52 +433,37 @@
if (preloadStatus != PreloadStatus.SUCCESS)
{
if (preloadStatus == PreloadStatus.EXCEEDED_TIME) {
- message =
- NOTE_JEB_CACHE_PRELOAD_INTERRUPTED_BY_TIME.get(
- backend.getBackendID(), db.getName());
- logError(message);
+ logger.info(NOTE_JEB_CACHE_PRELOAD_INTERRUPTED_BY_TIME, backend.getBackendID(), db.getName());
} else if (preloadStatus == PreloadStatus.FILLED_CACHE) {
- message =
- NOTE_JEB_CACHE_PRELOAD_INTERRUPTED_BY_SIZE.get(
- backend.getBackendID(), db.getName());
- logError(message);
+ logger.info(NOTE_JEB_CACHE_PRELOAD_INTERRUPTED_BY_SIZE, backend.getBackendID(), db.getName());
} else {
- message =
- NOTE_JEB_CACHE_PRELOAD_INTERRUPTED_UNKNOWN.get(
- backend.getBackendID(), db.getName());
- logError(message);
+ logger.info(NOTE_JEB_CACHE_PRELOAD_INTERRUPTED_UNKNOWN, backend.getBackendID(), db.getName());
}
isInterrupted = true;
break;
}
- message = NOTE_JEB_CACHE_DB_PRELOADED.get(db.getName());
- logError(message);
+ logger.info(NOTE_JEB_CACHE_DB_PRELOADED, db.getName());
}
if (!isInterrupted) {
- message = NOTE_JEB_CACHE_PRELOAD_DONE.get(backend.getBackendID());
- logError(message);
+ logger.info(NOTE_JEB_CACHE_PRELOAD_DONE, backend.getBackendID());
}
// Log an informational message about the size of the cache.
EnvironmentStats stats = env.getStats(new StatsConfig());
long total = stats.getCacheTotalBytes();
- message =
- NOTE_JEB_CACHE_SIZE_AFTER_PRELOAD.get(total / (1024 * 1024));
- logError(message);
+ logger.info(NOTE_JEB_CACHE_SIZE_AFTER_PRELOAD, total / (1024 * 1024));
}
catch (DatabaseException e)
{
logger.traceException(e);
- LocalizableMessage message =
- ERR_JEB_CACHE_PRELOAD.get(backend.getBackendID(),
+ logger.error(ERR_JEB_CACHE_PRELOAD, backend.getBackendID(),
(e.getCause() != null ? e.getCause().getMessage() :
stackTraceToSingleLineString(e)));
- logError(message);
}
}
}
@@ -934,17 +912,13 @@
if(!FilePermission.setPermissions(backendDirectory,
backendPermission))
{
- LocalizableMessage message = WARN_JEB_UNABLE_SET_PERMISSIONS.get(
- backendPermission.toString(), backendDirectory.toString());
- logError(message);
+ logger.warn(WARN_JEB_UNABLE_SET_PERMISSIONS, backendPermission.toString(), backendDirectory.toString());
}
}
catch(Exception e)
{
// Log an warning that the permissions were not set.
- LocalizableMessage message = WARN_JEB_SET_PERMISSIONS_FAILED.get(
- backendDirectory.toString(), e.toString());
- logError(message);
+ logger.warn(WARN_JEB_SET_PERMISSIONS_FAILED, backendDirectory.toString(), e.toString());
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
index 53ff069..bbf1af8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
@@ -28,7 +28,6 @@
import com.sleepycat.je.*;
import org.forgerock.i18n.LocalizableMessage;
-import static org.opends.server.loggers.ErrorLogger.logError;
import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -352,9 +351,7 @@
String.valueOf(keyCount));
if (cleanMode)
{
- LocalizableMessage message = NOTE_JEB_VERIFY_CLEAN_FINAL_STATUS.get(
- keyCount, errorCount, totalTime/1000, rate);
- logError(message);
+ logger.info(NOTE_JEB_VERIFY_CLEAN_FINAL_STATUS, keyCount, errorCount, totalTime/1000, rate);
if (multiReferenceCount > 0)
{
@@ -364,41 +361,30 @@
averageEntryReferences = (float)entryReferencesCount/keyCount;
}
- message =
- INFO_JEB_VERIFY_MULTIPLE_REFERENCE_COUNT.get(multiReferenceCount);
- logError(message);
+ logger.debug(INFO_JEB_VERIFY_MULTIPLE_REFERENCE_COUNT, multiReferenceCount);
addStatEntry(statEntry, "verify-multiple-reference-count",
String.valueOf(multiReferenceCount));
- message = INFO_JEB_VERIFY_ENTRY_LIMIT_EXCEEDED_COUNT.get(
- entryLimitExceededCount);
- logError(message);
+ logger.debug(INFO_JEB_VERIFY_ENTRY_LIMIT_EXCEEDED_COUNT, entryLimitExceededCount);
addStatEntry(statEntry, "verify-entry-limit-exceeded-count",
String.valueOf(entryLimitExceededCount));
- message = INFO_JEB_VERIFY_AVERAGE_REFERENCE_COUNT.get(
- averageEntryReferences);
- logError(message);
+ logger.debug(INFO_JEB_VERIFY_AVERAGE_REFERENCE_COUNT, averageEntryReferences);
addStatEntry(statEntry, "verify-average-reference-count",
String.valueOf(averageEntryReferences));
- message =
- INFO_JEB_VERIFY_MAX_REFERENCE_COUNT.get(maxEntryPerValue);
- logError(message);
+ logger.debug(INFO_JEB_VERIFY_MAX_REFERENCE_COUNT, maxEntryPerValue);
addStatEntry(statEntry, "verify-max-reference-count",
String.valueOf(maxEntryPerValue));
}
}
else
{
- LocalizableMessage message = NOTE_JEB_VERIFY_FINAL_STATUS.get(
- keyCount, errorCount, totalTime/1000, rate);
- logError(message);
+ logger.info(NOTE_JEB_VERIFY_FINAL_STATUS, keyCount, errorCount, totalTime/1000, rate);
//TODO add entry-limit-stats to the statEntry
if (entryLimitMap.size() > 0)
{
- message = INFO_JEB_VERIFY_ENTRY_LIMIT_STATS_HEADER.get();
- logError(message);
+ logger.debug(INFO_JEB_VERIFY_ENTRY_LIMIT_STATS_HEADER);
for (Map.Entry<Index,HashMap<ByteString,Long>> mapEntry :
entryLimitMap.entrySet())
@@ -419,10 +405,8 @@
medianValue = values[x];
}
- message = INFO_JEB_VERIFY_ENTRY_LIMIT_STATS_ROW.
- get(index.toString(), values.length, values[0],
+ logger.debug(INFO_JEB_VERIFY_ENTRY_LIMIT_STATS_ROW, index.toString(), values.length, values[0],
values[values.length-1], medianValue);
- logError(message);
}
}
}
@@ -2026,9 +2010,7 @@
float rate = 1000f*deltaCount / deltaTime;
- LocalizableMessage message = NOTE_JEB_VERIFY_PROGRESS_REPORT.get(
- latestCount, totalCount, errorCount, rate);
- logError(message);
+ logger.info(NOTE_JEB_VERIFY_PROGRESS_REPORT, latestCount, totalCount, errorCount, rate);
try
{
@@ -2046,9 +2028,7 @@
cacheMissRate = nCacheMiss/(float)deltaCount;
}
- message = INFO_JEB_VERIFY_CACHE_AND_MEMORY_REPORT.get(
- freeMemory, cacheMissRate);
- logError(message);
+ logger.debug(INFO_JEB_VERIFY_CACHE_AND_MEMORY_REPORT, freeMemory, cacheMissRate);
prevEnvStats = envStats;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
index 79fd543..0715904 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
@@ -29,7 +29,6 @@
import static com.sleepycat.je.EnvironmentConfig.*;
import static org.opends.messages.JebMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.DynamicConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -540,18 +539,17 @@
if (oldThreadCount != threadCount)
{
- logError(
+ logger.error(
NOTE_JEB_IMPORT_ADJUST_THREAD_COUNT.get(oldThreadCount, threadCount));
}
- logError(NOTE_JEB_IMPORT_LDIF_TOT_MEM_BUF.get(
- availableMemory, phaseOneBufferCount));
+ logger.info(NOTE_JEB_IMPORT_LDIF_TOT_MEM_BUF.get(availableMemory, phaseOneBufferCount));
if (tmpEnvCacheSize > 0)
{
- logError(NOTE_JEB_IMPORT_LDIF_TMP_ENV_MEM.get(tmpEnvCacheSize));
+ logger.info(NOTE_JEB_IMPORT_LDIF_TMP_ENV_MEM.get(tmpEnvCacheSize));
}
envConfig.setConfigParam(MAX_MEMORY, Long.toString(dbCacheSize));
- logError(NOTE_JEB_IMPORT_LDIF_DB_MEM_BUF_INFO.get(dbCacheSize, bufferSize));
+ logger.info(NOTE_JEB_IMPORT_LDIF_DB_MEM_BUF_INFO.get(dbCacheSize, bufferSize));
}
/**
@@ -923,12 +921,9 @@
dbMonitor.initializeMonitorProvider(null);
DirectoryServer.registerMonitorProvider(dbMonitor);
- LocalizableMessage message =
- NOTE_JEB_IMPORT_STARTING.get(DirectoryServer.getVersionString(),
+ logger.info(NOTE_JEB_IMPORT_STARTING, DirectoryServer.getVersionString(),
BUILD_ID, REVISION_NUMBER);
- logError(message);
- message = NOTE_JEB_IMPORT_THREAD_COUNT.get(threadCount);
- logError(message);
+ logger.info(NOTE_JEB_IMPORT_THREAD_COUNT, threadCount);
initializeSuffixes();
setIndexesTrusted(false);
long startTime = System.currentTimeMillis();
@@ -956,18 +951,14 @@
long finishTime = System.currentTimeMillis();
long importTime = (finishTime - startTime);
float rate = 0;
- message =
- NOTE_JEB_IMPORT_PHASE_STATS.get(importTime / 1000,
+ logger.info(NOTE_JEB_IMPORT_PHASE_STATS, importTime / 1000,
(phaseOneFinishTime - startTime) / 1000,
(phaseTwoFinishTime - phaseTwoTime) / 1000);
- logError(message);
if (importTime > 0)
rate = 1000f * reader.getEntriesRead() / importTime;
- message =
- NOTE_JEB_IMPORT_FINAL_STATUS.get(reader.getEntriesRead(), importCount
+ logger.info(NOTE_JEB_IMPORT_FINAL_STATUS, reader.getEntriesRead(), importCount
.get(), reader.getEntriesIgnored(), reader.getEntriesRejected(),
migratedCount, importTime / 1000, rate);
- logError(message);
return new LDIFImportResult(reader.getEntriesRead(), reader
.getEntriesRejected(), reader.getEntriesIgnored());
}
@@ -1213,8 +1204,7 @@
readAheadSize = MIN_READ_AHEAD_CACHE_SIZE;
buffers = (int) (usableMemory / readAheadSize);
- LocalizableMessage message = WARN_IMPORT_LDIF_LACK_MEM_PHASE_TWO.get(usableMemory);
- logError(message);
+ logger.warn(WARN_IMPORT_LDIF_LACK_MEM_PHASE_TWO, usableMemory);
break;
}
}
@@ -1223,10 +1213,8 @@
// processing of smaller indexes.
dbThreads = Math.max(2, dbThreads);
- LocalizableMessage message =
- NOTE_JEB_IMPORT_LDIF_PHASE_TWO_MEM_REPORT.get(availableMemory,
+ logger.info(NOTE_JEB_IMPORT_LDIF_PHASE_TWO_MEM_REPORT, availableMemory,
readAheadSize, buffers);
- logError(message);
// Start indexing tasks.
List<Future<Void>> futures = new LinkedList<Future<Void>>();
@@ -1286,10 +1274,8 @@
DatabaseEntry data = new DatabaseEntry();
LockMode lockMode = LockMode.DEFAULT;
OperationStatus status;
- LocalizableMessage message =
- NOTE_JEB_IMPORT_MIGRATION_START.get("excluded", String
+ logger.info(NOTE_JEB_IMPORT_MIGRATION_START, "excluded", String
.valueOf(suffix.getBaseDN()));
- logError(message);
Cursor cursor =
entryContainer.getDN2ID().openCursor(null,
CursorConfig.READ_COMMITTED);
@@ -1331,10 +1317,8 @@
}
catch (Exception e)
{
- message =
- ERR_JEB_IMPORT_LDIF_MIGRATE_EXCLUDED_TASK_ERR.get(e
+ logger.error(ERR_JEB_IMPORT_LDIF_MIGRATE_EXCLUDED_TASK_ERR, e
.getMessage());
- logError(message);
isCanceled = true;
throw e;
}
@@ -1380,10 +1364,8 @@
DatabaseEntry data = new DatabaseEntry();
LockMode lockMode = LockMode.DEFAULT;
OperationStatus status;
- LocalizableMessage message =
- NOTE_JEB_IMPORT_MIGRATION_START.get("existing", String
+ logger.info(NOTE_JEB_IMPORT_MIGRATION_START, "existing", String
.valueOf(suffix.getBaseDN()));
- logError(message);
Cursor cursor = entryContainer.getDN2ID().openCursor(null, null);
try
{
@@ -1435,10 +1417,8 @@
}
catch (Exception e)
{
- message =
- ERR_JEB_IMPORT_LDIF_MIGRATE_EXISTING_TASK_ERR.get(e
+ logger.error(ERR_JEB_IMPORT_LDIF_MIGRATE_EXISTING_TASK_ERR, e
.getMessage());
- logError(message);
isCanceled = true;
throw e;
}
@@ -1493,9 +1473,7 @@
}
catch (Exception e)
{
- LocalizableMessage message =
- ERR_JEB_IMPORT_LDIF_APPEND_REPLACE_TASK_ERR.get(e.getMessage());
- logError(message);
+ logger.error(ERR_JEB_IMPORT_LDIF_APPEND_REPLACE_TASK_ERR, e.getMessage());
isCanceled = true;
throw e;
}
@@ -1620,9 +1598,7 @@
}
catch (Exception e)
{
- LocalizableMessage message =
- ERR_JEB_IMPORT_LDIF_IMPORT_TASK_ERR.get(e.getMessage());
- logError(message);
+ logger.error(ERR_JEB_IMPORT_LDIF_IMPORT_TASK_ERR, e.getMessage());
isCanceled = true;
throw e;
}
@@ -1957,10 +1933,8 @@
nextBufferID = 0;
ownedPermits = 0;
- LocalizableMessage message =
- NOTE_JEB_IMPORT_LDIF_INDEX_STARTED.get(indexMgr.getBufferFileName(),
+ logger.info(NOTE_JEB_IMPORT_LDIF_INDEX_STARTED, indexMgr.getBufferFileName(),
remainingBuffers, totalBatches);
- logError(message);
indexMgr.setIndexDBWriteTask(this);
isRunning = true;
@@ -2041,7 +2015,7 @@
{
LocalizableMessage msg =
NOTE_JEB_IMPORT_LDIF_DN_CLOSE.get(indexMgr.getDNCount());
- logError(msg);
+ logger.error(msg);
}
}
else
@@ -2052,10 +2026,8 @@
}
if (!isCanceled)
{
- LocalizableMessage message =
- NOTE_JEB_IMPORT_LDIF_INDEX_CLOSE.get(indexMgr
+ logger.info(NOTE_JEB_IMPORT_LDIF_INDEX_CLOSE, indexMgr
.getBufferFileName());
- logError(message);
}
}
}
@@ -2112,11 +2084,9 @@
final long kiloBytesRate = bytesReadInterval / deltaTime;
final long kiloBytesRemaining = (bufferFileSize - tmpBytesRead) / 1024;
- LocalizableMessage message =
- NOTE_JEB_IMPORT_LDIF_PHASE_TWO_REPORT.get(indexMgr
+ logger.info(NOTE_JEB_IMPORT_LDIF_PHASE_TWO_REPORT, indexMgr
.getBufferFileName(), bytesReadPercent, kiloBytesRemaining,
kiloBytesRate, currentBatch, totalBatches);
- logError(message);
lastBytesRead = tmpBytesRead;
}
@@ -2235,10 +2205,8 @@
}
catch (Exception e)
{
- LocalizableMessage message =
- ERR_JEB_IMPORT_LDIF_INDEX_WRITE_DB_ERR.get(indexMgr
+ logger.error(ERR_JEB_IMPORT_LDIF_INDEX_WRITE_DB_ERR, indexMgr
.getBufferFileName(), e.getMessage());
- logError(message);
throw e;
}
finally
@@ -2707,10 +2675,8 @@
}
catch (IOException e)
{
- LocalizableMessage message =
- ERR_JEB_IMPORT_LDIF_INDEX_FILEWRITER_ERR.get(indexMgr
+ logger.error(ERR_JEB_IMPORT_LDIF_INDEX_FILEWRITER_ERR, indexMgr
.getBufferFile().getAbsolutePath(), e.getMessage());
- logError(message);
isCanceled = true;
throw e;
}
@@ -3259,7 +3225,7 @@
}
if ( message != null )
{
- logError(message);
+ logger.error(message);
}
}
@@ -3281,10 +3247,8 @@
if (!rebuildConfig.isClearDegradedState())
{
- LocalizableMessage message =
- NOTE_JEB_REBUILD_FINAL_STATUS.get(entriesProcessed.get(),
+ logger.info(NOTE_JEB_REBUILD_FINAL_STATUS, entriesProcessed.get(),
totalTime / 1000, rate);
- logError(message);
}
}
@@ -3320,9 +3284,7 @@
catch (Exception e)
{
logger.traceException(e);
- LocalizableMessage message = ERR_JEB_IMPORT_LDIF_REBUILD_INDEX_TASK_ERR.get(
- stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(ERR_JEB_IMPORT_LDIF_REBUILD_INDEX_TASK_ERR, stackTraceToSingleLineString(e));
isCanceled = true;
throw e;
}
@@ -3366,10 +3328,8 @@
}
else
{
- LocalizableMessage message =
- NOTE_JEB_REBUILD_CLEARDEGRADEDSTATE_FINAL_STATUS.get(rebuildConfig
+ logger.info(NOTE_JEB_REBUILD_CLEARDEGRADEDSTATE_FINAL_STATUS, rebuildConfig
.getRebuildList().toString());
- logError(message);
}
setRebuildListIndexesTrusted(true);
@@ -4039,7 +3999,7 @@
LocalizableMessage msg =
ERR_REBUILD_INDEX_LACK_DISK.get(monitor.getDirectory().getPath(),
monitor.getFreeSpace(), monitor.getLowThreshold());
- logError(msg);
+ logger.error(msg);
}
@Override
@@ -4103,10 +4063,8 @@
{
completed = 100f * entriesProcessed / rebuildManager.getTotEntries();
}
- LocalizableMessage message =
- NOTE_JEB_REBUILD_PROGRESS_REPORT.get(completed, entriesProcessed,
+ logger.info(NOTE_JEB_REBUILD_PROGRESS_REPORT, completed, entriesProcessed,
rebuildManager.getTotEntries(), rate);
- logError(message);
try
{
Runtime runtime = Runtime.getRuntime();
@@ -4121,10 +4079,8 @@
{
cacheMissRate = nCacheMiss / (float) deltaCount;
}
- message =
- NOTE_JEB_REBUILD_CACHE_AND_MEMORY_REPORT.get(freeMemory,
+ logger.info(NOTE_JEB_REBUILD_CACHE_AND_MEMORY_REPORT, freeMemory,
cacheMissRate);
- logError(message);
prevEnvStats = envStats;
}
catch (DatabaseException e)
@@ -4199,10 +4155,8 @@
long entriesIgnored = reader.getEntriesIgnored();
long entriesRejected = reader.getEntriesRejected();
float rate = 1000f * deltaCount / deltaTime;
- message =
- NOTE_JEB_IMPORT_PROGRESS_REPORT.get(entriesRead, entriesIgnored,
+ logger.info(NOTE_JEB_IMPORT_PROGRESS_REPORT, entriesRead, entriesIgnored,
entriesRejected, 0, rate);
- logError(message);
try
{
Runtime runTime = Runtime.getRuntime();
@@ -4228,10 +4182,8 @@
{
cacheMissRate = nCacheMiss / (float) deltaCount;
}
- message =
- NOTE_JEB_IMPORT_CACHE_AND_MEMORY_REPORT.get(freeMemory,
+ logger.info(NOTE_JEB_IMPORT_CACHE_AND_MEMORY_REPORT, freeMemory,
cacheMissRate);
- logError(message);
long evictPasses = environmentStats.getNEvictPasses();
long evictNodes = environmentStats.getNNodesExplicitlyEvicted();
long evictBinsStrip = environmentStats.getNBINsStripped();
@@ -4246,26 +4198,19 @@
{
evicting = true;
evictionEntryCount = reader.getEntriesRead();
- message =
- NOTE_JEB_IMPORT_LDIF_EVICTION_DETECTED.get(evictionEntryCount);
- logError(message);
+ logger.info(NOTE_JEB_IMPORT_LDIF_EVICTION_DETECTED, evictionEntryCount);
}
- message =
- NOTE_JEB_IMPORT_LDIF_EVICTION_DETECTED_STATS.get(evictPasses,
+ logger.info(NOTE_JEB_IMPORT_LDIF_EVICTION_DETECTED_STATS, evictPasses,
evictNodes, evictBinsStrip);
- logError(message);
}
if (cleanerRuns != 0)
{
- message =
- NOTE_JEB_IMPORT_LDIF_CLEANER_STATS.get(cleanerRuns,
+ logger.info(NOTE_JEB_IMPORT_LDIF_CLEANER_STATS, cleanerRuns,
cleanerDeletions, cleanerEntriesRead, cleanerINCleaned);
- logError(message);
}
if (checkPoints > 1)
{
- message = NOTE_JEB_IMPORT_LDIF_BUFFER_CHECKPOINTS.get(checkPoints);
- logError(message);
+ logger.info(NOTE_JEB_IMPORT_LDIF_BUFFER_CHECKPOINTS, checkPoints);
}
previousStats = environmentStats;
}
@@ -4353,10 +4298,8 @@
{
cacheMissRate = nCacheMiss / (float) deltaCount;
}
- message =
- NOTE_JEB_IMPORT_CACHE_AND_MEMORY_REPORT.get(freeMemory,
+ logger.info(NOTE_JEB_IMPORT_CACHE_AND_MEMORY_REPORT, freeMemory,
cacheMissRate);
- logError(message);
long evictPasses = environmentStats.getNEvictPasses();
long evictNodes = environmentStats.getNNodesExplicitlyEvicted();
long evictBinsStrip = environmentStats.getNBINsStripped();
@@ -4371,22 +4314,17 @@
{
evicting = true;
}
- message =
- NOTE_JEB_IMPORT_LDIF_EVICTION_DETECTED_STATS.get(evictPasses,
+ logger.info(NOTE_JEB_IMPORT_LDIF_EVICTION_DETECTED_STATS, evictPasses,
evictNodes, evictBinsStrip);
- logError(message);
}
if (cleanerRuns != 0)
{
- message =
- NOTE_JEB_IMPORT_LDIF_CLEANER_STATS.get(cleanerRuns,
+ logger.info(NOTE_JEB_IMPORT_LDIF_CLEANER_STATS, cleanerRuns,
cleanerDeletions, cleanerEntriesRead, cleanerINCleaned);
- logError(message);
}
if (checkPoints > 1)
{
- message = NOTE_JEB_IMPORT_LDIF_BUFFER_CHECKPOINTS.get(checkPoints);
- logError(message);
+ logger.info(NOTE_JEB_IMPORT_LDIF_BUFFER_CHECKPOINTS, checkPoints);
}
previousStats = environmentStats;
}
@@ -4910,7 +4848,7 @@
ERR_IMPORT_LDIF_LACK_DISK_PHASE_TWO.get(monitor.getDirectory()
.getPath(), monitor.getFreeSpace(), monitor.getLowThreshold());
}
- logError(msg);
+ logger.error(msg);
}
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/IndexInputBuffer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/IndexInputBuffer.java
index e334170..d1e9ac6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/IndexInputBuffer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/IndexInputBuffer.java
@@ -30,13 +30,11 @@
import static org.opends.messages.JebMessages.ERR_JEB_IMPORT_BUFFER_IO_ERROR;
-import static org.opends.server.loggers.ErrorLogger.logError;
-
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
-import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.backends.jeb.importLDIF.Importer.IndexManager;
import com.sleepycat.util.PackedInteger;
@@ -49,6 +47,9 @@
*/
public final class IndexInputBuffer implements Comparable<IndexInputBuffer>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
private final IndexManager indexMgr;
private final FileChannel channel;
private final long begin;
@@ -193,9 +194,8 @@
}
catch (IOException ex)
{
- LocalizableMessage message = ERR_JEB_IMPORT_BUFFER_IO_ERROR.get(indexMgr
+ logger.error(ERR_JEB_IMPORT_BUFFER_IO_ERROR, indexMgr
.getBufferFileName());
- logError(message);
throw new RuntimeException(ex);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Suffix.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Suffix.java
index 9faebda..ab3752b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Suffix.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Suffix.java
@@ -28,15 +28,14 @@
package org.opends.server.backends.jeb.importLDIF;
import java.util.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import org.opends.server.backends.jeb.*;
import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
-import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.backends.jeb.importLDIF.Importer.*;
-import org.forgerock.i18n.LocalizableMessage;
import com.sleepycat.je.DatabaseException;
import com.sleepycat.je.LockMode;
import static org.opends.messages.JebMessages.*;
@@ -49,6 +48,9 @@
*/
public class Suffix
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
private final List<DN> includeBranches, excludeBranches;
private final DN baseDN;
private final EntryContainer srcEntryContainer;
@@ -245,8 +247,7 @@
try {
assureNotPending(dn);
} catch (InterruptedException e) {
- LocalizableMessage message = ERR_JEB_IMPORT_LDIF_PENDING_ERR.get(e.getMessage());
- logError(message);
+ logger.error(ERR_JEB_IMPORT_LDIF_PENDING_ERR, e.getMessage());
throw e;
}
//Check the DN cache.
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/task/Task.java b/opendj3-server-dev/src/server/org/opends/server/backends/task/Task.java
index 3c94581..6ed156e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/task/Task.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/task/Task.java
@@ -50,7 +50,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.messages.Severity;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.opends.server.util.EMailMessage;
@@ -931,7 +930,7 @@
{
// Simply pass this on to the server error logger, and it will call back
// to the addLogMessage method for this task.
- ErrorLogger.logError(message);
+ logger.error(message);
}
/**
@@ -1185,9 +1184,7 @@
taskState = TaskState.STOPPED_BY_ERROR;
- LocalizableMessage message = ERR_TASK_EXECUTE_FAILED.get(
- String.valueOf(taskEntry.getName()), stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(ERR_TASK_EXECUTE_FAILED, String.valueOf(taskEntry.getName()), stackTraceToSingleLineString(e));
}
return taskState;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
index cd22ab7..ddbb4df 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
@@ -55,7 +55,6 @@
import static org.opends.messages.BackendMessages.*;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -1870,8 +1869,7 @@
byte[] calculatedHash = digest.digest();
if (Arrays.equals(calculatedHash, unsignedHash))
{
- LocalizableMessage message = NOTE_TASKS_RESTORE_UNSIGNED_HASH_VALID.get();
- logError(message);
+ logger.info(NOTE_TASKS_RESTORE_UNSIGNED_HASH_VALID);
}
else
{
@@ -1887,8 +1885,7 @@
byte[] calculatedSignature = mac.doFinal();
if (Arrays.equals(calculatedSignature, signedHash))
{
- LocalizableMessage message = NOTE_TASKS_RESTORE_SIGNED_HASH_VALID.get();
- logError(message);
+ logger.info(NOTE_TASKS_RESTORE_SIGNED_HASH_VALID);
}
else
{
@@ -1901,15 +1898,12 @@
// If we are just verifying the archive, then we're done.
if (verifyOnly)
{
- LocalizableMessage message =
- NOTE_TASKS_RESTORE_VERIFY_SUCCESSFUL.get(backupID, backupPath);
- logError(message);
+ logger.info(NOTE_TASKS_RESTORE_VERIFY_SUCCESSFUL, backupID, backupPath);
return;
}
// If we've gotten here, then the archive was restored successfully.
- LocalizableMessage message = NOTE_TASKS_RESTORE_SUCCESSFUL.get(backupID, backupPath);
- logError(message);
+ logger.info(NOTE_TASKS_RESTORE_SUCCESSFUL, backupID, backupPath);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskScheduler.java b/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskScheduler.java
index 3e23598..e014cd5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskScheduler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskScheduler.java
@@ -175,7 +175,7 @@
try {
task = recurringTask.scheduleNextIteration(new GregorianCalendar());
} catch (DirectoryException de) {
- logError(de.getMessageObject());
+ logger.error(de.getMessageObject());
}
if (task != null) {
try {
@@ -185,7 +185,7 @@
// and thus got initialized from backing file, otherwise
// log error and continue.
if (de.getResultCode() != ResultCode.ENTRY_ALREADY_EXISTS) {
- logError(de.getMessageObject());
+ logger.error(de.getMessageObject());
}
}
}
@@ -623,7 +623,7 @@
try {
newIteration = recurringTask.scheduleNextIteration(calendar);
} catch (DirectoryException de) {
- logError(de.getMessageObject());
+ logger.error(de.getMessageObject());
}
if (newIteration != null)
{
@@ -649,9 +649,9 @@
logger.traceException(de);
LocalizableMessage message =
- ERR_TASKSCHED_ERROR_SCHEDULING_RECURRING_ITERATION.
- get(recurringTaskID, de.getMessageObject());
- logError(message);
+ ERR_TASKSCHED_ERROR_SCHEDULING_RECURRING_ITERATION.get(
+ recurringTaskID, de.getMessageObject());
+ logger.error(message);
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_CANNOT_SCHEDULE_RECURRING_ITERATION,
@@ -1061,9 +1061,8 @@
if (le.canContinueReading())
{
- LocalizableMessage message = ERR_TASKSCHED_CANNOT_PARSE_ENTRY_RECOVERABLE.get(
+ logger.error(ERR_TASKSCHED_CANNOT_PARSE_ENTRY_RECOVERABLE,
backingFilePath, le.getLineNumber(), le.getMessage());
- logError(message);
continue;
}
@@ -1107,10 +1106,8 @@
DN parentDN = entryDN.getParentDNInSuffix();
if (parentDN == null)
{
- LocalizableMessage message = ERR_TASKSCHED_ENTRY_HAS_NO_PARENT.
- get(String.valueOf(entryDN),
+ logger.error(ERR_TASKSCHED_ENTRY_HAS_NO_PARENT, String.valueOf(entryDN),
String.valueOf(taskBackend.getTaskRootDN()));
- logError(message);
}
else if (parentDN.equals(taskBackend.getScheduledTasksParentDN()))
{
@@ -1122,10 +1119,7 @@
String id = task.getTaskID();
if (tasks.containsKey(id))
{
- LocalizableMessage message =
- WARN_TASKSCHED_DUPLICATE_TASK_ID.get(
- String.valueOf(id));
- logError(message);
+ logger.warn(WARN_TASKSCHED_DUPLICATE_TASK_ID, String.valueOf(id));
}
else
{
@@ -1142,9 +1136,8 @@
{
logger.traceException(de);
- LocalizableMessage message = ERR_TASKSCHED_CANNOT_SCHEDULE_TASK_FROM_ENTRY.
- get(String.valueOf(entryDN), de.getMessageObject());
- logError(message);
+ logger.error(ERR_TASKSCHED_CANNOT_SCHEDULE_TASK_FROM_ENTRY,
+ String.valueOf(entryDN), de.getMessageObject());
}
}
else if (parentDN.equals(taskBackend.getRecurringTasksParentDN()))
@@ -1158,17 +1151,14 @@
{
logger.traceException(de);
- LocalizableMessage message =
- ERR_TASKSCHED_CANNOT_SCHEDULE_RECURRING_TASK_FROM_ENTRY.
- get(String.valueOf(entryDN), de.getMessageObject());
- logError(message);
+ logger.error(
+ ERR_TASKSCHED_CANNOT_SCHEDULE_RECURRING_TASK_FROM_ENTRY,
+ String.valueOf(entryDN), de.getMessageObject());
}
}
else
{
- LocalizableMessage message = ERR_TASKSCHED_INVALID_TASK_ENTRY_DN.get(
- String.valueOf(entryDN), backingFilePath);
- logError(message);
+ logger.error(ERR_TASKSCHED_INVALID_TASK_ENTRY_DN, String.valueOf(entryDN), backingFilePath);
}
}
}
@@ -1239,8 +1229,6 @@
catch (LDIFException le)
{
logger.traceException(le);
-
-
LocalizableMessage message = ERR_TASKSCHED_CANNOT_CREATE_BACKING_FILE.get(
backingFile, le.getMessage());
throw new InitializationException(message, le);
@@ -1323,12 +1311,11 @@
{
logger.traceException(e);
- LocalizableMessage message = WARN_TASKSCHED_CANNOT_RENAME_CURRENT_BACKING_FILE.
- get(String.valueOf(backingFilePath),
- String.valueOf(saveFile.getAbsolutePath()),
- stackTraceToSingleLineString(e));
- logError(message);
-
+ LocalizableMessage message =
+ WARN_TASKSCHED_CANNOT_RENAME_CURRENT_BACKING_FILE.get(String
+ .valueOf(backingFilePath), String.valueOf(saveFile
+ .getAbsolutePath()), stackTraceToSingleLineString(e));
+ logger.warn(message);
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_CANNOT_RENAME_CURRENT_TASK_FILE,
message);
@@ -1345,11 +1332,11 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_TASKSCHED_CANNOT_RENAME_NEW_BACKING_FILE.
- get(String.valueOf(tmpFilePath), String.valueOf(backingFilePath),
+ LocalizableMessage message =
+ ERR_TASKSCHED_CANNOT_RENAME_NEW_BACKING_FILE.get(String
+ .valueOf(tmpFilePath), String.valueOf(backingFilePath),
stackTraceToSingleLineString(e));
- logError(message);
-
+ logger.error(message);
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_CANNOT_RENAME_NEW_TASK_FILE,
message);
@@ -1358,31 +1345,30 @@
catch (IOException ioe)
{
logger.traceException(ioe);
-
- LocalizableMessage message = ERR_TASKSCHED_CANNOT_WRITE_BACKING_FILE.get(
- tmpFilePath, stackTraceToSingleLineString(ioe));
- logError(message);
+ LocalizableMessage message =
+ ERR_TASKSCHED_CANNOT_WRITE_BACKING_FILE.get(tmpFilePath,
+ stackTraceToSingleLineString(ioe));
+ logger.error(message);
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_CANNOT_WRITE_TASK_FILE, message);
}
catch (LDIFException le)
{
logger.traceException(le);
-
-
- LocalizableMessage message = ERR_TASKSCHED_CANNOT_WRITE_BACKING_FILE.get(
- tmpFilePath, le.getMessage());
- logError(message);
+ LocalizableMessage message =
+ ERR_TASKSCHED_CANNOT_WRITE_BACKING_FILE.get(tmpFilePath, le
+ .getMessage());
+ logger.error(message);
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_CANNOT_WRITE_TASK_FILE, message);
}
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_TASKSCHED_CANNOT_WRITE_BACKING_FILE.get(
- tmpFilePath, stackTraceToSingleLineString(e));
- logError(message);
+ LocalizableMessage message =
+ ERR_TASKSCHED_CANNOT_WRITE_BACKING_FILE.get(tmpFilePath,
+ stackTraceToSingleLineString(e));
+ logger.error(message);
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_CANNOT_WRITE_TASK_FILE, message);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskThread.java b/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskThread.java
index 1944333..7656a6f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskThread.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskThread.java
@@ -33,7 +33,6 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.BackendMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
/**
@@ -185,15 +184,12 @@
{
Task task = getAssociatedTask();
- LocalizableMessage message = NOTE_TASK_STARTED.get(
- task.getDisplayName(), task.getTaskID());
- logError(message);
+ logger.info(NOTE_TASK_STARTED, task.getDisplayName(), task.getTaskID());
taskState = task.execute();
- message = NOTE_TASK_FINISHED.get(task.getDisplayName(),
+ logger.info(NOTE_TASK_FINISHED, task.getDisplayName(),
task.getTaskID(), taskState.getDisplayName());
- logError(message);
}
}
catch (Exception e)
@@ -202,10 +198,8 @@
Task task = getAssociatedTask();
- LocalizableMessage message = ERR_TASK_EXECUTE_FAILED.
- get(String.valueOf(task.getTaskEntry().getName()),
+ logger.error(ERR_TASK_EXECUTE_FAILED, String.valueOf(task.getTaskEntry().getName()),
stackTraceToSingleLineString(e));
- logError(message);
task.setTaskState(TaskState.STOPPED_BY_ERROR);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/DNConfigAttribute.java b/opendj3-server-dev/src/server/org/opends/server/config/DNConfigAttribute.java
index da66038..d4e98ab 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/DNConfigAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/DNConfigAttribute.java
@@ -44,7 +44,6 @@
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.config.ConfigConstants.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.loggers.ErrorLogger;
import static org.opends.messages.ConfigMessages.*;
/**
* This class defines a DN configuration attribute, which can hold zero or more
@@ -643,7 +642,7 @@
LocalizableMessage message = ERR_CONFIG_ATTR_DN_NULL.get(getName());
if (allowFailures)
{
- ErrorLogger.logError(message);
+ logger.error(message);
continue;
}
else
@@ -668,7 +667,7 @@
if (allowFailures)
{
- ErrorLogger.logError(message);
+ logger.error(message);
continue;
}
else
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/IntegerConfigAttribute.java b/opendj3-server-dev/src/server/org/opends/server/config/IntegerConfigAttribute.java
index d52d84a..3776ffe 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/IntegerConfigAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/IntegerConfigAttribute.java
@@ -44,7 +44,6 @@
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.config.ConfigConstants.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.loggers.ErrorLogger;
import static org.opends.messages.ConfigMessages.*;
/**
* This class defines an integer configuration attribute, which can hold zero or
@@ -894,7 +893,7 @@
if (allowFailures)
{
- ErrorLogger.logError(message);
+ logger.error(message);
continue;
}
else
@@ -911,7 +910,7 @@
getName(), longValue, lowerBound);
if (allowFailures)
{
- ErrorLogger.logError(message);
+ logger.error(message);
continue;
}
else
@@ -928,7 +927,7 @@
if (allowFailures)
{
- ErrorLogger.logError(message);
+ logger.error(message);
continue;
}
else
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java b/opendj3-server-dev/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java
index 4d0b4fa..a5fb689 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java
@@ -45,7 +45,6 @@
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.config.ConfigConstants.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.loggers.ErrorLogger;
import static org.opends.messages.ConfigMessages.*;
/**
* This class defines a configuration attribute that stores both an integer
@@ -791,7 +790,7 @@
LocalizableMessage message = ERR_CONFIG_ATTR_EMPTY_STRING_VALUE.get(getName());
if (allowFailures)
{
- ErrorLogger.logError(message);
+ logger.error(message);
continue;
}
else
@@ -810,7 +809,7 @@
if (allowFailures)
{
- ErrorLogger.logError(message);
+ logger.error(message);
continue;
}
else
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java b/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java
index 8a6623c..2c8a0d4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java
@@ -160,9 +160,7 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_CONFIG_JMX_CANNOT_REGISTER_MBEAN.get(
- configEntryDN.toString(), String.valueOf(e));
- logError(message);
+ logger.error(ERR_CONFIG_JMX_CANNOT_REGISTER_MBEAN, configEntryDN.toString(), String.valueOf(e));
}
return nameStr ;
}
@@ -209,9 +207,7 @@
logger.traceException(e);
e.printStackTrace();
- LocalizableMessage message = ERR_CONFIG_JMX_CANNOT_REGISTER_MBEAN.get(
- configEntryDN.toString(), String.valueOf(e));
- logError(message);
+ logger.error(ERR_CONFIG_JMX_CANNOT_REGISTER_MBEAN, configEntryDN.toString(), String.valueOf(e));
}
}
}
@@ -524,9 +520,8 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_CONFIG_JMX_ATTR_NO_ATTR.get(
- String.valueOf(configEntryDN), attributeName);
- logError(message);
+ LocalizableMessage message = ERR_CONFIG_JMX_ATTR_NO_ATTR.get(String.valueOf(configEntryDN), attributeName);
+ logger.error(message);
throw new AttributeNotFoundException(message.toString());
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java b/opendj3-server-dev/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java
index 5f3f227..bc44db2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java
@@ -44,7 +44,6 @@
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.config.ConfigConstants.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.loggers.ErrorLogger;
import static org.opends.messages.ConfigMessages.*;
/**
* This class defines a multi-choice configuration attribute, which can hold
@@ -696,7 +695,7 @@
LocalizableMessage message = ERR_CONFIG_ATTR_EMPTY_STRING_VALUE.get(getName());
if (allowFailures)
{
- ErrorLogger.logError(message);
+ logger.error(message);
continue;
}
else
@@ -711,7 +710,7 @@
valueString, getName());
if (allowFailures)
{
- ErrorLogger.logError(message);
+ logger.error(message);
continue;
}
else
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/StringConfigAttribute.java b/opendj3-server-dev/src/server/org/opends/server/config/StringConfigAttribute.java
index ae2680e..cff485f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/StringConfigAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/StringConfigAttribute.java
@@ -44,7 +44,6 @@
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.config.ConfigConstants.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.loggers.ErrorLogger;
import static org.opends.messages.ConfigMessages.*;
/**
* This class defines a string configuration attribute, which can hold zero or
@@ -625,7 +624,7 @@
if (allowFailures)
{
- ErrorLogger.logError(message);
+ logger.error(message);
continue;
}
else
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java
index accc543..df78442 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java
@@ -287,7 +287,7 @@
newHandler.initializeAccessControlHandler(null);
if(logMessage) {
LocalizableMessage message = WARN_CONFIG_AUTHZ_DISABLED.get();
- logError(message);
+ logger.warn(message);
if (currentConfiguration != null) {
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_ACCESS_CONTROL_DISABLED, message);
@@ -297,7 +297,7 @@
newHandler = loadHandler(handlerClassName, config, initHandler);
if(logMessage) {
LocalizableMessage message = NOTE_CONFIG_AUTHZ_ENABLED.get(handlerClassName);
- logError(message);
+ logger.info(message);
if (currentConfiguration != null) {
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_ACCESS_CONTROL_ENABLED, message);
@@ -442,8 +442,7 @@
Class<? extends AccessControlHandler> providerClass =
propertyDefinition.loadClass(className, AccessControlHandler.class);
AccessControlHandler<? extends AccessControlHandlerCfg> provider =
- (AccessControlHandler<? extends AccessControlHandlerCfg>)
- providerClass.newInstance();
+ providerClass.newInstance();
if (configuration != null)
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/AlertHandlerConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/AlertHandlerConfigManager.java
index eda56be..0094b76 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/AlertHandlerConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/AlertHandlerConfigManager.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.core;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -55,7 +56,6 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
-import org.opends.server.loggers.ErrorLogger;
/**
@@ -70,6 +70,9 @@
ConfigurationDeleteListener<AlertHandlerCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// A mapping between the DNs of the config entries and the associated alert
// handlers.
private ConcurrentHashMap<DN,AlertHandler> alertHandlers;
@@ -129,7 +132,7 @@
}
catch (InitializationException ie)
{
- ErrorLogger.logError(ie.getMessageObject());
+ logger.error(ie.getMessageObject());
continue;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java
index 51aa84e..55bf9f1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java
@@ -29,6 +29,7 @@
import java.lang.reflect.Method;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -54,7 +55,6 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -72,6 +72,9 @@
ConfigurationDeleteListener<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// A mapping between the DNs of the config entries and the associated
// attribute syntaxes.
private ConcurrentHashMap<DN,AttributeSyntax> syntaxes;
@@ -138,15 +141,14 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = WARN_CONFIG_SCHEMA_SYNTAX_CONFLICTING_SYNTAX.get(
- String.valueOf(syntaxConfiguration.dn()), de.getMessageObject());
- logError(message);
+ logger.warn(WARN_CONFIG_SCHEMA_SYNTAX_CONFLICTING_SYNTAX, String
+ .valueOf(syntaxConfiguration.dn()), de.getMessageObject());
continue;
}
}
catch (InitializationException ie)
{
- logError(ie.getMessageObject());
+ logger.error(ie.getMessageObject());
continue;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java
index 8c9de82..a50af28 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java
@@ -44,7 +44,6 @@
import org.opends.server.config.ConfigConstants;
import org.opends.server.types.*;
-import static org.opends.server.loggers.ErrorLogger.logError;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ConfigMessages.*;
@@ -167,9 +166,7 @@
// then log an error and skip it.
if (DirectoryServer.hasBackend(backendCfg.getBackendId()))
{
- LocalizableMessage message = WARN_CONFIG_BACKEND_DUPLICATE_BACKEND_ID.get(
- backendID, String.valueOf(backendDN));
- logError(message);
+ logger.warn(WARN_CONFIG_BACKEND_DUPLICATE_BACKEND_ID, backendID, String.valueOf(backendDN));
continue;
}
@@ -192,10 +189,8 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_CONFIG_BACKEND_CANNOT_INSTANTIATE.
- get(String.valueOf(className), String.valueOf(backendDN),
+ logger.error(ERR_CONFIG_BACKEND_CANNOT_INSTANTIATE, String.valueOf(className), String.valueOf(backendDN),
stackTraceToSingleLineString(e));
- logError(message);
continue;
}
@@ -241,9 +236,7 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
{
- LocalizableMessage message = ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK.get(
- backendID, String.valueOf(failureReason));
- logError(message);
+ logger.error(ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK, backendID, String.valueOf(failureReason));
// FIXME -- Do we need to send an admin alert?
continue;
}
@@ -252,9 +245,7 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK.get(
- backendID, stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK, backendID, stackTraceToSingleLineString(e));
// FIXME -- Do we need to send an admin alert?
continue;
}
@@ -269,10 +260,8 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_CONFIG_BACKEND_CANNOT_INITIALIZE.
- get(String.valueOf(className), String.valueOf(backendDN),
+ logger.error(ERR_CONFIG_BACKEND_CANNOT_INITIALIZE, String.valueOf(className), String.valueOf(backendDN),
stackTraceToSingleLineString(e));
- logError(message);
try
{
@@ -280,9 +269,7 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- message = WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.
- get(backendID, String.valueOf(failureReason));
- logError(message);
+ logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK, backendID, String.valueOf(failureReason));
// FIXME -- Do we need to send an admin alert?
}
}
@@ -290,9 +277,7 @@
{
logger.traceException(e2);
- message = WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.
- get(backendID, stackTraceToSingleLineString(e2));
- logError(message);
+ logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK, backendID, stackTraceToSingleLineString(e2));
// FIXME -- Do we need to send an admin alert?
}
@@ -317,9 +302,7 @@
{
logger.traceException(e);
- LocalizableMessage message = WARN_CONFIG_BACKEND_CANNOT_REGISTER_BACKEND.get(
- backendID, getExceptionMessage(e));
- logError(message);
+ logger.warn(WARN_CONFIG_BACKEND_CANNOT_REGISTER_BACKEND, backendID, getExceptionMessage(e));
// FIXME -- Do we need to send an admin alert?
}
@@ -333,9 +316,7 @@
{
// The backend is explicitly disabled. Log a mild warning and
// continue.
- LocalizableMessage message =
- INFO_CONFIG_BACKEND_DISABLED.get(String.valueOf(backendDN));
- logError(message);
+ logger.debug(INFO_CONFIG_BACKEND_DISABLED, String.valueOf(backendDN));
}
}
}
@@ -512,9 +493,8 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- LocalizableMessage message = WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.
- get(backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK,
+ backend.getBackendID(), String.valueOf(failureReason));
// FIXME -- Do we need to send an admin alert?
}
}
@@ -522,9 +502,8 @@
{
logger.traceException(e2);
- LocalizableMessage message = WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.
- get(backend.getBackendID(), stackTraceToSingleLineString(e2));
- logError(message);
+ logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK, backend
+ .getBackendID(), stackTraceToSingleLineString(e2));
// FIXME -- Do we need to send an admin alert?
}
@@ -674,9 +653,9 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
{
- LocalizableMessage message = ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK.get(
- backendID, String.valueOf(failureReason));
- logError(message);
+ LocalizableMessage message = ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK.get(backendID,
+ String.valueOf(failureReason));
+ logger.error(message);
// FIXME -- Do we need to send an admin alert?
resultCode = ResultCode.CONSTRAINT_VIOLATION;
@@ -690,9 +669,9 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK.get(
- backendID, stackTraceToSingleLineString(e));
- logError(message);
+ LocalizableMessage message = ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK.get(backendID,
+ stackTraceToSingleLineString(e));
+ logger.error(message);
// FIXME -- Do we need to send an admin alert?
resultCode = ResultCode.CONSTRAINT_VIOLATION;
@@ -722,9 +701,9 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- LocalizableMessage message = WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.
- get(backendID, String.valueOf(failureReason));
- logError(message);
+ LocalizableMessage message = WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.get(backendID,
+ String.valueOf(failureReason));
+ logger.warn(message);
// FIXME -- Do we need to send an admin alert?
}
}
@@ -732,9 +711,9 @@
{
logger.traceException(e2);
- LocalizableMessage message = WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.get(
- backendID, stackTraceToSingleLineString(e2));
- logError(message);
+ LocalizableMessage message = WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.get(backendID,
+ stackTraceToSingleLineString(e2));
+ logger.warn(message);
// FIXME -- Do we need to send an admin alert?
}
@@ -766,7 +745,7 @@
resultCode = DirectoryServer.getServerErrorResultCode();
messages.add(message);
- logError(message);
+ logger.warn(message);
// FIXME -- Do we need to send an admin alert?
return new ConfigChangeResult(resultCode, adminActionRequired,
@@ -897,9 +876,8 @@
{
// The backend is explicitly disabled. We will log a message to
// indicate that it won't be enabled and return.
- LocalizableMessage message =
- INFO_CONFIG_BACKEND_DISABLED.get(String.valueOf(backendDN));
- logError(message);
+ LocalizableMessage message = INFO_CONFIG_BACKEND_DISABLED.get(String.valueOf(backendDN));
+ logger.debug(message);
messages.add(message);
return new ConfigChangeResult(resultCode, adminActionRequired,
messages);
@@ -912,9 +890,9 @@
String backendID = cfg.getBackendId();
if (DirectoryServer.hasBackend(backendID))
{
- LocalizableMessage message = WARN_CONFIG_BACKEND_DUPLICATE_BACKEND_ID.get(
- String.valueOf(backendDN), backendID);
- logError(message);
+ LocalizableMessage message = WARN_CONFIG_BACKEND_DUPLICATE_BACKEND_ID.get(String.valueOf(backendDN),
+ backendID);
+ logger.warn(message);
messages.add(message);
return new ConfigChangeResult(resultCode, adminActionRequired,
messages);
@@ -988,9 +966,10 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
{
- LocalizableMessage message = ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK.get(
- backendID, String.valueOf(failureReason));
- logError(message);
+ LocalizableMessage message =
+ ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK.get(backendID, String
+ .valueOf(failureReason));
+ logger.error(message);
// FIXME -- Do we need to send an admin alert?
resultCode = ResultCode.CONSTRAINT_VIOLATION;
@@ -1006,7 +985,7 @@
LocalizableMessage message = ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK.get(
backendID, stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
// FIXME -- Do we need to send an admin alert?
resultCode = ResultCode.CONSTRAINT_VIOLATION;
@@ -1038,9 +1017,7 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- LocalizableMessage message = WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.get(
- backendID, String.valueOf(failureReason));
- logError(message);
+ logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK, backendID, String.valueOf(failureReason));
// FIXME -- Do we need to send an admin alert?
}
}
@@ -1048,9 +1025,7 @@
{
logger.traceException(e2);
- LocalizableMessage message = WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.get(
- backendID, stackTraceToSingleLineString(e2));
- logError(message);
+ logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK, backendID, stackTraceToSingleLineString(e2));
// FIXME -- Do we need to send an admin alert?
}
@@ -1082,7 +1057,7 @@
resultCode = DirectoryServer.getServerErrorResultCode();
messages.add(message);
- logError(message);
+ logger.error(message);
// FIXME -- Do we need to send an admin alert?
return new ConfigChangeResult(resultCode, adminActionRequired,
@@ -1185,9 +1160,8 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- LocalizableMessage message = WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.get(
- backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK, backend
+ .getBackendID(), String.valueOf(failureReason));
// FIXME -- Do we need to send an admin alert?
}
}
@@ -1195,9 +1169,8 @@
{
logger.traceException(e2);
- LocalizableMessage message = WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.get(
- backend.getBackendID(), stackTraceToSingleLineString(e2));
- logError(message);
+ logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK, backend
+ .getBackendID(), stackTraceToSingleLineString(e2));
// FIXME -- Do we need to send an admin alert?
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/CertificateMapperConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/CertificateMapperConfigManager.java
index 135f1d0..5c16ce6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/CertificateMapperConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/CertificateMapperConfigManager.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.core;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -52,7 +53,6 @@
import static org.opends.messages.ConfigMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
@@ -70,6 +70,9 @@
ConfigurationDeleteListener<CertificateMapperCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// A mapping between the DNs of the config entries and the associated
// certificate mappers.
private ConcurrentHashMap<DN,CertificateMapper> certificateMappers;
@@ -134,7 +137,7 @@
}
catch (InitializationException ie)
{
- logError(ie.getMessageObject());
+ logger.error(ie.getMessageObject());
continue;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java b/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
index f9862b8..8b013d7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
@@ -1004,7 +1004,7 @@
initializeJMX();
- logError(INFO_DIRECTORY_BOOTSTRAPPING.get());
+ logger.debug(INFO_DIRECTORY_BOOTSTRAPPING.get());
// Perform all the bootstrapping that is shared with the client-side
@@ -1252,7 +1252,7 @@
}
- logError(NOTE_DIRECTORY_SERVER_STARTING.get(getVersionString(),
+ logger.info(NOTE_DIRECTORY_SERVER_STARTING.get(getVersionString(),
BUILD_ID, REVISION_NUMBER));
// Acquire an exclusive lock for the Directory Server process.
@@ -1509,7 +1509,7 @@
isRunning = true;
LocalizableMessage message = NOTE_DIRECTORY_SERVER_STARTED.get();
- logError(message);
+ logger.info(message);
sendAlertNotification(this, ALERT_TYPE_SERVER_STARTED, message);
// Force the root connection to be initialized.
@@ -1595,10 +1595,8 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_CANNOT_BOOTSTRAP_MATCHING_RULE.
- get(currentFactory.getClass().getName(),
+ logger.error(ERR_CANNOT_BOOTSTRAP_MATCHING_RULE, currentFactory.getClass().getName(),
stackTraceToSingleLineString(e));
- logError(message);
}
}
@@ -1638,7 +1636,7 @@
{
logger.traceException(e);
- logError(ERR_CANNOT_BOOTSTRAP_SYNTAX.get(syntax.getClass().getName(),
+ logger.error(ERR_CANNOT_BOOTSTRAP_SYNTAX.get(syntax.getClass().getName(),
stackTraceToSingleLineString(e)));
}
return syntax;
@@ -2284,8 +2282,7 @@
// rollback to auto mode is failing too!!
// well, just log an error message and suggest the admin
// to restart the server with the last valid config...
- LocalizableMessage message = ERR_CONFIG_WORKFLOW_CANNOT_CONFIGURE_MANUAL.get();
- logError(message);
+ logger.error(ERR_CONFIG_WORKFLOW_CANNOT_CONFIGURE_MANUAL);
}
}
}
@@ -2311,8 +2308,7 @@
// rollback to auto mode is failing too!!
// well, just log an error message and suggest the admin
// to restart the server with the last valid config...
- LocalizableMessage message = ERR_CONFIG_WORKFLOW_CANNOT_CONFIGURE_AUTO.get();
- logError(message);
+ logger.error(ERR_CONFIG_WORKFLOW_CANNOT_CONFIGURE_AUTO);
}
}
}
@@ -4614,13 +4610,11 @@
}
- LocalizableMessage message = NOTE_SENT_ALERT_NOTIFICATION.get(
- generator.getClassName(), alertType,
+ logger.info(NOTE_SENT_ALERT_NOTIFICATION, generator.getClassName(), alertType,
alertMessage != null ?
alertMessage.resourceName()+"-"+alertMessage.ordinal():
"-1",
alertMessage);
- logError(message);
}
@@ -6196,7 +6190,7 @@
// that this registration has caused
if (warnings != null) {
for (LocalizableMessage warning : warnings) {
- logError(warning);
+ logger.error(warning);
}
}
@@ -6244,7 +6238,7 @@
// that this registration has caused
if (warnings != null) {
for (LocalizableMessage error : warnings) {
- logError(error);
+ logger.error(error);
}
}
@@ -6947,9 +6941,10 @@
{
// The port was already specified: this is a configuration error,
// log a message.
- LocalizableMessage message = ERR_HOST_PORT_ALREADY_SPECIFIED.get(
- c.getConnectionHandlerName(), listener.toString());
- logError(message);
+ LocalizableMessage message =
+ ERR_HOST_PORT_ALREADY_SPECIFIED.get(c.getConnectionHandlerName(),
+ listener.toString());
+ logger.error(message);
errorMessages.add(message);
}
@@ -6969,8 +6964,7 @@
// If there are no connection handlers log a message.
if (connectionHandlers.isEmpty())
{
- LocalizableMessage message = ERR_NOT_AVAILABLE_CONNECTION_HANDLERS.get();
- logError(message);
+ logger.error(ERR_NOT_AVAILABLE_CONNECTION_HANDLERS);
throw new ConfigException(ERR_ERROR_STARTING_CONNECTION_HANDLERS.get());
}
@@ -8067,9 +8061,8 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- message = WARN_SHUTDOWN_CANNOT_RELEASE_SHARED_BACKEND_LOCK.
- get(backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.warn(WARN_SHUTDOWN_CANNOT_RELEASE_SHARED_BACKEND_LOCK,
+ backend.getBackendID(), String.valueOf(failureReason));
// FIXME -- Do we need to send an admin alert?
}
}
@@ -8077,9 +8070,8 @@
{
logger.traceException(e2);
- message = WARN_SHUTDOWN_CANNOT_RELEASE_SHARED_BACKEND_LOCK.
- get(backend.getBackendID(), stackTraceToSingleLineString(e2));
- logError(message);
+ logger.warn(WARN_SHUTDOWN_CANNOT_RELEASE_SHARED_BACKEND_LOCK, backend
+ .getBackendID(), stackTraceToSingleLineString(e2));
// FIXME -- Do we need to send an admin alert?
}
}
@@ -8103,8 +8095,7 @@
try {
if (!LockFileManager.releaseLock(serverLockFileName,
failureReason)) {
- message = NOTE_SERVER_SHUTDOWN.get(className, failureReason);
- logError(message);
+ logger.info(NOTE_SERVER_SHUTDOWN, className, failureReason);
}
} catch (Exception e) {
logger.traceException(e);
@@ -8122,7 +8113,7 @@
// Log a final message indicating that the server is stopped (which should
// be true for all practical purposes), and then shut down all the error
// loggers.
- logError(NOTE_SERVER_STOPPED.get());
+ logger.info(NOTE_SERVER_STOPPED.get());
removeAllAccessLogPublishers();
removeAllErrorLogPublishers();
@@ -8752,7 +8743,7 @@
if (lockdownMode)
{
LocalizableMessage message = WARN_DIRECTORY_SERVER_ENTERING_LOCKDOWN_MODE.get();
- logError(message);
+ logger.warn(message);
sendAlertNotification(directoryServer, ALERT_TYPE_ENTERING_LOCKDOWN_MODE,
message);
@@ -8760,7 +8751,7 @@
else
{
LocalizableMessage message = NOTE_DIRECTORY_SERVER_LEAVING_LOCKDOWN_MODE.get();
- logError(message);
+ logger.info(message);
sendAlertNotification(directoryServer, ALERT_TYPE_LEAVING_LOCKDOWN_MODE,
message);
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java
index dd43c90..64518cb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java
@@ -63,7 +63,6 @@
import org.opends.server.monitors.EntryCacheMonitorProvider;
import org.opends.server.types.DN;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -173,7 +172,7 @@
} catch (Exception e) {
logger.traceException(e);
- logError(WARN_CONFIG_ENTRYCACHE_NO_CONFIG_ENTRY.get());
+ logger.warn(WARN_CONFIG_ENTRYCACHE_NO_CONFIG_ENTRY.get());
return;
}
@@ -182,7 +181,7 @@
// no entry cache defined below it.
if (entryCacheBase == null)
{
- logError(WARN_CONFIG_ENTRYCACHE_NO_CONFIG_ENTRY.get());
+ logger.error(WARN_CONFIG_ENTRYCACHE_NO_CONFIG_ENTRY.get());
return;
}
@@ -200,7 +199,7 @@
if (!cacheOrderMap.isEmpty()) {
if (cacheOrderMap.containsKey(configuration.getCacheLevel())) {
// Log error and skip this cache.
- logError(ERR_CONFIG_ENTRYCACHE_CONFIG_LEVEL_NOT_ACCEPTABLE.get(
+ logger.error(ERR_CONFIG_ENTRYCACHE_CONFIG_LEVEL_NOT_ACCEPTABLE.get(
String.valueOf(configuration.dn()),
configuration.getCacheLevel()));
continue;
@@ -215,7 +214,7 @@
try {
loadAndInstallEntryCache(className, configuration);
} catch (InitializationException ie) {
- logError(ie.getMessageObject());
+ logger.error(ie.getMessageObject());
}
}
}
@@ -235,9 +234,7 @@
} catch (UnsupportedOperationException ex) {
// Some backend implementations might not support entry
// cache preload. Log a warning and continue.
- LocalizableMessage message = WARN_CACHE_PRELOAD_BACKEND_FAILED.get(
- backend.getBackendID());
- logError(message);
+ logger.warn(WARN_CACHE_PRELOAD_BACKEND_FAILED, backend.getBackendID());
continue;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/ExtensionConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/ExtensionConfigManager.java
index f68f2c7..3ae3f83 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/ExtensionConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/ExtensionConfigManager.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.core;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -52,7 +53,6 @@
import static org.opends.messages.ConfigMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
@@ -70,6 +70,9 @@
ConfigurationDeleteListener<ExtensionCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// A mapping between the DNs of the config entries and the associated
// extensions.
private ConcurrentHashMap<DN,Extension> extensions;
@@ -134,7 +137,7 @@
}
catch (InitializationException ie)
{
- logError(ie.getMessageObject());
+ logger.error(ie.getMessageObject());
continue;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java b/opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java
index b3f1854..8c8a311 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java
@@ -59,7 +59,6 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.CoreMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -187,7 +186,7 @@
catch (InitializationException ie)
{
// Log error but keep going
- logError(ie.getMessageObject());
+ logger.error(ie.getMessageObject());
}
}
}
@@ -590,7 +589,7 @@
filter = groupImplementation.getGroupDefinitionFilter();
if (backend.getEntryCount() > 0 && ! backend.isIndexed(filter))
{
- logError(WARN_GROUP_FILTER_NOT_INDEXED.get(String.valueOf(filter),
+ logger.warn(WARN_GROUP_FILTER_NOT_INDEXED.get(String.valueOf(filter),
String.valueOf(configEntryDN), backend.getBackendID()));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java
index c4c0309..c88d9c8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.core;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -52,7 +53,6 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -71,6 +71,9 @@
ConfigurationDeleteListener<IdentityMapperCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// A mapping between the DNs of the config entries and the associated identity
// mappers.
private ConcurrentHashMap<DN,IdentityMapper> identityMappers;
@@ -134,7 +137,7 @@
}
catch (InitializationException ie)
{
- logError(ie.getMessageObject());
+ logger.error(ie.getMessageObject());
continue;
}
}
@@ -147,12 +150,11 @@
DN mapperDN = DirectoryServer.getProxiedAuthorizationIdentityMapperDN();
if (mapperDN == null)
{
- logError(ERR_CONFIG_IDMAPPER_NO_PROXY_MAPPER_DN.get());
+ logger.error(ERR_CONFIG_IDMAPPER_NO_PROXY_MAPPER_DN.get());
}
else if (! identityMappers.containsKey(mapperDN))
{
- logError(ERR_CONFIG_IDMAPPER_INVALID_PROXY_MAPPER_DN.get(
- String.valueOf(mapperDN)));
+ logger.error(ERR_CONFIG_IDMAPPER_INVALID_PROXY_MAPPER_DN.get(String.valueOf(mapperDN)));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/IdleTimeLimitThread.java b/opendj3-server-dev/src/server/org/opends/server/core/IdleTimeLimitThread.java
index 865f5cb..8ba8213 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/IdleTimeLimitThread.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/IdleTimeLimitThread.java
@@ -36,7 +36,6 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.DisconnectReason;
-import org.opends.server.loggers.ErrorLogger;
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -139,11 +138,9 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_IDLETIME_DISCONNECT_ERROR.get(
- c.getConnectionID(),
+ logger.error(ERR_IDLETIME_DISCONNECT_ERROR, c.getConnectionID(),
stackTraceToSingleLineString(e)
);
- ErrorLogger.logError(message);
}
}
else
@@ -163,9 +160,7 @@
{
logger.traceException(e);
- LocalizableMessage message =
- ERR_IDLETIME_UNEXPECTED_ERROR.get(stackTraceToSingleLineString(e));
- ErrorLogger.logError(message);
+ logger.error(ERR_IDLETIME_UNEXPECTED_ERROR, stackTraceToSingleLineString(e));
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
index 043850d..e9a7f7a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.core;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -52,7 +53,6 @@
import static org.opends.messages.ConfigMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
@@ -70,6 +70,9 @@
ConfigurationDeleteListener<KeyManagerProviderCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// A mapping between the DNs of the config entries and the associated key
// manager providers.
private ConcurrentHashMap<DN,KeyManagerProvider> providers;
@@ -134,7 +137,7 @@
}
catch (InitializationException ie)
{
- logError(ie.getMessageObject());
+ logger.error(ie.getMessageObject());
continue;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/LoggerConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/LoggerConfigManager.java
index 82de250..92b3161 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/LoggerConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/LoggerConfigManager.java
@@ -27,8 +27,7 @@
package org.opends.server.core;
import static org.opends.messages.ConfigMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
-
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.ArrayList;
import java.util.List;
@@ -64,6 +63,9 @@
ConfigurationDeleteListener<LogPublisherCfg>
{
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
+
private final ServerContext serverContext;
/**
@@ -146,11 +148,11 @@
// disable all debug loggers.
if (accessPublisherCfgs.isEmpty())
{
- logError(WARN_CONFIG_LOGGER_NO_ACTIVE_ACCESS_LOGGERS.get());
+ logger.warn(WARN_CONFIG_LOGGER_NO_ACTIVE_ACCESS_LOGGERS.get());
}
if (errorPublisherCfgs.isEmpty())
{
- logError(WARN_CONFIG_LOGGER_NO_ACTIVE_ERROR_LOGGERS.get());
+ logger.warn(WARN_CONFIG_LOGGER_NO_ACTIVE_ERROR_LOGGERS.get());
}
DebugLogger.getInstance().initializeLogger(debugPublisherCfgs, serverContext);
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java
index e2d16cd..16c2f93 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.core;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -63,7 +64,6 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
-import org.opends.server.loggers.ErrorLogger;
/**
@@ -78,6 +78,9 @@
ConfigurationDeleteListener<MatchingRuleCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// A mapping between the DNs of the config entries and the associated matching
// rule Factories.
private ConcurrentHashMap<DN,MatchingRuleFactory> matchingRuleFactories;
@@ -146,15 +149,14 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = WARN_CONFIG_SCHEMA_MR_CONFLICTING_MR.get(
- String.valueOf(mrConfiguration.dn()), de.getMessageObject());
- ErrorLogger.logError(message);
+ logger.warn(WARN_CONFIG_SCHEMA_MR_CONFLICTING_MR, String
+ .valueOf(mrConfiguration.dn()), de.getMessageObject());
continue;
}
}
catch (InitializationException ie)
{
- ErrorLogger.logError(ie.getMessageObject());
+ logger.error(ie.getMessageObject());
continue;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/MonitorConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/MonitorConfigManager.java
index 0055f87..41fb994 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/MonitorConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/MonitorConfigManager.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.core;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -50,8 +51,6 @@
import org.opends.server.types.ResultCode;
import static org.opends.messages.ConfigMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
-
import static org.opends.server.util.StaticUtils.*;
@@ -68,6 +67,9 @@
ConfigurationDeleteListener<MonitorProviderCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// A mapping between the DNs of the config entries and the associated monitor
// providers.
private ConcurrentHashMap<DN,MonitorProvider<?>> monitors;
@@ -130,7 +132,7 @@
}
catch (InitializationException ie)
{
- logError(ie.getMessageObject());
+ logger.error(ie.getMessageObject());
continue;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java
index 0fac481..604f8f2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.core;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -52,7 +53,6 @@
import static org.opends.messages.ConfigMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
@@ -70,6 +70,9 @@
ConfigurationChangeListener<PasswordGeneratorCfg>
{
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
+
// A mapping between the DNs of the config entries and the associated password
// generators.
private ConcurrentHashMap<DN,PasswordGenerator> passwordGenerators;
@@ -133,7 +136,7 @@
}
catch (InitializationException ie)
{
- logError(ie.getMessageObject());
+ logger.error(ie.getMessageObject());
continue;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
index 197b0d8..56211b6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
@@ -29,7 +29,6 @@
import static org.opends.messages.ConfigMessages.*;
-import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
import java.lang.reflect.InvocationTargetException;
@@ -160,10 +159,8 @@
{
// Just log a message instead of failing the server initialization.
// This will allow the administrator to fix any problems.
- LocalizableMessage message = ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(
- String.valueOf(subentry.getDN()),
+ logger.error(ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG, String.valueOf(subentry.getDN()),
stackTraceToSingleLineString(e));
- logError(message);
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java b/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java
index 230e426..aaa22ea 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java
@@ -35,7 +35,6 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.admin.std.meta.PasswordPolicyCfgDefn;
import org.opends.server.api.*;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.LDAPAttribute;
@@ -3664,7 +3663,7 @@
(passwordPolicy.getStateUpdateFailurePolicy() ==
PasswordPolicyCfgDefn.StateUpdateFailurePolicy.IGNORE)))
{
- ErrorLogger.logError(message);
+ logger.error(message);
}
else
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/PasswordValidatorConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
index 735aa59..63f6682 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.core;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -51,8 +52,6 @@
import org.opends.server.types.ResultCode;
import static org.opends.messages.ConfigMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
-
import static org.opends.server.util.StaticUtils.*;
@@ -70,6 +69,9 @@
ConfigurationDeleteListener<PasswordValidatorCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// A mapping between the DNs of the config entries and the associated
// password validators.
private ConcurrentHashMap<DN,PasswordValidator> passwordValidators;
@@ -135,7 +137,7 @@
}
catch (InitializationException ie)
{
- logError(ie.getMessageObject());
+ logger.error(ie.getMessageObject());
continue;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java
index 292d207..8083861 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java
@@ -53,7 +53,6 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.PluginMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
@@ -312,7 +311,7 @@
}
catch (InitializationException ie)
{
- logError(ie.getMessageObject());
+ logger.error(ie.getMessageObject());
continue;
}
}
@@ -955,7 +954,7 @@
{
LocalizableMessage message = WARN_CONFIG_PLUGIN_EMPTY_ELEMENT_IN_ORDER.get(
pluginType.getName());
- logError(message);
+ logger.warn(message);
}
}
else if (token.equals("*"))
@@ -969,7 +968,7 @@
{
LocalizableMessage message = WARN_CONFIG_PLUGIN_MULTIPLE_WILDCARDS_IN_ORDER.
get(pluginType.getName());
- logError(message);
+ logger.warn(message);
}
}
else
@@ -992,7 +991,7 @@
{
LocalizableMessage message = WARN_CONFIG_PLUGIN_LISTED_MULTIPLE_TIMES.get(
pluginType.getName(), token);
- logError(message);
+ logger.warn(message);
}
}
@@ -1009,7 +1008,7 @@
{
LocalizableMessage message = WARN_CONFIG_PLUGIN_LISTED_MULTIPLE_TIMES.get(
pluginType.getName(), token);
- logError(message);
+ logger.warn(message);
}
}
@@ -1027,7 +1026,7 @@
{
LocalizableMessage message =
WARN_CONFIG_PLUGIN_ORDER_NO_WILDCARD.get(pluginType.getName());
- logError(message);
+ logger.warn(message);
}
}
@@ -1468,7 +1467,7 @@
{
LocalizableMessage message = ERR_PLUGIN_STARTUP_PLUGIN_RETURNED_NULL.get(
String.valueOf(p.getPluginEntryDN()));
- logError(message);
+ logger.error(message);
return PluginResult.Startup.stopStartup(message);
}
else if (! result.continueProcessing())
@@ -1477,7 +1476,7 @@
get(String.valueOf(p.getPluginEntryDN()),
result.getErrorMessage(),
result.getErrorMessage().ordinal());
- logError(message);
+ logger.error(message);
return result;
}
}
@@ -1515,7 +1514,7 @@
LocalizableMessage message = ERR_PLUGIN_SHUTDOWN_PLUGIN_EXCEPTION.
get(String.valueOf(p.getPluginEntryDN()),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
}
}
@@ -1550,7 +1549,7 @@
clientConnection.getConnectionID(),
clientConnection.getClientAddress(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
return PluginResult.PostConnect.disconnectClient(
DisconnectReason.SERVER_ERROR, true, message);
@@ -1563,7 +1562,7 @@
get(String.valueOf(p.getPluginEntryDN()),
clientConnection.getConnectionID(),
clientConnection.getClientAddress());
- logError(message);
+ logger.error(message);
return PluginResult.PostConnect.disconnectClient(
DisconnectReason.SERVER_ERROR, true, message);
@@ -1621,7 +1620,7 @@
clientConnection.getConnectionID(),
clientConnection.getClientAddress(),
stackTraceToSingleLineString(e));
- logError(msg);
+ logger.error(msg);
}
@@ -1631,7 +1630,7 @@
get(String.valueOf(p.getPluginEntryDN()),
clientConnection.getConnectionID(),
clientConnection.getClientAddress());
- logError(msg);
+ logger.error(msg);
}
else if (! result.continuePluginProcessing())
{
@@ -1680,7 +1679,7 @@
get(String.valueOf(p.getPluginEntryDN()),
String.valueOf(entry.getName()),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
return PluginResult.ImportLDIF.stopEntryProcessing(message);
}
@@ -1690,7 +1689,7 @@
LocalizableMessage message = ERR_PLUGIN_LDIF_IMPORT_PLUGIN_RETURNED_NULL.
get(String.valueOf(p.getPluginEntryDN()),
String.valueOf(entry.getName()));
- logError(message);
+ logger.error(message);
return PluginResult.ImportLDIF.stopEntryProcessing(message);
}
@@ -1777,7 +1776,7 @@
get(String.valueOf(p.getPluginEntryDN()),
String.valueOf(entry.getName()),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
return PluginResult.ImportLDIF.stopEntryProcessing(message);
}
@@ -1787,7 +1786,7 @@
LocalizableMessage message = ERR_PLUGIN_LDIF_EXPORT_PLUGIN_RETURNED_NULL.
get(String.valueOf(p.getPluginEntryDN()),
String.valueOf(entry.getName()));
- logError(message);
+ logger.error(message);
return PluginResult.ImportLDIF.stopEntryProcessing(message);
}
@@ -1871,7 +1870,7 @@
.getOperationName(), String.valueOf(plugin.getPluginEntryDN()),
operation.getConnectionID(), operation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
return PluginResult.PreParse.stopProcessing(DirectoryServer
.getServerErrorResultCode(), message);
@@ -1885,7 +1884,7 @@
.getOperationType().getOperationName(), String.valueOf(plugin
.getPluginEntryDN()), operation.getConnectionID(), String
.valueOf(operation.getOperationID()));
- logError(message);
+ logger.error(message);
return PluginResult.PreParse.stopProcessing(DirectoryServer
.getServerErrorResultCode(), message);
@@ -2670,7 +2669,7 @@
.getOperationType().getOperationName(), String.valueOf(plugin
.getPluginEntryDN()), operation.getConnectionID(), operation
.getOperationID(), stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
registerSkippedPreOperationPlugins(i, plugins, operation);
@@ -2687,7 +2686,7 @@
.getOperationType().getOperationName(), String.valueOf(plugin
.getPluginEntryDN()), operation.getConnectionID(), operation
.getOperationID());
- logError(message);
+ logger.error(message);
registerSkippedPreOperationPlugins(i, plugins, operation);
@@ -2995,7 +2994,7 @@
abandonOperation.getConnectionID(),
abandonOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
if (result == null)
@@ -3005,7 +3004,7 @@
String.valueOf(p.getPluginEntryDN()),
abandonOperation.getConnectionID(),
abandonOperation.getOperationID());
- logError(message);
+ logger.error(message);
}
else if (!result.continueProcessing())
{
@@ -3079,7 +3078,7 @@
String.valueOf(p.getPluginEntryDN()),
addOperation.getConnectionID(), addOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
if (result == null)
@@ -3088,7 +3087,7 @@
get(addOperation.getOperationType().getOperationName(),
String.valueOf(p.getPluginEntryDN()),
addOperation.getConnectionID(), addOperation.getOperationID());
- logError(message);
+ logger.error(message);
}
else if (!result.continueProcessing())
{
@@ -3162,7 +3161,7 @@
String.valueOf(p.getPluginEntryDN()),
bindOperation.getConnectionID(), bindOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
if (result == null)
@@ -3172,7 +3171,7 @@
String.valueOf(p.getPluginEntryDN()),
bindOperation.getConnectionID(),
bindOperation.getOperationID());
- logError(message);
+ logger.error(message);
}
else if (!result.continueProcessing())
{
@@ -3247,7 +3246,7 @@
compareOperation.getConnectionID(),
compareOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
if (result == null)
@@ -3257,7 +3256,7 @@
String.valueOf(p.getPluginEntryDN()),
compareOperation.getConnectionID(),
compareOperation.getOperationID());
- logError(message);
+ logger.error(message);
}
else if (!result.continueProcessing())
{
@@ -3332,7 +3331,7 @@
deleteOperation.getConnectionID(),
deleteOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
if (result == null)
@@ -3342,7 +3341,7 @@
String.valueOf(p.getPluginEntryDN()),
deleteOperation.getConnectionID(),
deleteOperation.getOperationID());
- logError(message);
+ logger.error(message);
}
else if (!result.continueProcessing())
{
@@ -3417,7 +3416,7 @@
extendedOperation.getConnectionID(),
extendedOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
if (result == null)
@@ -3427,7 +3426,7 @@
String.valueOf(p.getPluginEntryDN()),
extendedOperation.getConnectionID(),
extendedOperation.getOperationID());
- logError(message);
+ logger.error(message);
}
else if (!result.continueProcessing())
{
@@ -3502,7 +3501,7 @@
modifyOperation.getConnectionID(),
modifyOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
if (result == null)
@@ -3512,7 +3511,7 @@
String.valueOf(p.getPluginEntryDN()),
modifyOperation.getConnectionID(),
modifyOperation.getOperationID());
- logError(message);
+ logger.error(message);
}
else if (!result.continueProcessing())
{
@@ -3586,7 +3585,7 @@
modifyDNOperation.getConnectionID(),
modifyDNOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
if (result == null)
@@ -3596,7 +3595,7 @@
String.valueOf(p.getPluginEntryDN()),
modifyDNOperation.getConnectionID(),
modifyDNOperation.getOperationID());
- logError(message);
+ logger.error(message);
}
else if (!result.continueProcessing())
{
@@ -3671,7 +3670,7 @@
searchOperation.getConnectionID(),
searchOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
if (result == null)
@@ -3681,7 +3680,7 @@
String.valueOf(p.getPluginEntryDN()),
searchOperation.getConnectionID(),
searchOperation.getOperationID());
- logError(message);
+ logger.error(message);
}
else if (!result.continueProcessing())
{
@@ -3756,7 +3755,7 @@
unbindOperation.getConnectionID(),
unbindOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
if (result == null)
@@ -3766,7 +3765,7 @@
String.valueOf(p.getPluginEntryDN()),
unbindOperation.getConnectionID(),
unbindOperation.getOperationID());
- logError(message);
+ logger.error(message);
}
else if (!result.continueProcessing())
{
@@ -3831,7 +3830,7 @@
String.valueOf(p.getPluginEntryDN()),
addOperation.getConnectionID(), addOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
if (result == null)
@@ -3840,7 +3839,7 @@
get(addOperation.getOperationType().getOperationName(),
String.valueOf(p.getPluginEntryDN()),
addOperation.getConnectionID(), addOperation.getOperationID());
- logError(message);
+ logger.error(message);
}
else if (!result.continuePluginProcessing())
{
@@ -3895,7 +3894,7 @@
String.valueOf(p.getPluginEntryDN()),
bindOperation.getConnectionID(), bindOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
if (result == null)
@@ -3905,7 +3904,7 @@
String.valueOf(p.getPluginEntryDN()),
bindOperation.getConnectionID(),
bindOperation.getOperationID());
- logError(message);
+ logger.error(message);
}
else if (!result.continuePluginProcessing())
{
@@ -3961,7 +3960,7 @@
compareOperation.getConnectionID(),
compareOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
if (result == null)
@@ -3971,7 +3970,7 @@
String.valueOf(p.getPluginEntryDN()),
compareOperation.getConnectionID(),
compareOperation.getOperationID());
- logError(message);
+ logger.error(message);
}
else if (!result.continuePluginProcessing())
{
@@ -4027,7 +4026,7 @@
deleteOperation.getConnectionID(),
deleteOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
if (result == null)
@@ -4037,7 +4036,7 @@
String.valueOf(p.getPluginEntryDN()),
deleteOperation.getConnectionID(),
deleteOperation.getOperationID());
- logError(message);
+ logger.error(message);
}
else if (!result.continuePluginProcessing())
{
@@ -4092,7 +4091,7 @@
extendedOperation.getConnectionID(),
extendedOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
if (result == null)
@@ -4102,7 +4101,7 @@
String.valueOf(p.getPluginEntryDN()),
extendedOperation.getConnectionID(),
extendedOperation.getOperationID());
- logError(message);
+ logger.error(message);
}
else if (!result.continuePluginProcessing())
{
@@ -4158,7 +4157,7 @@
modifyOperation.getConnectionID(),
modifyOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
if (result == null)
@@ -4168,7 +4167,7 @@
String.valueOf(p.getPluginEntryDN()),
modifyOperation.getConnectionID(),
modifyOperation.getOperationID());
- logError(message);
+ logger.error(message);
}
else if (!result.continuePluginProcessing())
{
@@ -4224,7 +4223,7 @@
modifyDNOperation.getConnectionID(),
modifyDNOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
if (result == null)
@@ -4234,7 +4233,7 @@
String.valueOf(p.getPluginEntryDN()),
modifyDNOperation.getConnectionID(),
modifyDNOperation.getOperationID());
- logError(message);
+ logger.error(message);
}
else if (!result.continuePluginProcessing())
{
@@ -4290,7 +4289,7 @@
searchOperation.getConnectionID(),
searchOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
if (result == null)
@@ -4300,7 +4299,7 @@
String.valueOf(p.getPluginEntryDN()),
searchOperation.getConnectionID(),
searchOperation.getOperationID());
- logError(message);
+ logger.error(message);
}
else if (!result.continuePluginProcessing())
{
@@ -4345,7 +4344,7 @@
String.valueOf(p.getPluginEntryDN()),
addOperation.getConnectionID(), addOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
}
}
@@ -4378,7 +4377,7 @@
deleteOperation.getConnectionID(),
deleteOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
}
}
@@ -4411,7 +4410,7 @@
modifyOperation.getConnectionID(),
modifyOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
}
}
@@ -4444,7 +4443,7 @@
modifyDNOperation.getConnectionID(),
modifyDNOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
}
}
}
@@ -4489,7 +4488,7 @@
searchOperation.getOperationID(),
String.valueOf(searchEntry.getName()),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
return PluginResult.IntermediateResponse.stopProcessing(false,
DirectoryServer.getServerErrorResultCode(), message);
@@ -4502,7 +4501,7 @@
searchOperation.getConnectionID(),
searchOperation.getOperationID(),
String.valueOf(searchEntry.getName()));
- logError(message);
+ logger.error(message);
return PluginResult.IntermediateResponse.stopProcessing(false,
DirectoryServer.getServerErrorResultCode(), message);
@@ -4564,7 +4563,7 @@
searchOperation.getOperationID(),
searchReference.getReferralURLString(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
return PluginResult.IntermediateResponse.stopProcessing(false,
DirectoryServer.getServerErrorResultCode(), message);
@@ -4577,7 +4576,7 @@
searchOperation.getConnectionID(),
searchOperation.getOperationID(),
searchReference.getReferralURLString());
- logError(message);
+ logger.error(message);
return PluginResult.IntermediateResponse.stopProcessing(false,
DirectoryServer.getServerErrorResultCode(), message);
@@ -4645,7 +4644,7 @@
modifyDNOperation.getConnectionID(),
modifyDNOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
return PluginResult.SubordinateModifyDN.stopProcessing(
DirectoryServer.getServerErrorResultCode(), message);
@@ -4658,7 +4657,7 @@
String.valueOf(p.getPluginEntryDN()),
modifyDNOperation.getConnectionID(),
String.valueOf(modifyDNOperation.getOperationID()));
- logError(message);
+ logger.error(message);
return PluginResult.SubordinateModifyDN.stopProcessing(
DirectoryServer.getServerErrorResultCode(), message);
@@ -4718,7 +4717,7 @@
deleteOperation.getConnectionID(),
deleteOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
return PluginResult.SubordinateDelete.stopProcessing(
DirectoryServer.getServerErrorResultCode(), message);
@@ -4731,7 +4730,7 @@
String.valueOf(p.getPluginEntryDN()),
deleteOperation.getConnectionID(),
String.valueOf(deleteOperation.getOperationID()));
- logError(message);
+ logger.error(message);
return PluginResult.SubordinateDelete.stopProcessing(
DirectoryServer.getServerErrorResultCode(), message);
@@ -4784,7 +4783,7 @@
get(String.valueOf(p.getPluginEntryDN()),
operation.getConnectionID(), operation.getOperationID(),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
return PluginResult.IntermediateResponse.stopProcessing
(false, DirectoryServer.getServerErrorResultCode(), message);
@@ -4795,7 +4794,7 @@
LocalizableMessage message = ERR_PLUGIN_INTERMEDIATE_RESPONSE_PLUGIN_RETURNED_NULL.
get(String.valueOf(p.getPluginEntryDN()),
operation.getConnectionID(), operation.getOperationID());
- logError(message);
+ logger.error(message);
return PluginResult.IntermediateResponse.stopProcessing
(false, DirectoryServer.getServerErrorResultCode(), message);
@@ -4809,7 +4808,8 @@
if (result == null)
{
// This should only happen if there were no intermediate response plugins
- // registered, which is fine.
+ // registered, which is fine.WARN
+
result =
PluginResult.IntermediateResponse.continueOperationProcessing(true);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/SASLConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/SASLConfigManager.java
index c125aac..700f3eb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/SASLConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/SASLConfigManager.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.core;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -55,7 +56,6 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
-import org.opends.server.loggers.ErrorLogger;
/**
@@ -71,6 +71,9 @@
ConfigurationDeleteListener<SASLMechanismHandlerCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// A mapping between the DNs of the config entries and the
// associated SASL
// mechanism handlers.
@@ -136,7 +139,7 @@
}
catch (InitializationException ie)
{
- ErrorLogger.logError(ie.getMessageObject());
+ logger.error(ie.getMessageObject());
continue;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/SchemaConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/SchemaConfigManager.java
index c48cf2b..26d00c5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/SchemaConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/SchemaConfigManager.java
@@ -43,7 +43,6 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -377,7 +376,7 @@
}
else
{
- logError(message);
+ logger.error(message);
return null;
}
}
@@ -409,7 +408,7 @@
}
else
{
- logError(message);
+ logger.error(message);
StaticUtils.close(reader);
return null;
}
@@ -421,18 +420,14 @@
Entry e = reader.readEntry(false);
if (e != null)
{
- LocalizableMessage message = WARN_CONFIG_SCHEMA_MULTIPLE_ENTRIES_IN_FILE.get(
- schemaFile, schemaDirPath);
- logError(message);
+ logger.warn(WARN_CONFIG_SCHEMA_MULTIPLE_ENTRIES_IN_FILE, schemaFile, schemaDirPath);
}
}
catch (Exception e)
{
logger.traceException(e);
- LocalizableMessage message = WARN_CONFIG_SCHEMA_UNPARSEABLE_EXTRA_DATA_IN_FILE.get(
- schemaFile, schemaDirPath, getExceptionMessage(e));
- logError(message);
+ logger.warn(WARN_CONFIG_SCHEMA_UNPARSEABLE_EXTRA_DATA_IN_FILE, schemaFile, schemaDirPath, getExceptionMessage(e));
}
finally
{
@@ -770,7 +765,7 @@
}
else
{
- logError(message);
+ logger.error(message);
continue;
}
}
@@ -788,7 +783,7 @@
}
else
{
- logError(message);
+ logger.error(message);
continue;
}
}
@@ -805,9 +800,7 @@
{
logger.traceException(de);
- LocalizableMessage message = WARN_CONFIG_SCHEMA_CONFLICTING_LDAP_SYNTAX.get(
- schemaFile, de.getMessageObject());
- logError(message);
+ logger.warn(WARN_CONFIG_SCHEMA_CONFLICTING_LDAP_SYNTAX, schemaFile, de.getMessageObject());
try
{
@@ -857,7 +850,7 @@
}
else
{
- logError(message);
+ logger.error(message);
continue;
}
}
@@ -874,7 +867,7 @@
}
else
{
- logError(message);
+ logger.error(message);
continue;
}
}
@@ -890,9 +883,7 @@
{
logger.traceException(de);
- LocalizableMessage message = WARN_CONFIG_SCHEMA_CONFLICTING_ATTR_TYPE.get(
- schemaFile, de.getMessageObject());
- logError(message);
+ logger.warn(WARN_CONFIG_SCHEMA_CONFLICTING_ATTR_TYPE, schemaFile, de.getMessageObject());
try
{
@@ -943,7 +934,7 @@
}
else
{
- logError(message);
+ logger.error(message);
continue;
}
}
@@ -961,7 +952,7 @@
}
else
{
- logError(message);
+ logger.error(message);
continue;
}
}
@@ -977,9 +968,7 @@
{
logger.traceException(de);
- LocalizableMessage message = WARN_CONFIG_SCHEMA_CONFLICTING_OC.get(
- schemaFile, de.getMessageObject());
- logError(message);
+ logger.warn(WARN_CONFIG_SCHEMA_CONFLICTING_OC, schemaFile, de.getMessageObject());
try
{
@@ -1027,7 +1016,7 @@
}
else
{
- logError(message);
+ logger.error(message);
continue;
}
}
@@ -1045,7 +1034,7 @@
}
else
{
- logError(message);
+ logger.error(message);
continue;
}
}
@@ -1061,9 +1050,7 @@
{
logger.traceException(de);
- LocalizableMessage message = WARN_CONFIG_SCHEMA_CONFLICTING_NAME_FORM.get(
- schemaFile, de.getMessageObject());
- logError(message);
+ logger.warn(WARN_CONFIG_SCHEMA_CONFLICTING_NAME_FORM, schemaFile, de.getMessageObject());
try
{
@@ -1113,7 +1100,7 @@
}
else
{
- logError(message);
+ logger.error(message);
continue;
}
}
@@ -1131,7 +1118,7 @@
}
else
{
- logError(message);
+ logger.error(message);
continue;
}
}
@@ -1147,9 +1134,7 @@
{
logger.traceException(de);
- LocalizableMessage message = WARN_CONFIG_SCHEMA_CONFLICTING_DCR.get(
- schemaFile, de.getMessageObject());
- logError(message);
+ logger.warn(WARN_CONFIG_SCHEMA_CONFLICTING_DCR, schemaFile, de.getMessageObject());
try
{
@@ -1199,7 +1184,7 @@
}
else
{
- logError(message);
+ logger.error(message);
continue;
}
}
@@ -1217,7 +1202,7 @@
}
else
{
- logError(message);
+ logger.error(message);
continue;
}
}
@@ -1233,9 +1218,7 @@
{
logger.traceException(de);
- LocalizableMessage message = WARN_CONFIG_SCHEMA_CONFLICTING_DSR.get(
- schemaFile, de.getMessageObject());
- logError(message);
+ logger.warn(WARN_CONFIG_SCHEMA_CONFLICTING_DSR, schemaFile, de.getMessageObject());
try
{
@@ -1285,7 +1268,7 @@
}
else
{
- logError(message);
+ logger.error(message);
continue;
}
}
@@ -1304,7 +1287,7 @@
}
else
{
- logError(message);
+ logger.error(message);
continue;
}
}
@@ -1320,9 +1303,7 @@
{
logger.traceException(de);
- LocalizableMessage message = WARN_CONFIG_SCHEMA_CONFLICTING_MRU.get(
- schemaFile, de.getMessageObject());
- logError(message);
+ logger.warn(WARN_CONFIG_SCHEMA_CONFLICTING_MRU, schemaFile, de.getMessageObject());
try
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/SubentryManager.java b/opendj3-server-dev/src/server/org/opends/server/core/SubentryManager.java
index 193429f..ced412b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/SubentryManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/SubentryManager.java
@@ -63,7 +63,6 @@
LocalBackendSearchOperation;
import static org.opends.messages.CoreMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.config.ConfigConstants.*;
@@ -321,8 +320,7 @@
")");
if (backend.getEntryCount() > 0 && ! backend.isIndexed(filter))
{
- logError(WARN_SUBENTRY_FILTER_NOT_INDEXED.get(
- String.valueOf(filter), backend.getBackendID()));
+ logger.warn(WARN_SUBENTRY_FILTER_NOT_INDEXED.get(String.valueOf(filter), backend.getBackendID()));
}
}
catch (Exception e)
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java
index 048e541..41717d5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.core;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -55,7 +56,6 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
-import org.opends.server.loggers.ErrorLogger;
/**
@@ -71,6 +71,9 @@
ConfigurationDeleteListener<TrustManagerProviderCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// A mapping between the DNs of the config entries and the associated trust
// manager providers.
private ConcurrentHashMap<DN,TrustManagerProvider> providers;
@@ -136,7 +139,7 @@
}
catch (InitializationException ie)
{
- ErrorLogger.logError(ie.getMessageObject());
+ logger.error(ie.getMessageObject());
continue;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java
index e45b78f..a6eac7e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java
@@ -42,7 +42,6 @@
import org.opends.server.admin.std.server.VirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.config.ConfigException;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import static org.opends.messages.ConfigMessages.*;
@@ -157,7 +156,7 @@
}
catch (InitializationException ie)
{
- ErrorLogger.logError(ie.getMessageObject());
+ logger.error(ie.getMessageObject());
continue;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroup.java b/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroup.java
index e4bf148..d5853ed 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroup.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroup.java
@@ -30,7 +30,6 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.CoreMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
import static org.forgerock.util.Reject.*;
@@ -515,10 +514,8 @@
{
// The workflow does not exist, log an error message
// and skip the workflow.
- LocalizableMessage message =
- INFO_ERR_WORKFLOW_DOES_NOT_EXIST.get(workflowID,
+ logger.debug(INFO_ERR_WORKFLOW_DOES_NOT_EXIST, workflowID,
networkGroup.getID());
- logError(message);
}
else
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java b/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java
index 3ea4cbd..7adcbec 100644
--- a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java
+++ b/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java
@@ -32,7 +32,6 @@
import org.opends.server.api.ChangeNotificationListener;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.loggers.ErrorLogger;
import org.opends.server.types.*;
import org.opends.server.types.operation.PostResponseAddOperation;
import org.opends.server.types.operation.PostResponseDeleteOperation;
@@ -212,11 +211,8 @@
ResultCode resultCode = searchOperation.getResultCode();
if (resultCode != ResultCode.SUCCESS)
{
- LocalizableMessage message =
- INFO_TRUSTSTORESYNC_ADMIN_SUFFIX_SEARCH_FAILED.get(
- String.valueOf(adminSuffixDN),
+ logger.debug(INFO_TRUSTSTORESYNC_ADMIN_SUFFIX_SEARCH_FAILED, String.valueOf(adminSuffixDN),
searchOperation.getErrorMessage().toString());
- ErrorLogger.logError(message);
}
for (SearchResultEntry searchEntry : searchOperation.getSearchEntries())
@@ -229,9 +225,7 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_TRUSTSTORESYNC_EXCEPTION.get(
- stackTraceToSingleLineString(e));
- ErrorLogger.logError(message);
+ logger.error(ERR_TRUSTSTORESYNC_EXCEPTION, stackTraceToSingleLineString(e));
}
}
@@ -431,10 +425,8 @@
if (delOperation.getResultCode() != ResultCode.SUCCESS)
{
- LocalizableMessage message = INFO_TRUSTSTORESYNC_DELETE_FAILED.get(
- String.valueOf(dstDN),
+ logger.debug(INFO_TRUSTSTORESYNC_DELETE_FAILED, String.valueOf(dstDN),
String.valueOf(delOperation.getErrorMessage()));
- ErrorLogger.logError(message);
}
}
@@ -474,10 +466,8 @@
AddOperation addOperation = conn.processAdd(addEntry);
if (addOperation.getResultCode() != ResultCode.SUCCESS)
{
- LocalizableMessage message = INFO_TRUSTSTORESYNC_ADD_FAILED.get(
- String.valueOf(dstDN),
+ logger.debug(INFO_TRUSTSTORESYNC_ADD_FAILED, String.valueOf(dstDN),
String.valueOf(addOperation.getErrorMessage()));
- ErrorLogger.logError(message);
}
}
@@ -509,7 +499,7 @@
{
LocalizableMessage message = LocalizableMessage.raw("Failed to import key entry: %s",
e.getMessage());
- ErrorLogger.logError(message);
+ logger.error(message);
}
}
}
@@ -585,7 +575,7 @@
{
LocalizableMessage message = LocalizableMessage.raw("Failed to import modified key entry: %s",
e.getMessage());
- ErrorLogger.logError(message);
+ logger.error(message);
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
index 1b5715a..cef494a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
@@ -29,6 +29,7 @@
import org.opends.server.admin.std.server.AnonymousSASLMechanismHandlerCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.SASLMechanismHandler;
import org.opends.server.config.ConfigException;
import org.opends.server.core.BindOperation;
@@ -36,7 +37,6 @@
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.ServerConstants.*;
@@ -52,6 +52,9 @@
public class AnonymousSASLMechanismHandler
extends SASLMechanismHandler<AnonymousSASLMechanismHandlerCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* Creates a new instance of this SASL mechanism handler. No initialization
* should be done in this method, as it should all be performed in the
@@ -109,7 +112,7 @@
{
bindOperation.addAdditionalLogItem(AdditionalLogItem.quotedKeyValue(
getClass(), "trace", credString));
- logError(INFO_SASLANONYMOUS_TRACE.
+ logger.error(INFO_SASLANONYMOUS_TRACE.
get(bindOperation.getConnectionID(), bindOperation.getOperationID(),
credString));
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
index 50620a4..7342d4f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
@@ -206,14 +206,14 @@
f = new File(configFile + ".startok");
if (! f.exists())
{
- logError(WARN_CONFIG_FILE_NO_STARTOK_FILE.get(f.getAbsolutePath(),
+ logger.warn(WARN_CONFIG_FILE_NO_STARTOK_FILE.get(f.getAbsolutePath(),
configFile));
useLastKnownGoodConfig = false;
f = new File(configFile);
}
else
{
- logError(NOTE_CONFIG_FILE_USING_STARTOK_FILE.get(f.getAbsolutePath(),
+ logger.info(NOTE_CONFIG_FILE_USING_STARTOK_FILE.get(f.getAbsolutePath(),
configFile));
}
}
@@ -847,8 +847,7 @@
// FIXME -- Log each error message and throw an exception.
for (LocalizableMessage s : errorList)
{
- LocalizableMessage message = ERR_CONFIG_ERROR_APPLYING_STARTUP_CHANGE.get(s);
- logError(message);
+ logger.error(ERR_CONFIG_ERROR_APPLYING_STARTUP_CHANGE, s);
}
LocalizableMessage message = ERR_CONFIG_UNABLE_TO_APPLY_CHANGES_FILE.get();
@@ -1817,9 +1816,10 @@
StaticUtils.close(inputStream, outputStream);
- LocalizableMessage message = WARN_CONFIG_MANUAL_CHANGES_DETECTED.get(
- configFile, newConfigFile.getAbsolutePath());
- logError(message);
+ LocalizableMessage message =
+ WARN_CONFIG_MANUAL_CHANGES_DETECTED.get(configFile, newConfigFile
+ .getAbsolutePath());
+ logger.warn(message);
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_MANUAL_CONFIG_EDIT_HANDLED, message);
@@ -1829,9 +1829,10 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_CONFIG_MANUAL_CHANGES_LOST.get(
- configFile, stackTraceToSingleLineString(e));
- logError(message);
+ LocalizableMessage message =
+ ERR_CONFIG_MANUAL_CHANGES_LOST.get(configFile,
+ stackTraceToSingleLineString(e));
+ logger.error(message);
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_MANUAL_CONFIG_EDIT_HANDLED, message);
@@ -1853,9 +1854,10 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_CONFIG_FILE_WRITE_CANNOT_EXPORT_NEW_CONFIG.get(
- String.valueOf(tempConfig), stackTraceToSingleLineString(e));
- logError(message);
+ LocalizableMessage message =
+ ERR_CONFIG_FILE_WRITE_CANNOT_EXPORT_NEW_CONFIG.get(String
+ .valueOf(tempConfig), stackTraceToSingleLineString(e));
+ logger.error(message);
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_CANNOT_WRITE_CONFIGURATION, message);
@@ -1874,10 +1876,11 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_CONFIG_FILE_WRITE_CANNOT_RENAME_NEW_CONFIG.
- get(String.valueOf(tempConfig), String.valueOf(configFile),
+ LocalizableMessage message =
+ ERR_CONFIG_FILE_WRITE_CANNOT_RENAME_NEW_CONFIG.get(String
+ .valueOf(tempConfig), String.valueOf(configFile),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_CANNOT_WRITE_CONFIGURATION, message);
@@ -1920,9 +1923,9 @@
{
if (! archiveDirectory.mkdirs())
{
- LocalizableMessage message = ERR_CONFIG_FILE_CANNOT_CREATE_ARCHIVE_DIR_NO_REASON.
- get(archiveDirectory.getAbsolutePath());
- logError(message);
+ LocalizableMessage message = ERR_CONFIG_FILE_CANNOT_CREATE_ARCHIVE_DIR_NO_REASON.get(
+ archiveDirectory.getAbsolutePath());
+ logger.error(message);
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_CANNOT_WRITE_CONFIGURATION, message);
@@ -1933,10 +1936,10 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_CONFIG_FILE_CANNOT_CREATE_ARCHIVE_DIR.
- get(archiveDirectory.getAbsolutePath(),
- stackTraceToSingleLineString(e));
- logError(message);
+ LocalizableMessage message =
+ ERR_CONFIG_FILE_CANNOT_CREATE_ARCHIVE_DIR.get(archiveDirectory
+ .getAbsolutePath(), stackTraceToSingleLineString(e));
+ logger.error(message);
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_CANNOT_WRITE_CONFIGURATION, message);
@@ -1969,9 +1972,10 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_CONFIG_FILE_CANNOT_WRITE_CONFIG_ARCHIVE.get(
- stackTraceToSingleLineString(e));
- logError(message);
+ LocalizableMessage message =
+ ERR_CONFIG_FILE_CANNOT_WRITE_CONFIG_ARCHIVE
+ .get(stackTraceToSingleLineString(e));
+ logger.error(message);
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_CANNOT_WRITE_CONFIGURATION, message);
@@ -1999,9 +2003,10 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_CONFIG_FILE_CANNOT_WRITE_CONFIG_ARCHIVE.get(
- stackTraceToSingleLineString(e));
- logError(message);
+ LocalizableMessage message =
+ ERR_CONFIG_FILE_CANNOT_WRITE_CONFIG_ARCHIVE
+ .get(stackTraceToSingleLineString(e));
+ logger.error(message);
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_CANNOT_WRITE_CONFIGURATION, message);
@@ -2099,7 +2104,7 @@
{
logger.traceException(e);
- logError(ERR_STARTOK_CANNOT_WRITE.get(configFile, tempFilePath,
+ logger.error(ERR_STARTOK_CANNOT_WRITE.get(configFile, tempFilePath,
getExceptionMessage(e)));
return;
}
@@ -2108,7 +2113,7 @@
{
logger.traceException(e);
- logError(ERR_STARTOK_CANNOT_OPEN_FOR_WRITING.get(tempFilePath,
+ logger.error(ERR_STARTOK_CANNOT_OPEN_FOR_WRITING.get(tempFilePath,
getExceptionMessage(e)));
return;
}
@@ -2121,7 +2126,7 @@
{
logger.traceException(e);
- logError(ERR_STARTOK_CANNOT_OPEN_FOR_READING.get(configFile,
+ logger.error(ERR_STARTOK_CANNOT_OPEN_FOR_READING.get(configFile,
getExceptionMessage(e)));
return;
}
@@ -2167,7 +2172,7 @@
{
logger.traceException(e);
- logError(ERR_STARTOK_CANNOT_RENAME.get(tempFilePath, startOKFilePath,
+ logger.error(ERR_STARTOK_CANNOT_RENAME.get(tempFilePath, startOKFilePath,
getExceptionMessage(e)));
return;
}
@@ -2984,15 +2989,11 @@
try
{
configBackupDir.renameTo(configDir);
- LocalizableMessage message =
- NOTE_CONFIG_RESTORE_RESTORED_OLD_CONFIG.get(configDirPath);
- logError(message);
+ logger.info(NOTE_CONFIG_RESTORE_RESTORED_OLD_CONFIG, configDirPath);
}
catch (Exception e2)
{
- LocalizableMessage message = ERR_CONFIG_RESTORE_CANNOT_RESTORE_OLD_CONFIG.get(
- configBackupDir.getPath());
- logError(message);
+ logger.error(ERR_CONFIG_RESTORE_CANNOT_RESTORE_OLD_CONFIG, configBackupDir.getPath());
}
}
@@ -3021,9 +3022,7 @@
// Tell the user where the previous config was archived.
if (configBackupDir != null)
{
- LocalizableMessage message = ERR_CONFIG_RESTORE_OLD_CONFIG_SAVED.get(
- configBackupDir.getPath());
- logError(message);
+ logger.error(ERR_CONFIG_RESTORE_OLD_CONFIG_SAVED, configBackupDir.getPath());
}
LocalizableMessage message = ERR_CONFIG_RESTORE_CANNOT_GET_ZIP_ENTRY.get(
@@ -3073,9 +3072,7 @@
// Tell the user where the previous config was archived.
if (configBackupDir != null)
{
- LocalizableMessage message = ERR_CONFIG_RESTORE_OLD_CONFIG_SAVED.get(
- configBackupDir.getPath());
- logError(message);
+ logger.error(ERR_CONFIG_RESTORE_OLD_CONFIG_SAVED, configBackupDir.getPath());
}
LocalizableMessage message = ERR_CONFIG_RESTORE_CANNOT_CREATE_FILE.
@@ -3135,9 +3132,7 @@
// Tell the user where the previous config was archived.
if (configBackupDir != null)
{
- LocalizableMessage message = ERR_CONFIG_RESTORE_OLD_CONFIG_SAVED.get(
- configBackupDir.getPath());
- logError(message);
+ logger.error(ERR_CONFIG_RESTORE_OLD_CONFIG_SAVED, configBackupDir.getPath());
}
LocalizableMessage message = ERR_CONFIG_RESTORE_CANNOT_PROCESS_ARCHIVE_FILE.get(
@@ -3170,17 +3165,14 @@
byte[] calculatedHash = digest.digest();
if (Arrays.equals(calculatedHash, unsignedHash))
{
- LocalizableMessage message = NOTE_CONFIG_RESTORE_UNSIGNED_HASH_VALID.get();
- logError(message);
+ logger.info(NOTE_CONFIG_RESTORE_UNSIGNED_HASH_VALID);
}
else
{
// Tell the user where the previous config was archived.
if (configBackupDir != null)
{
- LocalizableMessage message = ERR_CONFIG_RESTORE_OLD_CONFIG_SAVED.get(
- configBackupDir.getPath());
- logError(message);
+ logger.error(ERR_CONFIG_RESTORE_OLD_CONFIG_SAVED, configBackupDir.getPath());
}
LocalizableMessage message =
@@ -3195,17 +3187,14 @@
byte[] calculatedSignature = mac.doFinal();
if (Arrays.equals(calculatedSignature, signedHash))
{
- LocalizableMessage message = NOTE_CONFIG_RESTORE_SIGNED_HASH_VALID.get();
- logError(message);
+ logger.info(NOTE_CONFIG_RESTORE_SIGNED_HASH_VALID);
}
else
{
// Tell the user where the previous config was archived.
if (configBackupDir != null)
{
- LocalizableMessage message = ERR_CONFIG_RESTORE_OLD_CONFIG_SAVED.get(
- configBackupDir.getPath());
- logError(message);
+ logger.error(ERR_CONFIG_RESTORE_OLD_CONFIG_SAVED, configBackupDir.getPath());
}
LocalizableMessage message =
@@ -3219,9 +3208,7 @@
// If we are just verifying the archive, then we're done.
if (verifyOnly)
{
- LocalizableMessage message =
- NOTE_CONFIG_RESTORE_VERIFY_SUCCESSFUL.get(backupID, backupPath);
- logError(message);
+ logger.info(NOTE_CONFIG_RESTORE_VERIFY_SUCCESSFUL, backupID, backupPath);
return;
}
@@ -3234,8 +3221,7 @@
recursiveDelete(configBackupDir);
}
- LocalizableMessage message = NOTE_CONFIG_RESTORE_SUCCESSFUL.get(backupID, backupPath);
- logError(message);
+ logger.info(NOTE_CONFIG_RESTORE_SUCCESSFUL, backupID, backupPath);
}
@@ -3302,10 +3288,8 @@
{
if (result == null)
{
- LocalizableMessage message = ERR_CONFIG_CHANGE_NO_RESULT.
- get(String.valueOf(className), String.valueOf(methodName),
+ logger.error(ERR_CONFIG_CHANGE_NO_RESULT, String.valueOf(className), String.valueOf(methodName),
String.valueOf(entryDN));
- logError(message);
return;
}
@@ -3329,25 +3313,19 @@
if (resultCode != ResultCode.SUCCESS)
{
- LocalizableMessage message = ERR_CONFIG_CHANGE_RESULT_ERROR.
- get(String.valueOf(className), String.valueOf(methodName),
+ logger.error(ERR_CONFIG_CHANGE_RESULT_ERROR, String.valueOf(className), String.valueOf(methodName),
String.valueOf(entryDN), String.valueOf(resultCode),
adminActionRequired, messageBuffer.toString());
- logError(message);
}
else if (adminActionRequired)
{
- LocalizableMessage message = WARN_CONFIG_CHANGE_RESULT_ACTION_REQUIRED.
- get(String.valueOf(className), String.valueOf(methodName),
+ logger.warn(WARN_CONFIG_CHANGE_RESULT_ACTION_REQUIRED, String.valueOf(className), String.valueOf(methodName),
String.valueOf(entryDN), messageBuffer.toString());
- logError(message);
}
else if (messageBuffer.length() > 0)
{
- LocalizableMessage message = INFO_CONFIG_CHANGE_RESULT_MESSAGES.
- get(String.valueOf(className), String.valueOf(methodName),
+ logger.debug(INFO_CONFIG_CHANGE_RESULT_MESSAGES, String.valueOf(className), String.valueOf(methodName),
String.valueOf(entryDN), messageBuffer.toString());
- logError(message);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
index 0d5f478..7299ffb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
@@ -51,7 +51,6 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
-import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -112,14 +111,14 @@
identityMapper = DirectoryServer.getIdentityMapper(identityMapperDN);
serverFQDN = getFQDN(configuration);
LocalizableMessage msg= NOTE_DIGEST_MD5_SERVER_FQDN.get(serverFQDN);
- logError(msg);
+ logger.error(msg);
String QOP = getQOP(configuration);
saslProps = new HashMap<String,String>();
saslProps.put(Sasl.QOP, QOP);
String realm=getRealm(configuration);
if(realm != null) {
msg = INFO_DIGEST_MD5_REALM.get(realm);
- logError(msg);
+ logger.error(msg);
saslProps.put(REALM_PROPERTY, getRealm(configuration));
}
this.configuration = configuration;
@@ -243,14 +242,14 @@
identityMapper = DirectoryServer.getIdentityMapper(identityMapperDN);
serverFQDN = getFQDN(configuration);
LocalizableMessage msg = NOTE_DIGEST_MD5_SERVER_FQDN.get(serverFQDN);
- logError(msg);
+ logger.error(msg);
String QOP = getQOP(configuration);
saslProps = new HashMap<String,String>();
saslProps.put(Sasl.QOP, QOP);
String realm=getRealm(configuration);
if(realm != null) {
msg = INFO_DIGEST_MD5_REALM.get(realm);
- logError(msg);
+ logger.error(msg);
saslProps.put(REALM_PROPERTY, getRealm(configuration));
}
this.configuration = configuration;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/DiskSpaceMonitor.java b/opendj3-server-dev/src/server/org/opends/server/extensions/DiskSpaceMonitor.java
index 589b7cf..92f7214 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/DiskSpaceMonitor.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/DiskSpaceMonitor.java
@@ -32,7 +32,6 @@
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import static org.opends.messages.CoreMessages.
@@ -292,8 +291,7 @@
}
catch(Exception e)
{
- ErrorLogger.logError(ERR_DISK_SPACE_MONITOR_UPDATE_FAILED.get(
- directory.getPath(), e.toString()));
+ logger.error(ERR_DISK_SPACE_MONITOR_UPDATE_FAILED.get(directory.getPath(), e.toString()));
logger.traceException(e);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java b/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java
index e59c9e7..97029b9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java
@@ -38,7 +38,6 @@
import org.opends.server.admin.std.server.DynamicGroupImplementationCfg;
import org.opends.server.api.Group;
import org.opends.server.config.ConfigException;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
@@ -159,11 +158,9 @@
{
logger.traceException(de);
- LocalizableMessage message = ERR_DYNAMICGROUP_CANNOT_DECODE_MEMBERURL.
- get(v.getValue().toString(),
+ logger.error(ERR_DYNAMICGROUP_CANNOT_DECODE_MEMBERURL, v.getValue().toString(),
String.valueOf(groupEntry.getName()),
de.getMessageObject());
- ErrorLogger.logError(message);
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupSearchThread.java b/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupSearchThread.java
index 0fc3b2a..87cec03 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupSearchThread.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupSearchThread.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.extensions;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -48,7 +49,6 @@
import org.opends.server.types.SearchScope;
import static org.opends.messages.ExtensionMessages.*;
-import org.opends.server.loggers.ErrorLogger;
/**
* This class implements a Directory Server thread that will be used to perform
@@ -61,6 +61,9 @@
extends DirectoryThread
implements InternalSearchListener
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The set of base DNs for the search requests.
private final DN[] baseDNs;
@@ -132,10 +135,8 @@
{
if (resultCode == ResultCode.NO_SUCH_OBJECT)
{
- LocalizableMessage message = WARN_DYNAMICGROUP_NONEXISTENT_BASE_DN.
- get(String.valueOf(baseDNs[searchCounter]),
+ logger.warn(WARN_DYNAMICGROUP_NONEXISTENT_BASE_DN, String.valueOf(baseDNs[searchCounter]),
String.valueOf(memberList.getDynamicGroupDN()));
- ErrorLogger.logError(message);
continue;
}
else
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/EntryCacheCommon.java b/opendj3-server-dev/src/server/org/opends/server/extensions/EntryCacheCommon.java
index 83ab340..b7bb6e5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/EntryCacheCommon.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/EntryCacheCommon.java
@@ -28,6 +28,7 @@
import static org.opends.server.loggers.ErrorLogger.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.util.StaticUtils.*;
import java.util.ArrayList;
@@ -51,6 +52,9 @@
*/
public class EntryCacheCommon
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* Configuration phases. Each value identifies a configuration step:
* - PHASE_INIT when invoking method initializeEntryCache()
@@ -186,7 +190,7 @@
{
case PHASE_INIT:
{
- logError (error);
+ logger.error(error);
break;
}
case PHASE_ACCEPTABLE:
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
index 6a432ea..c366f01 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
@@ -26,10 +26,10 @@
*/
package org.opends.server.extensions;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.messages.ExtensionMessages.*;
@@ -67,6 +67,9 @@
ConfigurationChangeListener
<ErrorLogAccountStatusNotificationHandlerCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* The set of names for the account status notification types that may be
* logged by this notification handler.
@@ -116,8 +119,7 @@
public void handleStatusNotification(
AccountStatusNotification notification)
{
- logError(NOTE_ERRORLOG_ACCTNOTHANDLER_NOTIFICATION.get(
- notification.getNotificationType().getName(),
+ logger.info(NOTE_ERRORLOG_ACCTNOTHANDLER_NOTIFICATION.get(notification.getNotificationType().getName(),
String.valueOf(notification.getUserDN()),
notification.getMessage().ordinal(),
notification.getMessage()));
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java b/opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java
index a874831..1b7b831 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java
@@ -74,7 +74,6 @@
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.util.ServerConstants;
-import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -328,8 +327,7 @@
INDEXKEY.getBytes("UTF-8"));
// Persistent state report.
- LocalizableMessage message = NOTE_FSCACHE_RESTORE.get();
- logError(message);
+ logger.info(NOTE_FSCACHE_RESTORE);
if (OperationStatus.SUCCESS ==
entryCacheDB.get(null, indexKey, indexData, LockMode.DEFAULT)) {
@@ -364,7 +362,7 @@
// Remove cache entries specific to this backend.
clearBackend(DirectoryServer.getBackend(backend));
// Log an error message.
- logError(WARN_FSCACHE_OFFLINE_STATE_FAIL.get(backend));
+ logger.warn(WARN_FSCACHE_OFFLINE_STATE_FAIL.get(backend));
}
}
// Pop max entries limit.
@@ -372,15 +370,13 @@
}
// Persistent state report.
- message = NOTE_FSCACHE_RESTORE_REPORT.get(
- entryCacheIndex.dnMap.size());
- logError(message);
+ logger.info(NOTE_FSCACHE_RESTORE_REPORT, entryCacheIndex.dnMap.size());
} catch (CacheIndexNotFoundException e) {
logger.traceException(e);
// Log an error message.
- logError(NOTE_FSCACHE_INDEX_NOT_FOUND.get());
+ logger.info(NOTE_FSCACHE_INDEX_NOT_FOUND.get());
// Clear the entry cache.
clear();
@@ -388,7 +384,7 @@
logger.traceException(e);
// Log an error message.
- logError(ERR_FSCACHE_INDEX_IMPAIRED.get());
+ logger.error(ERR_FSCACHE_INDEX_IMPAIRED.get());
// Clear the entry cache.
clear();
@@ -396,7 +392,7 @@
logger.traceException(e);
// Log an error message.
- logError(ERR_FSCACHE_CANNOT_LOAD_PERSISTENT_DATA.get());
+ logger.error(ERR_FSCACHE_CANNOT_LOAD_PERSISTENT_DATA.get());
// Clear the entry cache.
clear();
@@ -443,8 +439,7 @@
DatabaseEntry indexData = new DatabaseEntry();
// Persistent state save report.
- LocalizableMessage message = NOTE_FSCACHE_SAVE.get();
- logError(message);
+ logger.info(NOTE_FSCACHE_SAVE);
//This line causes an unchecked call error if the SuppressWarnings
//annotation is removed at the beginning of this method.
entryCacheDataBinding.objectToEntry(entryCacheIndex, indexData);
@@ -458,13 +453,11 @@
logger.traceException(e);
// Log an error message.
- logError(ERR_FSCACHE_CANNOT_STORE_PERSISTENT_DATA.get());
+ logger.error(ERR_FSCACHE_CANNOT_STORE_PERSISTENT_DATA.get());
}
// Persistent state save report.
- LocalizableMessage message = NOTE_FSCACHE_SAVE_REPORT.get(
- entryCacheIndex.dnMap.size());
- logError(message);
+ logger.info(NOTE_FSCACHE_SAVE_REPORT, entryCacheIndex.dnMap.size());
}
// Close JE databases and environment and clear all the maps.
@@ -1294,7 +1287,7 @@
logger.traceException(e);
// Log an error message.
- logError(ERR_FSCACHE_CANNOT_RETRIEVE_ENTRY.get());
+ logger.error(ERR_FSCACHE_CANNOT_RETRIEVE_ENTRY.get());
}
return null;
}
@@ -1379,7 +1372,7 @@
logger.traceException(e);
// Log an error message.
- logError(
+ logger.error(
ERR_FSCACHE_CANNOT_STORE_ENTRY.get());
return false;
@@ -1425,8 +1418,7 @@
}
} catch(Exception e) {
// Log a warning that the permissions were not set.
- LocalizableMessage message = WARN_FSCACHE_SET_PERMISSIONS_FAILED.get(cacheHome);
- logError(message);
+ logger.warn(WARN_FSCACHE_SET_PERMISSIONS_FAILED, cacheHome);
}
}
} else {
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java b/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
index 38fcfe6..7e7a397 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
@@ -42,7 +42,6 @@
import org.opends.server.api.CertificateMapper;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
@@ -132,10 +131,8 @@
Backend b = DirectoryServer.getBackend(baseDN);
if ((b != null) && (! b.isIndexed(t, IndexType.EQUALITY)))
{
- LocalizableMessage message = WARN_SATUACM_ATTR_UNINDEXED.get(
- configuration.dn().toString(),
+ logger.warn(WARN_SATUACM_ATTR_UNINDEXED, configuration.dn().toString(),
t.getNameOrOID(), b.getBackendID());
- ErrorLogger.logError(message);
}
}
@@ -383,7 +380,7 @@
configuration.dn().toString(),
t.getNameOrOID(), b.getBackendID());
messages.add(message);
- ErrorLogger.logError(message);
+ logger.error(message);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
index aa950ee..30dcf36 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
@@ -30,7 +30,6 @@
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.config.ConfigConstants.CONFIG_DIR_NAME;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -132,7 +131,7 @@
configuration.addGSSAPIChangeListener(this);
this.configuration = configuration;
LocalizableMessage msg = INFO_GSSAPI_STARTED.get();
- logError(msg);
+ logger.error(msg);
}
catch (UnknownHostException unhe)
{
@@ -327,7 +326,7 @@
}
w.write(principal.toString());
LocalizableMessage msg = INFO_GSSAPI_PRINCIPAL_NAME.get(principal.toString());
- logError(msg);
+ logger.error(msg);
w.write("\" isInitiator=false;");
w.newLine();
w.write("};");
@@ -352,7 +351,7 @@
DirectoryServer.deregisterSASLMechanismHandler(SASL_MECHANISM_GSSAPI);
clearProperties();
LocalizableMessage msg = INFO_GSSAPI_STOPPED.get();
- logError(msg);
+ logger.error(msg);
}
@@ -411,7 +410,7 @@
LocalizableMessage message = ERR_SASLGSSAPI_CANNOT_CREATE_LOGIN_CONTEXT
.get(getExceptionMessage(ex));
// Log a configuration error.
- logError(message);
+ logger.error(message);
connection.setSASLAuthStateInfo(null);
bindOp.setAuthFailureReason(message);
bindOp.setResultCode(ResultCode.INVALID_CREDENTIALS);
@@ -593,7 +592,7 @@
identityMapper = DirectoryServer.getIdentityMapper(identityMapperDN);
serverFQDN = getFQDN(config);
LocalizableMessage msg = INFO_GSSAPI_SERVER_FQDN.get(serverFQDN);
- logError(msg);
+ logger.error(msg);
saslProps = new HashMap<String, String>();
saslProps.put(Sasl.QOP, getQOP(config));
saslProps.put(Sasl.REUSE, "false");
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java
index dae108f..8f44752 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java
@@ -44,7 +44,6 @@
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.extensions.ExtensionsConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
@@ -257,8 +256,7 @@
{
logger.traceException(e);
- logError(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD.get(
- storedPassword.toString(), String.valueOf(e)));
+ logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD.get(storedPassword.toString(), String.valueOf(e)));
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
index a67be69..6d6e83c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
@@ -40,7 +40,6 @@
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
@@ -272,10 +271,7 @@
saltLength = decodedBytes.length - SHA1_LENGTH;
if (saltLength <= 0)
{
- LocalizableMessage message =
- ERR_PWSCHEME_INVALID_BASE64_DECODED_STORED_PASSWORD.get(
- storedPassword.toString());
- ErrorLogger.logError(message);
+ logger.error(ERR_PWSCHEME_INVALID_BASE64_DECODED_STORED_PASSWORD, storedPassword.toString());
return false;
}
saltBytes = new byte[saltLength];
@@ -287,9 +283,7 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD.get(
- storedPassword.toString(), String.valueOf(e));
- ErrorLogger.logError(message);
+ logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword.toString(), String.valueOf(e));
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java b/opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java
index 93fb007..0a8dbd2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java
@@ -30,7 +30,6 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.CoreMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -170,9 +169,8 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_CONFIG_WORK_QUEUE_CANNOT_CREATE_MONITOR.get(
- String.valueOf(ParallelWorkQueueMonitor.class), String.valueOf(e));
- logError(message);
+ logger.error(ERR_CONFIG_WORK_QUEUE_CANNOT_CREATE_MONITOR, String
+ .valueOf(ParallelWorkQueueMonitor.class), String.valueOf(e));
}
}
@@ -207,8 +205,7 @@
{
logger.traceException(e);
- logError(WARN_QUEUE_UNABLE_TO_CANCEL.get(
- String.valueOf(o), String.valueOf(e)));
+ logger.warn(WARN_QUEUE_UNABLE_TO_CANCEL.get(String.valueOf(o), String.valueOf(e)));
}
}
@@ -224,8 +221,7 @@
{
logger.traceException(e);
- logError(WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD.get(
- t.getName(), String.valueOf(e)));
+ logger.warn(WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD.get(t.getName(), String.valueOf(e)));
}
}
}
@@ -356,9 +352,8 @@
{
if (numFailures > MAX_RETRY_COUNT)
{
- LocalizableMessage message = ERR_CONFIG_WORK_QUEUE_TOO_MANY_FAILURES.get(
- Thread.currentThread().getName(), numFailures, MAX_RETRY_COUNT);
- logError(message);
+ logger.error(ERR_CONFIG_WORK_QUEUE_TOO_MANY_FAILURES, Thread
+ .currentThread().getName(), numFailures, MAX_RETRY_COUNT);
}
return null;
@@ -422,8 +417,8 @@
// This should not happen. The only recourse we have is to log a message
// and try again.
- logError(WARN_WORKER_WAITING_UNCAUGHT_EXCEPTION.get(
- Thread.currentThread().getName(), String.valueOf(e)));
+ logger.warn(WARN_WORKER_WAITING_UNCAUGHT_EXCEPTION.get(Thread
+ .currentThread().getName(), String.valueOf(e)));
return retryNextOperation(workerThread, numFailures + 1);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkerThread.java b/opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkerThread.java
index 15f66da..490d81d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkerThread.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkerThread.java
@@ -175,10 +175,10 @@
try
{
- LocalizableMessage message = ERR_UNCAUGHT_WORKER_THREAD_EXCEPTION.
- get(getName(), String.valueOf(operation),
- stackTraceToSingleLineString(t));
- logError(message);
+ LocalizableMessage message =
+ ERR_UNCAUGHT_WORKER_THREAD_EXCEPTION.get(getName(), String
+ .valueOf(operation), stackTraceToSingleLineString(t));
+ logger.error(message);
operation.setResultCode(DirectoryServer.getServerErrorResultCode());
operation.appendErrorMessage(message);
@@ -218,11 +218,11 @@
// and we will want to log a message.
if (stoppedByReducedThreadNumber)
{
- logError(INFO_WORKER_STOPPED_BY_REDUCED_THREADNUMBER.get(getName()));
+ logger.debug(INFO_WORKER_STOPPED_BY_REDUCED_THREADNUMBER.get(getName()));
}
else if (! workQueue.shutdownRequested())
{
- logError(WARN_UNEXPECTED_WORKER_THREAD_EXIT.get(getName()));
+ logger.warn(WARN_UNEXPECTED_WORKER_THREAD_EXIT.get(getName()));
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
index 02a55d2..c9e5a4c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
@@ -36,7 +36,6 @@
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.PasswordPolicyState;
import org.opends.server.core.SearchOperation;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.types.*;
@@ -145,7 +144,7 @@
}
catch (DirectoryException de)
{
- ErrorLogger.logError(de.getMessageObject());
+ logger.error(de.getMessageObject());
if (logger.isTraceEnabled())
{
@@ -177,7 +176,7 @@
}
catch (DirectoryException de)
{
- ErrorLogger.logError(de.getMessageObject());
+ logger.error(de.getMessageObject());
if (logger.isTraceEnabled())
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java b/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
index 82e975d..96be76b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
@@ -45,7 +45,6 @@
import org.opends.server.core.ExtendedOperation;
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.PasswordPolicyState;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.asn1.ASN1;
import org.opends.server.protocols.asn1.ASN1Reader;
@@ -988,8 +987,7 @@
// At this point, the user's password is already changed so there's
// not much point in returning a non-success result. However, we
// should at least log that something went wrong.
- ErrorLogger.logError(WARN_EXTOP_PASSMOD_CANNOT_UPDATE_PWP_STATE.get(
- String.valueOf(userDN),
+ logger.warn(WARN_EXTOP_PASSMOD_CANNOT_UPDATE_PWP_STATE.get(String.valueOf(userDN),
String.valueOf(modOp.getResultCode()),
modOp.getErrorMessage()));
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
index f45b1fd..f37429a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
@@ -36,7 +36,6 @@
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import static org.opends.messages.ExtensionMessages.*;
@@ -89,7 +88,7 @@
{
// Something went wrong while trying to
// retrieve password policy, log this.
- ErrorLogger.logError(de.getMessageObject());
+ logger.error(de.getMessageObject());
if (logger.isTraceEnabled())
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java
index 8175e88..044f7a4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java
@@ -44,7 +44,6 @@
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.extensions.ExtensionsConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
@@ -255,8 +254,7 @@
{
logger.traceException(e);
- logError(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD.get(
- storedPassword.toString(), String.valueOf(e)));
+ logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD.get(storedPassword.toString(), String.valueOf(e)));
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
index 2edfcee..0f00b36 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
@@ -60,7 +60,6 @@
import org.opends.server.util.EMailMessage;
import static org.opends.messages.ExtensionMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
@@ -673,7 +672,7 @@
{
logger.traceException(e);
- logError(ERR_SMTP_ASNH_CANNOT_SEND_MESSAGE.get(notificationType.getName(),
+ logger.error(ERR_SMTP_ASNH_CANNOT_SEND_MESSAGE.get(notificationType.getName(),
notification.getUserDN().toString(),
getExceptionMessage(e)));
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java
index db702e6..0e986fe 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java
@@ -45,7 +45,6 @@
import org.opends.server.types.ResultCode;
import org.opends.server.util.EMailMessage;
-import org.opends.server.loggers.ErrorLogger;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -174,7 +173,7 @@
LocalizableMessage msg = WARN_SMTPALERTHANDLER_ERROR_SENDING_MESSAGE.get(
alertType, alertMessage, e.getLocalizedMessage());
- ErrorLogger.logError(msg);
+ logger.error(msg);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
index c95e2a4..85157eb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
@@ -37,7 +37,6 @@
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
@@ -283,9 +282,7 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD.get(
- storedPassword.toString(), String.valueOf(e));
- ErrorLogger.logError(message);
+ logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword.toString(), String.valueOf(e));
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
index e97c6c3..66ca661 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
@@ -37,7 +37,6 @@
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
@@ -277,10 +276,7 @@
saltLength = decodedBytes.length - SHA1_LENGTH;
if (saltLength <= 0)
{
- LocalizableMessage message =
- ERR_PWSCHEME_INVALID_BASE64_DECODED_STORED_PASSWORD.get(
- storedPassword.toString());
- ErrorLogger.logError(message);
+ logger.error(ERR_PWSCHEME_INVALID_BASE64_DECODED_STORED_PASSWORD, storedPassword.toString());
return false;
}
saltBytes = new byte[saltLength];
@@ -292,9 +288,7 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD.get(
- storedPassword.toString(), String.valueOf(e));
- ErrorLogger.logError(message);
+ logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword.toString(), String.valueOf(e));
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
index ba3675e..6b4f8c9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
@@ -37,7 +37,6 @@
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
@@ -281,10 +280,7 @@
saltLength = decodedBytes.length - SHA256_LENGTH;
if (saltLength <= 0)
{
- LocalizableMessage message =
- ERR_PWSCHEME_INVALID_BASE64_DECODED_STORED_PASSWORD.get(
- storedPassword.toString());
- ErrorLogger.logError(message);
+ logger.error(ERR_PWSCHEME_INVALID_BASE64_DECODED_STORED_PASSWORD, storedPassword.toString());
return false;
}
saltBytes = new byte[saltLength];
@@ -296,9 +292,7 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD.get(
- storedPassword.toString(), String.valueOf(e));
- ErrorLogger.logError(message);
+ logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword.toString(), String.valueOf(e));
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
index c291391..f6ed02c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
@@ -37,7 +37,6 @@
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
@@ -282,10 +281,7 @@
saltLength = decodedBytes.length - SHA384_LENGTH;
if (saltLength <= 0)
{
- LocalizableMessage message =
- ERR_PWSCHEME_INVALID_BASE64_DECODED_STORED_PASSWORD.get(
- storedPassword.toString());
- ErrorLogger.logError(message);
+ logger.error(ERR_PWSCHEME_INVALID_BASE64_DECODED_STORED_PASSWORD, storedPassword.toString());
return false;
}
saltBytes = new byte[saltLength];
@@ -297,9 +293,7 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD.get(
- storedPassword.toString(), String.valueOf(e));
- ErrorLogger.logError(message);
+ logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword.toString(), String.valueOf(e));
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
index 2d21115..fc2ea8e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
@@ -37,7 +37,6 @@
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
@@ -281,10 +280,7 @@
saltLength = decodedBytes.length - SHA512_LENGTH;
if (saltLength <= 0)
{
- LocalizableMessage message =
- ERR_PWSCHEME_INVALID_BASE64_DECODED_STORED_PASSWORD.get(
- storedPassword.toString());
- ErrorLogger.logError(message);
+ logger.error(ERR_PWSCHEME_INVALID_BASE64_DECODED_STORED_PASSWORD, storedPassword.toString());
return false;
}
saltBytes = new byte[saltLength];
@@ -296,9 +292,7 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD.get(
- storedPassword.toString(), String.valueOf(e));
- ErrorLogger.logError(message);
+ logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword.toString(), String.valueOf(e));
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java b/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
index e843949..0f2379b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
@@ -41,7 +41,6 @@
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.core.DirectoryServer;
import org.opends.server.config.ConfigException;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.LDAPControl;
@@ -250,12 +249,10 @@
{
logger.traceException(de);
- LocalizableMessage message = ERR_STATICGROUP_CANNOT_DECODE_MEMBER_VALUE_AS_DN.
- get(v.getValue().toString(),
+ logger.error(ERR_STATICGROUP_CANNOT_DECODE_MEMBER_VALUE_AS_DN, v.getValue().toString(),
someMemberAttributeType.getNameOrOID(),
String.valueOf(groupEntry.getName()),
de.getMessageObject());
- ErrorLogger.logError(message);
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
index b326a98..c5ce49b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
@@ -43,7 +43,6 @@
import org.opends.server.api.CertificateMapper;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
@@ -178,10 +177,8 @@
Backend b = DirectoryServer.getBackend(baseDN);
if ((b != null) && (! b.isIndexed(t, IndexType.EQUALITY)))
{
- LocalizableMessage message = WARN_SATUACM_ATTR_UNINDEXED.get(
- configuration.dn().toString(),
+ logger.warn(WARN_SATUACM_ATTR_UNINDEXED, configuration.dn().toString(),
t.getNameOrOID(), b.getBackendID());
- ErrorLogger.logError(message);
}
}
}
@@ -591,7 +588,7 @@
configuration.dn().toString(),
t.getNameOrOID(), b.getBackendID());
messages.add(message);
- ErrorLogger.logError(message);
+ logger.error(message);
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
index 0638d27..0d117af 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
@@ -45,7 +45,6 @@
import org.opends.server.api.CertificateMapper;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
@@ -118,10 +117,8 @@
Backend b = DirectoryServer.getBackend(baseDN);
if ((b != null) && (! b.isIndexed(t, IndexType.EQUALITY)))
{
- LocalizableMessage message = WARN_SATUACM_ATTR_UNINDEXED.get(
- configuration.dn().toString(),
+ logger.warn(WARN_SATUACM_ATTR_UNINDEXED, configuration.dn().toString(),
t.getNameOrOID(), b.getBackendID());
- ErrorLogger.logError(message);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkQueue.java b/opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkQueue.java
index 390b0f4..cad7b40 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkQueue.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkQueue.java
@@ -30,7 +30,6 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.CoreMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.LinkedBlockingQueue;
@@ -214,10 +213,8 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_CONFIG_WORK_QUEUE_CANNOT_CREATE_MONITOR.get(
- String.valueOf(TraditionalWorkQueueMonitor.class),
+ logger.error(ERR_CONFIG_WORK_QUEUE_CANNOT_CREATE_MONITOR, String.valueOf(TraditionalWorkQueueMonitor.class),
String.valueOf(e));
- logError(message);
}
}
finally
@@ -266,7 +263,7 @@
{
logger.traceException(e);
- logError(WARN_QUEUE_UNABLE_TO_CANCEL.get(String.valueOf(o),
+ logger.warn(WARN_QUEUE_UNABLE_TO_CANCEL.get(String.valueOf(o),
String.valueOf(e)));
}
}
@@ -282,7 +279,7 @@
{
logger.traceException(e);
- logError(WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD.get(t.getName(),
+ logger.warn(WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD.get(t.getName(),
String.valueOf(e)));
}
}
@@ -472,9 +469,8 @@
if (numFailures > MAX_RETRY_COUNT)
{
- LocalizableMessage message = ERR_CONFIG_WORK_QUEUE_TOO_MANY_FAILURES.get(Thread
+ logger.error(ERR_CONFIG_WORK_QUEUE_TOO_MANY_FAILURES, Thread
.currentThread().getName(), numFailures, MAX_RETRY_COUNT);
- logError(message);
return null;
}
@@ -520,7 +516,7 @@
// If we've gotten here, then the worker thread was interrupted for some
// other reason. This should not happen, and we need to log a message.
- logError(WARN_WORKER_INTERRUPTED_WITHOUT_SHUTDOWN.get(Thread
+ logger.warn(WARN_WORKER_INTERRUPTED_WITHOUT_SHUTDOWN.get(Thread
.currentThread().getName(), String.valueOf(ie)));
}
catch (Exception e)
@@ -529,7 +525,7 @@
// This should not happen. The only recourse we have is to log a message
// and try again.
- logError(WARN_WORKER_WAITING_UNCAUGHT_EXCEPTION.get(Thread
+ logger.warn(WARN_WORKER_WAITING_UNCAUGHT_EXCEPTION.get(Thread
.currentThread().getName(), String.valueOf(e)));
}
finally
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkerThread.java b/opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
index fb3a347..1cf4268 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
@@ -175,10 +175,10 @@
try
{
- LocalizableMessage message = ERR_UNCAUGHT_WORKER_THREAD_EXCEPTION.
- get(getName(), String.valueOf(operation),
- stackTraceToSingleLineString(t));
- logError(message);
+ LocalizableMessage message =
+ ERR_UNCAUGHT_WORKER_THREAD_EXCEPTION.get(getName(), String
+ .valueOf(operation), stackTraceToSingleLineString(t));
+ logger.error(message);
// Ensure that the client receives some kind of result so that it does
// not hang.
@@ -220,11 +220,11 @@
// and we will want to log a message.
if (stoppedByReducedThreadNumber)
{
- logError(INFO_WORKER_STOPPED_BY_REDUCED_THREADNUMBER.get(getName()));
+ logger.debug(INFO_WORKER_STOPPED_BY_REDUCED_THREADNUMBER.get(getName()));
}
else if (! workQueue.shutdownRequested())
{
- logError(WARN_UNEXPECTED_WORKER_THREAD_EXIT.get(getName()));
+ logger.warn(WARN_UNEXPECTED_WORKER_THREAD_EXIT.get(getName()));
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/ErrorLogger.java b/opendj3-server-dev/src/server/org/opends/server/loggers/ErrorLogger.java
index 1aebaae..bbd4449 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/ErrorLogger.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/ErrorLogger.java
@@ -27,7 +27,6 @@
package org.opends.server.loggers;
import static org.opends.messages.ConfigMessages.*;
-
import org.forgerock.i18n.LocalizableMessage;
import org.opends.messages.Severity;
import org.opends.server.admin.ClassPropertyDefinition;
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java b/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java
index e5748ac..ac29e09 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java
@@ -196,17 +196,13 @@
{
if(!FilePermission.setPermissions(file, filePermissions))
{
- LocalizableMessage message = WARN_LOGGER_UNABLE_SET_PERMISSIONS.get(
- filePermissions.toString(), file.toString());
- ErrorLogger.logError(message);
+ logger.warn(WARN_LOGGER_UNABLE_SET_PERMISSIONS, filePermissions.toString(), file.toString());
}
}
catch(Exception e)
{
// Log an warning that the permissions were not set.
- LocalizableMessage message = WARN_LOGGER_SET_PERMISSION_FAILED.get(
- file.toString(), stackTraceToSingleLineString(e));
- ErrorLogger.logError(message);
+ logger.warn(WARN_LOGGER_SET_PERMISSION_FAILED, file.toString(), stackTraceToSingleLineString(e));
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/OpenDJLoggerAdapter.java b/opendj3-server-dev/src/server/org/opends/server/loggers/OpenDJLoggerAdapter.java
deleted file mode 100644
index 7cb4a8e..0000000
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/OpenDJLoggerAdapter.java
+++ /dev/null
@@ -1,567 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2014 ForgeRock AS.
- */
-package org.opends.server.loggers;
-
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.slf4j.LocalizedMarker;
-import org.opends.messages.Severity;
-import org.opends.server.loggers.debug.DebugLogger;
-import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.DebugLogLevel;
-import org.slf4j.Logger;
-import org.slf4j.Marker;
-
-/**
- * OpenDJ implementation of a SLF4J Logger.
- * <p>
- * Log calls at trace level are redirected to {@code DebugLogger}, while calls
- * at other levels are redirected to {@code ErrorLogger}.
- * <p>
- * Trace level calls are accepted with no Marker argument, while calls at other
- * level must be done with a Marker expected to be an instance of
- * {@code LocalizedMarker}.
- */
-public final class OpenDJLoggerAdapter implements Logger
-{
- /** Name of logger, used as the category. */
- private final String name;
-
- /** The tracer associated to this logger. */
- private final DebugTracer tracer;
-
- /**
- * Creates a new logger with the provided name.
- *
- * @param name
- * The name of logger.
- */
- public OpenDJLoggerAdapter(String name)
- {
- this.name = name;
- this.tracer = DebugLogger.getTracer(name);
- }
-
- /** {@inheritDoc} */
- @Override
- public String getName()
- {
- return name;
- }
-
- /** Trace with message only. */
- private void logTraceMessage(String msg)
- {
- tracer.debugMessage(DebugLogLevel.VERBOSE, msg);
-
- }
-
- /** Trace with message and exception. */
- private void logTraceException(String message, Throwable t)
- {
- tracer.debugCaught(DebugLogLevel.VERBOSE, t);
- }
-
- /**
- * Log a message to {@code ErrorLogger} with the provided severity, extracting
- * {@code LocalizableMessage} from the provided {@code Marker marker}
- * argument.
- *
- * @param marker
- * The marker, expected to be an instance of {@code LocalizedMarker}
- * class, from which message to log is extracted.
- * @param severity
- * The severity to use when logging message.
- * @param throwable
- * Exception to log. May be {@code null}.
- */
- private void logError(Marker marker,
- Severity severity, Throwable throwable)
- {
- if (marker instanceof LocalizedMarker)
- {
- LocalizableMessage message = ((LocalizedMarker) marker).getMessage();
- ErrorLogger.log(name, severity, message, throwable);
- }
- else {
- throw new IllegalStateException("Expecting the marker to be an instance of LocalizedMarker");
- }
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isTraceEnabled()
- {
- return DebugLogger.debugEnabled() && tracer.enabled();
- }
-
- /** {@inheritDoc} */
- @Override
- public void trace(String msg)
- {
- logTraceMessage(msg);
- }
-
- /** {@inheritDoc} */
- @Override
- public void trace(Marker marker, String msg)
- {
- logTraceMessage(msg);
- }
-
- /** {@inheritDoc} */
- @Override
- public void trace(String msg, Throwable t)
- {
- logTraceException(msg, t);
- }
-
- /** {@inheritDoc} */
- @Override
- public void trace(Marker marker, String msg, Throwable t)
- {
- logTraceException(msg, t);
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isDebugEnabled()
- {
- return ErrorLogger.isEnabledFor(name, Severity.INFORMATION);
- }
-
- /** {@inheritDoc} */
- @Override
- public void debug(Marker marker, String msg)
- {
- logError(marker, Severity.INFORMATION, null);
- }
-
- /** {@inheritDoc} */
- @Override
- public void debug(Marker marker, String msg, Throwable t)
- {
- logError(marker, Severity.INFORMATION, t);
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isInfoEnabled()
- {
- return ErrorLogger.isEnabledFor(name, Severity.NOTICE);
- }
-
- /** {@inheritDoc} */
- @Override
- public void info(Marker marker, String msg)
- {
- logError(marker, Severity.NOTICE, null);
- }
-
- /** {@inheritDoc} */
- @Override
- public void info(Marker marker, String msg, Throwable t)
- {
- logError(marker, Severity.NOTICE, t);
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isWarnEnabled()
- {
- return ErrorLogger.isEnabledFor(name, Severity.SEVERE_WARNING);
- }
-
- /** {@inheritDoc} */
- @Override
- public void warn(Marker marker, String msg)
- {
- logError(marker, Severity.SEVERE_WARNING, null);
- }
-
- /** {@inheritDoc} */
- @Override
- public void warn(Marker marker, String msg, Throwable t)
- {
- logError(marker, Severity.SEVERE_WARNING, t);
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isErrorEnabled()
- {
- return ErrorLogger.isEnabledFor(name, Severity.FATAL_ERROR);
- }
-
- /** {@inheritDoc} */
- @Override
- public void error(Marker marker, String msg)
- {
- logError(marker, Severity.FATAL_ERROR, null);
- }
-
- /** {@inheritDoc} */
- @Override
- public void error(Marker marker, String msg, Throwable t)
- {
- logError(marker, Severity.FATAL_ERROR, t);
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isTraceEnabled(Marker marker)
- {
- return isTraceEnabled();
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isDebugEnabled(Marker marker)
- {
- return isDebugEnabled();
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isInfoEnabled(Marker marker)
- {
- return isInfoEnabled();
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isWarnEnabled(Marker marker)
- {
- return isWarnEnabled();
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isErrorEnabled(Marker marker)
- {
- return isErrorEnabled();
- }
-
- /** {@inheritDoc} */
- @Override
- public void trace(String format, Object arg)
- {
- throw new UnsupportedOperationException("Use #trace(String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void trace(String format, Object arg1, Object arg2)
- {
- throw new UnsupportedOperationException("Use #trace(String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void trace(String format, Object... argArray)
- {
- throw new UnsupportedOperationException("Use #trace(String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void trace(Marker marker, String format, Object arg)
- {
- throw new UnsupportedOperationException(
- "Use #trace(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void trace(Marker marker, String format, Object arg1, Object arg2)
- {
- throw new UnsupportedOperationException(
- "Use #trace(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void trace(Marker marker, String format, Object... argArray)
- {
- throw new UnsupportedOperationException(
- "Use #trace(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void debug(String msg)
- {
- throw new UnsupportedOperationException(
- "Use #debug(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void debug(String format, Object arg)
- {
- throw new UnsupportedOperationException(
- "Use #debug(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void debug(String format, Object arg1, Object arg2)
- {
- throw new UnsupportedOperationException(
- "Use #debug(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void debug(String format, Object... argArray)
- {
- throw new UnsupportedOperationException(
- "Use #debug(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void debug(String msg, Throwable t)
- {
- throw new UnsupportedOperationException(
- "Use #debug(Marker, String, Throwable) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void debug(Marker marker, String format, Object arg)
- {
- throw new UnsupportedOperationException(
- "Use #debug(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void debug(Marker marker, String format, Object arg1, Object arg2)
- {
- throw new UnsupportedOperationException(
- "Use #debug(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void debug(Marker marker, String format, Object... arguments)
- {
- throw new UnsupportedOperationException(
- "Use #debug(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void info(String msg)
- {
- throw new UnsupportedOperationException(
- "Use #info(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void info(String format, Object arg)
- {
- throw new UnsupportedOperationException(
- "Use #info(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void info(String format, Object arg1, Object arg2)
- {
- throw new UnsupportedOperationException(
- "Use #info(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void info(String format, Object... argArray)
- {
- throw new UnsupportedOperationException(
- "Use #info(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void info(String msg, Throwable t)
- {
- throw new UnsupportedOperationException(
- "Use #info(Marker, String, Throwable) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void info(Marker marker, String format, Object arg)
- {
- throw new UnsupportedOperationException(
- "Use #info(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void info(Marker marker, String format, Object arg1, Object arg2)
- {
- throw new UnsupportedOperationException(
- "Use #info(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void info(Marker marker, String format, Object... arguments)
- {
- throw new UnsupportedOperationException(
- "Use #info(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void warn(String msg)
- {
- throw new UnsupportedOperationException(
- "Use #warn(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void warn(String format, Object arg)
- {
- throw new UnsupportedOperationException(
- "Use #warn(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void warn(String format, Object arg1, Object arg2)
- {
- throw new UnsupportedOperationException(
- "Use #warn(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void warn(String format, Object... argArray)
- {
- throw new UnsupportedOperationException(
- "Use #warn(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void warn(String msg, Throwable t)
- {
- throw new UnsupportedOperationException(
- "Use #warn(Marker, String, Throwable) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void warn(Marker marker, String format, Object arg)
- {
- throw new UnsupportedOperationException(
- "Use #warn(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void warn(Marker marker, String format, Object arg1, Object arg2)
- {
- throw new UnsupportedOperationException(
- "Use #warn(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void warn(Marker marker, String format, Object... arguments)
- {
- throw new UnsupportedOperationException(
- "Use #warn(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void error(String msg)
- {
- throw new UnsupportedOperationException(
- "Use #error(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void error(String format, Object arg)
- {
- throw new UnsupportedOperationException(
- "Use #error(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void error(String format, Object arg1, Object arg2)
- {
- throw new UnsupportedOperationException(
- "Use #error(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void error(String format, Object... arguments)
- {
- throw new UnsupportedOperationException(
- "Use #error(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void error(String msg, Throwable t)
- {
- throw new UnsupportedOperationException(
- "Use #error(Marker, String, Throwable) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void error(Marker marker, String format, Object arg)
- {
- throw new UnsupportedOperationException(
- "Use #error(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void error(Marker marker, String format, Object arg1, Object arg2)
- {
- throw new UnsupportedOperationException(
- "Use #error(Marker, String) instead.");
- }
-
- /** {@inheritDoc} */
- @Override
- public void error(Marker marker, String format, Object... arguments)
- {
- throw new UnsupportedOperationException(
- "Use #error(Marker, String) instead.");
- }
-}
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/OpenDJLoggerFactory.java b/opendj3-server-dev/src/server/org/opends/server/loggers/OpenDJLoggerFactory.java
deleted file mode 100644
index 61024b3..0000000
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/OpenDJLoggerFactory.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2014 ForgeRock AS.
- */
-package org.opends.server.loggers;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import org.slf4j.ILoggerFactory;
-import org.slf4j.Logger;
-
-/**
- * Factory to retrieve an openDJ implementation of SLF4J Logger.
- */
-public final class OpenDJLoggerFactory implements ILoggerFactory
-{
-
- private final ConcurrentMap<String, Logger> loggerMap;
-
- /**
- * Create the factory.
- */
- public OpenDJLoggerFactory()
- {
- loggerMap = new ConcurrentHashMap<String, Logger>();
- }
-
- /** {@inheritDoc} */
- public Logger getLogger(String name)
- {
- if (name.equalsIgnoreCase(Logger.ROOT_LOGGER_NAME))
- {
- name = "org.forgerock";
- }
-
- Logger slf4jLogger = loggerMap.get(name);
- if (slf4jLogger != null)
- {
- return slf4jLogger;
- }
- Logger newInstance = new OpenDJLoggerAdapter(name);
- Logger oldInstance = loggerMap.putIfAbsent(name, newInstance);
- return oldInstance == null ? newInstance : oldInstance;
- }
-}
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/debug/TextDebugLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/debug/TextDebugLogPublisher.java
index b057ce6..f254b82 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/debug/TextDebugLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/debug/TextDebugLogPublisher.java
@@ -196,8 +196,7 @@
config.addDebugTargetDeleteListener(this);
//Get the default/global settings
- LogLevel logLevel =
- DebugLogLevel.parse(config.getDefaultDebugLevel().toString());
+ LogLevel logLevel = LogLevel.ALL;
Set<LogCategory> logCategories = null;
if(!config.getDefaultDebugCategory().isEmpty())
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/monitors/EntryCacheMonitorProvider.java b/opendj3-server-dev/src/server/org/opends/server/monitors/EntryCacheMonitorProvider.java
index 8a4a329..afd667d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/monitors/EntryCacheMonitorProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/monitors/EntryCacheMonitorProvider.java
@@ -27,6 +27,7 @@
package org.opends.server.monitors;
import static org.opends.messages.ConfigMessages.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.loggers.ErrorLogger.*;
import java.util.ArrayList;
@@ -49,6 +50,9 @@
public class EntryCacheMonitorProvider
extends MonitorProvider<EntryCacheMonitorProviderCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The name for this monitor.
private String monitorName;
@@ -67,7 +71,7 @@
public EntryCacheMonitorProvider()
{
this.entryCacheName = "Entry Caches";
- this.entryCache = (EntryCache<?>) DirectoryServer.getEntryCache();
+ this.entryCache = DirectoryServer.getEntryCache();
}
/**
@@ -99,18 +103,16 @@
}
if (monitorConfiguration == null) {
LocalizableMessage message =
- INFO_WARN_CONFIG_ENTRYCACHE_NO_MONITOR_CONFIG_ENTRY.get(
- ConfigConstants.DN_ENTRY_CACHE_MONITOR_CONFIG,
- monitorName);
- logError(message);
+ INFO_WARN_CONFIG_ENTRYCACHE_NO_MONITOR_CONFIG_ENTRY.get(
+ ConfigConstants.DN_ENTRY_CACHE_MONITOR_CONFIG, monitorName);
+ logger.debug(message);
throw new ConfigException(message);
}
if (!monitorConfiguration.isEnabled()) {
LocalizableMessage message =
- INFO_WARN_CONFIG_ENTRYCACHE_MONITOR_CONFIG_DISABLED.get(
- ConfigConstants.DN_ENTRY_CACHE_MONITOR_CONFIG,
- monitorName);
- logError(message);
+ INFO_WARN_CONFIG_ENTRYCACHE_MONITOR_CONFIG_DISABLED.get(
+ ConfigConstants.DN_ENTRY_CACHE_MONITOR_CONFIG, monitorName);
+ logger.debug(message);
throw new ConfigException(message);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
index fa0687b..486c6da 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
@@ -31,7 +31,6 @@
import static org.opends.messages.PluginMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.extensions.ExtensionsConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -365,9 +364,8 @@
.getAuthenticationPolicy(policyDN);
if (authPolicy == null)
{
- LocalizableMessage message = WARN_PLUGIN_PWIMPORT_NO_SUCH_POLICY.get(
- String.valueOf(entry.getName()), String.valueOf(policyDN));
- logError(message);
+ logger.warn(WARN_PLUGIN_PWIMPORT_NO_SUCH_POLICY, String
+ .valueOf(entry.getName()), String.valueOf(policyDN));
}
else if (authPolicy.isPasswordPolicy())
{
@@ -378,9 +376,8 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = WARN_PLUGIN_PWIMPORT_CANNOT_DECODE_POLICY_DN.get(
- String.valueOf(entry.getName()), de.getMessageObject());
- logError(message);
+ logger.warn(WARN_PLUGIN_PWIMPORT_CANNOT_DECODE_POLICY_DN, String
+ .valueOf(entry.getName()), de.getMessageObject());
break policyLoop;
}
}
@@ -423,12 +420,10 @@
{
logger.traceException(e);
- LocalizableMessage message =
- ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD
- .get(policy.getPasswordAttribute().getNameOrOID(),
- String.valueOf(entry.getName()),
- stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD,
+ policy.getPasswordAttribute().getNameOrOID(), String
+ .valueOf(entry.getName()),
+ stackTraceToSingleLineString(e));
gotError = true;
break;
}
@@ -455,12 +450,10 @@
{
logger.traceException(e);
- LocalizableMessage message =
- ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD
- .get(policy.getPasswordAttribute().getNameOrOID(),
- String.valueOf(entry.getName()),
- stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD,
+ policy.getPasswordAttribute().getNameOrOID(), String
+ .valueOf(entry.getName()),
+ stackTraceToSingleLineString(e));
gotError = true;
break;
}
@@ -517,10 +510,9 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD
- .get(t.getNameOrOID(), String.valueOf(entry.getName()),
- stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD, t
+ .getNameOrOID(), String.valueOf(entry.getName()),
+ stackTraceToSingleLineString(e));
gotError = true;
break;
}
@@ -572,10 +564,9 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD
- .get(t.getNameOrOID(), String.valueOf(entry.getName()),
- stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD, t
+ .getNameOrOID(), String.valueOf(entry.getName()),
+ stackTraceToSingleLineString(e));
gotError = true;
break;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index e4ef8c4..d030588 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -72,7 +72,6 @@
import org.opends.server.types.operation.PostOperationDeleteOperation;
import static org.opends.messages.PluginMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -245,7 +244,7 @@
/* This should never happen because the filter has already
* been verified.
*/
- logError(de.getMessageObject());
+ logger.error(de.getMessageObject());
}
}
@@ -716,14 +715,13 @@
break;
case NO_SUCH_OBJECT:
- logError(INFO_PLUGIN_REFERENT_SEARCH_NO_SUCH_OBJECT.get(
- baseDN.toString()));
+ logger.debug(INFO_PLUGIN_REFERENT_SEARCH_NO_SUCH_OBJECT.get(baseDN.toString()));
return;
default:
LocalizableMessage message1 = ERR_PLUGIN_REFERENT_SEARCH_FAILED.
get(String.valueOf(operation.getErrorMessage()));
- logError(message1);
+ logger.error(message1);
return;
}
@@ -817,7 +815,7 @@
conn.processModify(entryDN, mods);
if(modifyOperation.getResultCode() != ResultCode.SUCCESS)
{
- logError(ERR_PLUGIN_REFERENT_MODIFY_FAILED.get(entryDN.toString(),
+ logger.error(ERR_PLUGIN_REFERENT_MODIFY_FAILED.get(entryDN.toString(),
String.valueOf(modifyOperation.getErrorMessage())));
}
}
@@ -903,7 +901,7 @@
}
catch (IOException io)
{
- logError(ERR_PLUGIN_REFERENT_CLOSE_LOGFILE.get(io.getMessage()));
+ logger.error(ERR_PLUGIN_REFERENT_CLOSE_LOGFILE.get(io.getMessage()));
}
}
}
@@ -931,7 +929,7 @@
}
catch (IOException io)
{
- logError(ERR_PLUGIN_REFERENT_CLOSE_LOGFILE.get(io.getMessage()));
+ logger.error(ERR_PLUGIN_REFERENT_CLOSE_LOGFILE.get(io.getMessage()));
}
}
}
@@ -970,17 +968,14 @@
} catch (DirectoryException ex) {
//This exception should rarely happen since the plugin wrote the DN
//strings originally.
- LocalizableMessage message=
- ERR_PLUGIN_REFERENT_CANNOT_DECODE_STRING_AS_DN.
- get(ex.getMessage());
- logError(message);
+ logger.error(ERR_PLUGIN_REFERENT_CANNOT_DECODE_STRING_AS_DN, ex.getMessage());
}
}
reader.close();
logFile.delete();
logFile.createNewFile();
} catch (IOException io) {
- logError(ERR_PLUGIN_REFERENT_REPLACE_LOGFILE.get(io.getMessage()));
+ logger.error(ERR_PLUGIN_REFERENT_REPLACE_LOGFILE.get(io.getMessage()));
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java
index 3c41411..67c77ce 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java
@@ -29,7 +29,6 @@
import static org.opends.messages.PluginMessages.*;
-import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.util.StaticUtils.bytesToHexNoSpace;
import static org.opends.server.util.StaticUtils.toLowerCase;
@@ -898,7 +897,7 @@
{
for (final LocalizableMessage m : messages)
{
- logError(m);
+ logger.error(m);
}
throw new ConfigException(messages.poll());
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java
index 9c2cfcc..d4d79b4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java
@@ -49,7 +49,6 @@
import org.opends.server.util.TimeThread;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.loggers.ErrorLogger;
import static org.opends.messages.PluginMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -200,10 +199,8 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_PLUGIN_PROFILER_CANNOT_WRITE_PROFILE_DATA.
- get(String.valueOf(configEntryDN), filename,
+ logger.error(ERR_PLUGIN_PROFILER_CANNOT_WRITE_PROFILE_DATA, String.valueOf(configEntryDN), filename,
stackTraceToSingleLineString(e));
- ErrorLogger.logError(message);
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java b/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java
index bf5490d..19e48b1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java
@@ -66,7 +66,6 @@
import org.opends.server.util.TimeThread;
import static org.opends.messages.ProtocolMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -152,8 +151,7 @@
// The path specified as the LDIF directory exists, but isn't a
// directory. This is probably a mistake, and we should at least log
// a warning message.
- logError(WARN_LDIF_CONNHANDLER_LDIF_DIRECTORY_NOT_DIRECTORY.get(
- ldifDirectory.getAbsolutePath(),
+ logger.warn(WARN_LDIF_CONNHANDLER_LDIF_DIRECTORY_NOT_DIRECTORY.get(ldifDirectory.getAbsolutePath(),
configuration.dn().toString()));
}
}
@@ -161,8 +159,7 @@
{
// The path specified as the LDIF directory doesn't exist. We should log
// a warning message saying that we won't do anything until it's created.
- logError(WARN_LDIF_CONNHANDLER_LDIF_DIRECTORY_MISSING.get(
- ldifDirectory.getAbsolutePath(),
+ logger.warn(WARN_LDIF_CONNHANDLER_LDIF_DIRECTORY_MISSING.get(ldifDirectory.getAbsolutePath(),
configuration.dn().toString()));
}
@@ -503,7 +500,7 @@
fullyProcessed = false;
LocalizableMessage m = ERR_LDIF_CONNHANDLER_IO_ERROR.get(inputPath,
getExceptionMessage(ioe));
- logError(m);
+ logger.error(m);
DirectoryConfig.sendAlertNotification(this,
ALERT_TYPE_LDIF_CONNHANDLER_PARSE_ERROR, m);
}
@@ -559,7 +556,7 @@
LocalizableMessage m = ERR_LDIF_CONNHANDLER_CANNOT_RENAME.get(inputPath,
renamedPath, getExceptionMessage(e));
- logError(m);
+ logger.error(m);
DirectoryConfig.sendAlertNotification(this,
ALERT_TYPE_LDIF_CONNHANDLER_IO_ERROR, m);
}
@@ -581,7 +578,7 @@
LocalizableMessage m = ERR_LDIF_CONNHANDLER_CANNOT_DELETE.get(inputPath,
getExceptionMessage(e));
- logError(m);
+ logger.error(m);
DirectoryConfig.sendAlertNotification(this,
ALERT_TYPE_LDIF_CONNHANDLER_IO_ERROR, m);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilter.java b/opendj3-server-dev/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilter.java
index aa4bd41..c9653b5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilter.java
@@ -358,7 +358,7 @@
INFO_CONNHANDLER_UNABLE_TO_REGISTER_CLIENT.get(ctx.clientConnection
.getClientHostPort(), ctx.clientConnection.getServerHostPort(),
getExceptionMessage(e));
- logError(message);
+ logger.debug(message);
ctx.clientConnection.disconnect(DisconnectReason.SERVER_ERROR, false,
message);
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java b/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java
index f95c7d7..059f8da 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java
@@ -726,7 +726,7 @@
// error + alert about the horked config
logger.traceException(e);
- logError(ERR_CONNHANDLER_CANNOT_ACCEPT_CONNECTION.get(friendlyName,
+ logger.error(ERR_CONNHANDLER_CANNOT_ACCEPT_CONNECTION.get(friendlyName,
String.valueOf(currentConfig.dn()), getExceptionMessage(e)));
if (lastIterationFailed)
@@ -739,7 +739,7 @@
ERR_CONNHANDLER_CONSECUTIVE_ACCEPT_FAILURES.get(friendlyName,
String.valueOf(currentConfig.dn()),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_HTTP_CONNECTION_HANDLER_CONSECUTIVE_FAILURES, message);
@@ -764,7 +764,7 @@
if (HTTPAccessLogger.getHTTPAccessLogPublishers().isEmpty())
{
- logError(WARN_CONFIG_LOGGER_NO_ACTIVE_HTTP_ACCESS_LOGGERS.get());
+ logger.warn(WARN_CONFIG_LOGGER_NO_ACTIVE_HTTP_ACCESS_LOGGERS.get());
}
this.httpServer = createHttpServer();
@@ -775,7 +775,7 @@
logger.trace("Starting HTTP server...");
this.httpServer.start();
logger.trace("HTTP server started");
- logError(NOTE_CONNHANDLER_STARTED_LISTENING.get(handlerName));
+ logger.info(NOTE_CONNHANDLER_STARTED_LISTENING.get(handlerName));
}
private HttpServer createHttpServer()
@@ -933,7 +933,7 @@
this.httpServer.shutdownNow();
cleanUpHttpServer();
logger.trace("HTTP server stopped");
- logError(NOTE_CONNHANDLER_STOPPED_LISTENING.get(handlerName));
+ logger.info(NOTE_CONNHANDLER_STOPPED_LISTENING.get(handlerName));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java b/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
index 20b248f..f5b8467 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
@@ -46,7 +46,6 @@
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -192,8 +191,7 @@
{
logger.traceException(de);
- logError(ERR_INTERNAL_CANNOT_DECODE_DN.get(
- fullDNString, getExceptionMessage(de)));
+ logger.error(ERR_INTERNAL_CANNOT_DECODE_DN.get(fullDNString, getExceptionMessage(de)));
}
connectionID = nextConnectionID.getAndDecrement();
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java b/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
index 3ede31f..4e02302 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
@@ -27,6 +27,7 @@
package org.opends.server.protocols.jmx;
import java.io.IOException;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.net.InetSocketAddress;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -60,6 +61,9 @@
ServerShutdownListener,
ConfigurationChangeListener<JMXConnectionHandlerCfg> {
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
+
/**
* Key that may be placed into a JMX connection environment map to
* provide a custom {@code javax.net.ssl.TrustManager} array
@@ -306,7 +310,7 @@
config.getListenPort(), reasons))
{
LocalizableMessage message = reasons.get(0);
- logError(message);
+ logger.error(message);
throw new InitializationException(message);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
index cd1de10..d634cfe 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
@@ -32,7 +32,6 @@
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.core.DirectoryServer.*;
import static org.opends.server.loggers.AccessLogger.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -756,8 +755,7 @@
// This must mean that the operation has either not yet completed
// or that it completed without a result for some reason. In any
// case, log a message and set the response to "operations error".
- logError(ERR_LDAP_CLIENT_SEND_RESPONSE_NO_RESULT_CODE.get(
- operation.getOperationType().toString(), operation
+ logger.error(ERR_LDAP_CLIENT_SEND_RESPONSE_NO_RESULT_CODE.get(operation.getOperationType().toString(), operation
.getConnectionID(), operation.getOperationID()));
resultCode = DirectoryServer.getServerErrorResultCode();
}
@@ -829,8 +827,7 @@
// If this an LDAPv2 client, then we can't send this.
if (ldapVersion == 2)
{
- logError(ERR_LDAPV2_SKIPPING_EXTENDED_RESPONSE.get(
- getConnectionID(), operation.getOperationID(), String
+ logger.error(ERR_LDAPV2_SKIPPING_EXTENDED_RESPONSE.get(getConnectionID(), operation.getOperationID(), String
.valueOf(operation)));
return null;
}
@@ -859,7 +856,7 @@
default:
// This must be a type of operation that doesn't have a response.
// This shouldn't happen, so log a message and return.
- logError(ERR_LDAP_CLIENT_SEND_RESPONSE_INVALID_OP.get(String
+ logger.error(ERR_LDAP_CLIENT_SEND_RESPONSE_INVALID_OP.get(String
.valueOf(operation.getOperationType()), getConnectionID(),
operation.getOperationID(), String.valueOf(operation)));
return null;
@@ -926,11 +923,9 @@
// any more referrals to this client for the rest of the operation.
if (ldapVersion == 2)
{
- LocalizableMessage message =
- ERR_LDAPV2_SKIPPING_SEARCH_REFERENCE.get(getConnectionID(),
+ logger.error(ERR_LDAPV2_SKIPPING_SEARCH_REFERENCE, getConnectionID(),
searchOperation.getOperationID(), String
.valueOf(searchReference));
- logError(message);
return false;
}
@@ -2126,7 +2121,7 @@
LocalizableMessage msg =
ERR_LDAPV2_EXTENDED_REQUEST_NOT_ALLOWED.get(
getConnectionID(), message.getMessageID());
- logError(msg);
+ logger.error(msg);
disconnect(DisconnectReason.PROTOCOL_ERROR, false, msg);
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
index 1541337..eabe45c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
@@ -734,7 +734,7 @@
allowReuseAddress, config.dn());
if (errorMessage != null)
{
- logError(errorMessage);
+ logger.error(errorMessage);
throw new InitializationException(errorMessage);
}
@@ -975,7 +975,7 @@
cleanUpSelector();
listening = false;
- logError(NOTE_CONNHANDLER_STOPPED_LISTENING.get(handlerName));
+ logger.info(NOTE_CONNHANDLER_STOPPED_LISTENING.get(handlerName));
}
StaticUtils.sleep(1000);
@@ -1005,7 +1005,7 @@
// administrative action before trying again.
if (numRegistered == 0)
{
- logError(ERR_LDAP_CONNHANDLER_NO_ACCEPTORS.get(String
+ logger.error(ERR_LDAP_CONNHANDLER_NO_ACCEPTORS.get(String
.valueOf(currentConfig.dn())));
enabled = false;
@@ -1029,7 +1029,7 @@
{
logger.traceException(e);
- logError(ERR_CONNHANDLER_CANNOT_ACCEPT_CONNECTION.get(friendlyName,
+ logger.error(ERR_CONNHANDLER_CANNOT_ACCEPT_CONNECTION.get(friendlyName,
String.valueOf(currentConfig.dn()), getExceptionMessage(e)));
if (lastIterationFailed)
@@ -1038,10 +1038,11 @@
// encountered a failure. Rather than enter a potential
// infinite loop of failures, disable this acceptor and
// log an error.
- LocalizableMessage message = ERR_CONNHANDLER_CONSECUTIVE_ACCEPT_FAILURES
- .get(friendlyName, String.valueOf(currentConfig.dn()),
+ LocalizableMessage message =
+ ERR_CONNHANDLER_CONSECUTIVE_ACCEPT_FAILURES.get(friendlyName,
+ String.valueOf(currentConfig.dn()),
stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(message);
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_LDAP_CONNECTION_HANDLER_CONSECUTIVE_FAILURES,
@@ -1074,10 +1075,10 @@
// only thing we can do here is log a message, send an alert,
// and disable the selector until an administrator can figure
// out what's going on.
- LocalizableMessage message = ERR_LDAP_CONNHANDLER_UNCAUGHT_ERROR
- .get(String.valueOf(currentConfig.dn()),
- stackTraceToSingleLineString(e));
- logError(message);
+ LocalizableMessage message =
+ ERR_LDAP_CONNHANDLER_UNCAUGHT_ERROR.get(String
+ .valueOf(currentConfig.dn()), stackTraceToSingleLineString(e));
+ logger.error(message);
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_LDAP_CONNECTION_HANDLER_UNCAUGHT_ERROR, message);
@@ -1154,15 +1155,15 @@
channel.register(selector, SelectionKey.OP_ACCEPT);
numRegistered++;
- logError(NOTE_CONNHANDLER_STARTED_LISTENING.get(handlerName));
+ logger.info(NOTE_CONNHANDLER_STARTED_LISTENING.get(handlerName));
}
catch (Exception e)
{
logger.traceException(e);
- logError(ERR_LDAP_CONNHANDLER_CREATE_CHANNEL_FAILED.get(
- String.valueOf(currentConfig.dn()), a.getHostAddress(),
- listenPort, stackTraceToSingleLineString(e)));
+ logger.error(ERR_LDAP_CONNHANDLER_CREATE_CHANNEL_FAILED.get(String
+ .valueOf(currentConfig.dn()), a.getHostAddress(), listenPort,
+ stackTraceToSingleLineString(e)));
}
}
return numRegistered;
@@ -1257,7 +1258,7 @@
INFO_CONNHANDLER_UNABLE_TO_REGISTER_CLIENT.get(clientConnection
.getClientHostPort(), clientConnection.getServerHostPort(),
getExceptionMessage(e));
- logError(message);
+ logger.debug(message);
clientConnection.disconnect(DisconnectReason.SERVER_ERROR,
currentConfig.isSendRejectionNotice(), message);
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java
index 154bdf4..e23fcbc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java
@@ -47,7 +47,6 @@
import org.opends.server.api.DirectoryThread;
import org.opends.server.api.ServerShutdownListener;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.asn1.ASN1ByteChannelReader;
import org.opends.server.protocols.asn1.ASN1Exception;
@@ -362,9 +361,7 @@
// This should not happen, and it would have caused our reader
// thread to die. Log a severe error.
- LocalizableMessage message = ERR_LDAP_REQHANDLER_UNEXPECTED_SELECT_EXCEPTION.
- get(getName(), getExceptionMessage(e));
- ErrorLogger.logError(message);
+ logger.error(ERR_LDAP_REQHANDLER_UNEXPECTED_SELECT_EXCEPTION, getName(), getExceptionMessage(e));
}
finally
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java
index 83d4fd7..319d52f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java
@@ -28,7 +28,6 @@
import java.util.*;
-import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.replication.common.CSN;
@@ -40,7 +39,6 @@
import org.opends.server.util.TimeThread;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
/**
@@ -684,10 +682,8 @@
* historical information is going to be kept.
* Log information for the repair tool.
*/
- LocalizableMessage message = ERR_UNKNOWN_ATTRIBUTE_IN_HISTORICAL.get(
- entry.getName().toNormalizedString(),
+ logger.error(ERR_UNKNOWN_ATTRIBUTE_IN_HISTORICAL, entry.getName().toNormalizedString(),
histVal.getAttrString());
- logError(message);
continue;
}
@@ -729,8 +725,7 @@
// Any exception happening here means that the coding of the historical
// information was wrong.
// Log an error and continue with an empty historical.
- LocalizableMessage message = ERR_BAD_HISTORICAL.get(entry.getName().toString());
- logError(message);
+ logger.error(ERR_BAD_HISTORICAL, entry.getName().toString());
}
/* set the reference to the historical information in the entry */
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index 1077a10..e024272 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -388,7 +388,7 @@
{
// Replication server is missing some of our changes: let's
// send them to him.
- logError(DEBUG_GOING_TO_SEARCH_FOR_CHANGES.get());
+ logger.trace(DEBUG_GOING_TO_SEARCH_FOR_CHANGES.get());
/*
* Get all the changes that have not been seen by this
@@ -398,7 +398,7 @@
{
if (buildAndPublishMissingChanges(startCSN, broker, shutdown))
{
- logError(DEBUG_CHANGES_SENT.get());
+ logger.trace(DEBUG_CHANGES_SENT.get());
synchronized(replayOperations)
{
replayOperations.clear();
@@ -413,7 +413,7 @@
* Log an error for the repair tool
* that will need to re-synchronize the servers.
*/
- logError(ERR_CANNOT_RECOVER_CHANGES.get(getBaseDNString()));
+ logger.error(ERR_CANNOT_RECOVER_CHANGES.get(getBaseDNString()));
}
} catch (Exception e)
{
@@ -424,7 +424,7 @@
* Log an error for the repair tool
* that will need to re-synchronize the servers.
*/
- logError(ERR_CANNOT_RECOVER_CHANGES.get(getBaseDNString()));
+ logger.error(ERR_CANNOT_RECOVER_CHANGES.get(getBaseDNString()));
}
finally
{
@@ -481,7 +481,7 @@
}
catch (DirectoryException e)
{
- logError(ERR_LOADING_GENERATION_ID.get(
+ logger.error(ERR_LOADING_GENERATION_ID.get(
getBaseDNString(), stackTraceToSingleLineString(e)));
}
@@ -569,7 +569,7 @@
// Should not happen as normally already called without problem in
// isConfigurationChangeAcceptable or isConfigurationAcceptable
// if we come up to this method
- logError(NOTE_ERR_FRACTIONAL.get(getBaseDNString(),
+ logger.error(NOTE_ERR_FRACTIONAL.get(getBaseDNString(),
stackTraceToSingleLineString(e)));
return;
}
@@ -588,7 +588,7 @@
catch (ConfigException e)
{
// Should not happen
- logError(NOTE_ERR_FRACTIONAL.get(getBaseDNString(),
+ logger.error(NOTE_ERR_FRACTIONAL.get(getBaseDNString(),
stackTraceToSingleLineString(e)));
return;
}
@@ -662,7 +662,7 @@
if (search.getResultCode() != ResultCode.SUCCESS
&& search.getResultCode() != ResultCode.NO_SUCH_OBJECT)
{
- logError(ERR_SEARCHING_GENERATION_ID.get(
+ logger.error(ERR_SEARCHING_GENERATION_ID.get(
search.getResultCode().getResultCodeName() + " " +
search.getErrorMessage(),
getBaseDNString()));
@@ -715,7 +715,7 @@
}
if (attr.size() > 1)
{
- logError(ERR_LOADING_GENERATION_ID.get(getBaseDNString(),
+ logger.error(ERR_LOADING_GENERATION_ID.get(getBaseDNString(),
"#Values=" + attr.size() + " Must be exactly 1 in entry "
+ resultEntry.toLDIFString()));
}
@@ -776,7 +776,7 @@
{
// Should not happen as configuration in domain root entry is flushed
// from valid configuration in local variables
- logError(NOTE_ERR_FRACTIONAL.get(
+ logger.error(NOTE_ERR_FRACTIONAL.get(
fractionalConfig.getBaseDn().toString(),
stackTraceToSingleLineString(e)));
return false;
@@ -810,7 +810,7 @@
// Should not happen as configuration in domain root entry is flushed
// from valid configuration in local variables so both should have already
// been checked
- logError(NOTE_ERR_FRACTIONAL.get(
+ logger.error(NOTE_ERR_FRACTIONAL.get(
fractionalConfig.getBaseDn().toString(),
stackTraceToSingleLineString(e)));
return false;
@@ -1421,7 +1421,7 @@
}
catch(DirectoryException e)
{
- logError(NOTE_ERR_FRACTIONAL.get(getBaseDNString(),
+ logger.error(NOTE_ERR_FRACTIONAL.get(getBaseDNString(),
stackTraceToSingleLineString(e)));
return FRACTIONAL_HAS_NO_FRACTIONAL_FILTERED_ATTRIBUTES;
}
@@ -2017,7 +2017,7 @@
}
catch (NoSuchElementException e)
{
- logError(ERR_OPERATION_NOT_FOUND_IN_PENDING.get(
+ logger.error(ERR_OPERATION_NOT_FOUND_IN_PENDING.get(
op.toString(), curCSN.toString()));
return;
}
@@ -2035,7 +2035,7 @@
* It should never happen.
*/
pendingChanges.remove(curCSN);
- logError(ERR_UNKNOWN_TYPE.get(op.getOperationType().toString()));
+ logger.error(ERR_UNKNOWN_TYPE.get(op.getOperationType().toString()));
return;
}
@@ -2055,7 +2055,7 @@
}
catch (NoSuchElementException e)
{
- logError(ERR_OPERATION_NOT_FOUND_IN_PENDING.get(
+ logger.error(ERR_OPERATION_NOT_FOUND_IN_PENDING.get(
op.toString(), curCSN.toString()));
return;
}
@@ -2068,7 +2068,7 @@
} catch (TimeoutException ex)
{
// This exception may only be raised if assured replication is enabled
- logError(NOTE_DS_ACK_TIMEOUT.get(getBaseDNString(),
+ logger.error(NOTE_DS_ACK_TIMEOUT.get(getBaseDNString(),
Long.toString(getAssuredTimeout()), msg.toString()));
}
}
@@ -2170,7 +2170,7 @@
ResultCode res = newOp.getResultCode();
if (res != ResultCode.SUCCESS)
{
- logError(ERR_COULD_NOT_SOLVE_CONFLICT.get(
+ logger.error(ERR_COULD_NOT_SOLVE_CONFLICT.get(
entryDN.toString(), res.toString()));
}
}
@@ -2444,7 +2444,7 @@
// Let the repair tool know about this.
LocalizableMessage message = ERR_LOOP_REPLAYING_OPERATION.get(op.toString(),
op.getErrorMessage().toString());
- logError(message);
+ logger.error(message);
numUnresolvedNamingConflicts.incrementAndGet();
replayErrorMsg = message.toString();
updateError(csn);
@@ -2468,9 +2468,9 @@
* to be inconsistent.
* Let the repair tool know about this.
*/
- LocalizableMessage message = ERR_EXCEPTION_REPLAYING_OPERATION.get(
- stackTraceToSingleLineString(e), op.toString());
- logError(message);
+ LocalizableMessage message =
+ ERR_EXCEPTION_REPLAYING_OPERATION.get(
+ stackTraceToSingleLineString(e), op.toString());
replayErrorMsg = message.toString();
updateError(csn);
} else
@@ -2494,9 +2494,10 @@
private String logDecodingOperationError(LDAPUpdateMsg msg, Exception e)
{
- LocalizableMessage message = ERR_EXCEPTION_DECODING_OPERATION.get(
- String.valueOf(msg) + " " + stackTraceToSingleLineString(e));
- logError(message);
+ LocalizableMessage message =
+ ERR_EXCEPTION_DECODING_OPERATION.get(String.valueOf(msg) + " "
+ + stackTraceToSingleLineString(e));
+ logger.error(message);
return message.toString();
}
@@ -2699,7 +2700,7 @@
{
// The other type of errors can not be caused by naming conflicts.
// Log a message for the repair tool.
- logError(ERR_ERROR_REPLAYING_OPERATION.get(
+ logger.error(ERR_ERROR_REPLAYING_OPERATION.get(
op.toString(), ctx.getCSN().toString(),
result.toString(), op.getErrorMessage().toString()));
return true;
@@ -2768,7 +2769,7 @@
{
// The other type of errors can not be caused by naming conflicts.
// Log a message for the repair tool.
- logError(ERR_ERROR_REPLAYING_OPERATION.get(
+ logger.error(ERR_ERROR_REPLAYING_OPERATION.get(
op.toString(), ctx.getCSN().toString(),
result.toString(), op.getErrorMessage().toString()));
return true;
@@ -2888,7 +2889,7 @@
{
// The other type of errors can not be caused by naming conflicts.
// Log a message for the repair tool.
- logError(ERR_ERROR_REPLAYING_OPERATION.get(
+ logger.error(ERR_ERROR_REPLAYING_OPERATION.get(
op.toString(), ctx.getCSN().toString(),
result.toString(), op.getErrorMessage().toString()));
return true;
@@ -2986,7 +2987,7 @@
{
// The other type of errors can not be caused by naming conflicts.
// log a message for the repair tool.
- logError(ERR_ERROR_REPLAYING_OPERATION.get(
+ logger.error(ERR_ERROR_REPLAYING_OPERATION.get(
op.toString(), ctx.getCSN().toString(),
result.toString(), op.getErrorMessage().toString()));
return true;
@@ -3051,7 +3052,7 @@
mb.append(String.valueOf(conflictOp));
mb.append(" ");
mb.append(String.valueOf(op.getResultCode()));
- logError(mb.toMessage());
+ logger.error(mb.toMessage());
}
} catch (DirectoryException e)
{
@@ -3063,7 +3064,7 @@
mb.append(String.valueOf(conflictOp));
mb.append(" ");
mb.append(stackTraceToSingleLineString(e));
- logError(mb.toMessage());
+ logger.error(mb.toMessage());
}
return conflict;
@@ -3098,7 +3099,7 @@
mb.append(String.valueOf(conflictOp));
mb.append(" ");
mb.append(String.valueOf(newOp.getResultCode()));
- logError(mb.toMessage());
+ logger.error(mb.toMessage());
}
}
@@ -3135,7 +3136,7 @@
mb.append(String.valueOf(op));
mb.append(" ");
mb.append(String.valueOf(newOp.getResultCode()));
- logError(mb.toMessage());
+ logger.error(mb.toMessage());
}
// Generate an alert to let the administration know that some
@@ -3296,7 +3297,7 @@
* not available, log an error and retry upon timeout
* should we stop the modifications ?
*/
- logError(ERR_LOADING_GENERATION_ID.get(
+ logger.error(ERR_LOADING_GENERATION_ID.get(
getBaseDNString(), stackTraceToSingleLineString(e)));
return;
}
@@ -3375,7 +3376,7 @@
if (result != ResultCode.SUCCESS)
{
- logError(ERR_UPDATING_GENERATION_ID.get(
+ logger.error(ERR_UPDATING_GENERATION_ID.get(
result.getResultCodeName(), getBaseDNString()));
}
}
@@ -3428,7 +3429,7 @@
{
if (search.getResultCode() != ResultCode.NO_SUCH_OBJECT)
{
- logError(ERR_SEARCHING_GENERATION_ID.get(
+ logger.error(ERR_SEARCHING_GENERATION_ID.get(
search.getResultCode().getResultCodeName() + " " +
search.getErrorMessage(),
getBaseDNString()));
@@ -3449,7 +3450,7 @@
Attribute attr = attrs.get(0);
if (attr.size()>1)
{
- logError(ERR_LOADING_GENERATION_ID.get(
+ logger.error(ERR_LOADING_GENERATION_ID.get(
getBaseDNString(), "#Values=" + attr.size() +
" Must be exactly 1 in entry " + resultEntry.toLDIFString()));
}
@@ -3462,7 +3463,7 @@
}
catch(Exception e)
{
- logError(ERR_LOADING_GENERATION_ID.get(
+ logger.error(ERR_LOADING_GENERATION_ID.get(
getBaseDNString(), stackTraceToSingleLineString(e)));
}
}
@@ -3548,17 +3549,19 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
{
- LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND.get(
- backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ LocalizableMessage message =
+ ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND.get(backend.getBackendID(),
+ String.valueOf(failureReason));
+ logger.error(message);
throw new DirectoryException(ResultCode.OTHER, message);
}
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND.get(
- backend.getBackendID(), stackTraceToSingleLineString(e));
- logError(message);
+ LocalizableMessage message =
+ ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND.get(backend.getBackendID(),
+ stackTraceToSingleLineString(e));
+ logger.error(message);
throw new DirectoryException(ResultCode.OTHER, message);
}
@@ -3619,17 +3622,15 @@
if (ros == null ||
ros.getNumExportedEntries() < entryCount)
{
- LocalizableMessage message =
- ERR_LDIFEXPORT_ERROR_DURING_EXPORT.get(de.getMessageObject());
- logError(message);
+ LocalizableMessage message = ERR_LDIFEXPORT_ERROR_DURING_EXPORT.get(de.getMessageObject());
+ logger.error(message);
throw new DirectoryException(ResultCode.OTHER, message);
}
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFEXPORT_ERROR_DURING_EXPORT.get(
- stackTraceToSingleLineString(e));
- logError(message);
+ LocalizableMessage message = ERR_LDIFEXPORT_ERROR_DURING_EXPORT.get(stackTraceToSingleLineString(e));
+ logger.error(message);
throw new DirectoryException(ResultCode.OTHER, message);
}
finally
@@ -3650,17 +3651,19 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- LocalizableMessage message = WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND.get(
- backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ LocalizableMessage message =
+ WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(),
+ String.valueOf(failureReason));
+ logger.warn(message);
throw new DirectoryException(ResultCode.OTHER, message);
}
}
catch (Exception e)
{
- LocalizableMessage message = WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND.get(
- backend.getBackendID(), stackTraceToSingleLineString(e));
- logError(message);
+ LocalizableMessage message =
+ WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(),
+ stackTraceToSingleLineString(e));
+ logger.warn(message);
throw new DirectoryException(ResultCode.OTHER, message);
}
}
@@ -3688,10 +3691,9 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.acquireExclusiveLock(lockFile, failureReason))
{
- LocalizableMessage message = ERR_INIT_CANNOT_LOCK_BACKEND.get(
- backend.getBackendID(),
- String.valueOf(failureReason));
- logError(message);
+ LocalizableMessage message = ERR_INIT_CANNOT_LOCK_BACKEND.get(backend.getBackendID(),
+ String.valueOf(failureReason));
+ logger.error(message);
throw new DirectoryException(ResultCode.OTHER, message);
}
}
@@ -3803,9 +3805,10 @@
// Release lock
if (!LockFileManager.releaseLock(lockFile, failureReason))
{
- LocalizableMessage message = WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND.get(
- backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ LocalizableMessage message =
+ WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(),
+ String.valueOf(failureReason));
+ logger.warn(message);
throw new DirectoryException(ResultCode.OTHER, message);
}
@@ -4048,7 +4051,7 @@
catch(Exception e)
{
logger.traceException(e);
- logError(ERR_CHECK_CREATE_REPL_BACKEND_FAILED.get(
+ logger.error(ERR_CHECK_CREATE_REPL_BACKEND_FAILED.get(
stackTraceToSingleLineString(e)));
}
}
@@ -4155,7 +4158,7 @@
}
catch (DirectoryException de)
{
- logError(NOTE_ERR_UNABLE_TO_ENABLE_ECL.get(
+ logger.error(NOTE_ERR_UNABLE_TO_ENABLE_ECL.get(
"Replication Domain on " + getBaseDNString(),
stackTraceToSingleLineString(de)));
// and go on
@@ -4168,7 +4171,7 @@
// Go into bad data set status
setNewStatus(StatusMachineEvent.TO_BAD_GEN_ID_STATUS_EVENT);
broker.signalStatusChange(status);
- logError(NOTE_FRACTIONAL_BAD_DATA_SET_NEED_RESYNC.get(getBaseDNString()));
+ logger.error(NOTE_FRACTIONAL_BAD_DATA_SET_NEED_RESYNC.get(getBaseDNString()));
return; // Do not send changes to the replication server
}
@@ -4206,7 +4209,7 @@
}
} catch (Exception e)
{
- logError(ERR_PUBLISHING_FAKE_OPS.get(getBaseDNString(),
+ logger.error(ERR_PUBLISHING_FAKE_OPS.get(getBaseDNString(),
stackTraceToSingleLineString(e)));
}
}
@@ -4414,7 +4417,7 @@
if (!backend.supportsLDIFExport())
{
LocalizableMessage msg = ERR_INIT_EXPORT_NOT_SUPPORTED.get(backend.getBackendID());
- logError(msg);
+ logger.error(msg);
throw new DirectoryException(ResultCode.OTHER, msg);
}
@@ -5185,7 +5188,7 @@
mb.append(String.valueOf(newOp));
mb.append(" ");
mb.append(String.valueOf(newOp.getResultCode()));
- logError(mb.toMessage());
+ logger.error(mb.toMessage());
}
else if (task != null)
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
index c65ce64..f7fa340 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
@@ -27,6 +27,7 @@
package org.opends.server.replication.plugin;
import java.util.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.LinkedBlockingQueue;
@@ -45,7 +46,6 @@
import org.opends.server.types.operation.*;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.replication.plugin.
ReplicationRepairRequestControl.*;
import static org.opends.server.util.StaticUtils.*;
@@ -67,6 +67,9 @@
BackupTaskListener, RestoreTaskListener, ImportTaskListener,
ExportTaskListener
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
private ReplicationServerListener replicationServerListener = null;
private static final Map<DN, LDAPReplicationDomain> domains =
new ConcurrentHashMap<DN, LDAPReplicationDomain>(4) ;
@@ -194,8 +197,7 @@
}
catch (ConfigException e)
{
- logError(ERR_COULD_NOT_START_REPLICATION.get(
- configuration.dn().toString(), e.getLocalizedMessage()
+ logger.error(ERR_COULD_NOT_START_REPLICATION.get(configuration.dn().toString(), e.getLocalizedMessage()
+ " " + stackTraceToSingleLineString(e)));
}
return null;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
index c170a5a..ae2317d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
@@ -27,6 +27,7 @@
package org.opends.server.replication.plugin;
import java.util.ArrayList;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
@@ -43,7 +44,6 @@
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
/**
* This class implements a ServerState that is stored in the backend
@@ -52,6 +52,9 @@
*/
public class PersistentServerState
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
private final DN baseDn;
private final InternalClientConnection conn =
InternalClientConnection.getRootConnection();
@@ -189,10 +192,8 @@
if (((search.getResultCode() != ResultCode.SUCCESS)) &&
((search.getResultCode() != ResultCode.NO_SUCH_OBJECT)))
{
- LocalizableMessage message = ERR_ERROR_SEARCHING_RUV.
- get(search.getResultCode().getResultCodeName(), search.toString(),
+ logger.error(ERR_ERROR_SEARCHING_RUV, search.getResultCode().getResultCodeName(), search.toString(),
search.getErrorMessage(), baseDn.toString());
- logError(message);
return null;
}
@@ -335,12 +336,10 @@
op.run();
if (op.getResultCode() != ResultCode.SUCCESS)
{
- LocalizableMessage message = DEBUG_ERROR_UPDATING_RUV.get(
- op.getResultCode().getResultCodeName().toString(),
+ logger.trace(DEBUG_ERROR_UPDATING_RUV, op.getResultCode().getResultCodeName().toString(),
op.toString(),
op.getErrorMessage().toString(),
baseDn.toString());
- logError(message);
}
return op.getResultCode();
}
@@ -406,9 +405,7 @@
{
// An error happened trying to search for the updates
// Log an error
- message = ERR_CANNOT_RECOVER_CHANGES.get(
- baseDn.toNormalizedString());
- logError(message);
+ logger.error(ERR_CANNOT_RECOVER_CHANGES, baseDn.toNormalizedString());
}
else
{
@@ -438,9 +435,7 @@
// Update the serverState with the new maxCsn
// present in the database
this.update(dbMaxCsn);
- message = NOTE_SERVER_STATE_RECOVERY.get(
- baseDn.toNormalizedString(), dbMaxCsn.toString());
- logError(message);
+ logger.info(NOTE_SERVER_STATE_RECOVERY, baseDn.toNormalizedString(), dbMaxCsn.toString());
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplayThread.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplayThread.java
index 5b5f202..4b36d9c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplayThread.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplayThread.java
@@ -27,14 +27,12 @@
package org.opends.server.replication.plugin;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.DirectoryThread;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.replication.protocol.LDAPUpdateMsg;
@@ -106,9 +104,7 @@
* catch all exceptions happening so that the thread never dies even
* in case of problems.
*/
- LocalizableMessage message = ERR_EXCEPTION_REPLAYING_REPLICATION_MESSAGE.get(
- stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(ERR_EXCEPTION_REPLAYING_REPLICATION_MESSAGE, stackTraceToSingleLineString(e));
}
}
if (logger.isTraceEnabled())
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
index e6dee22..3454011 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
@@ -27,6 +27,7 @@
package org.opends.server.replication.protocol;
import java.io.IOException;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.net.Socket;
import java.util.SortedSet;
@@ -35,13 +36,11 @@
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
-import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.config.ConfigException;
import org.opends.server.types.CryptoManager;
import org.opends.server.types.DirectoryConfig;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
/**
@@ -52,6 +51,9 @@
*/
public final class ReplSessionSecurity
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* Whether replication sessions use SSL encryption.
*/
@@ -260,11 +262,9 @@
{
// This is probably a connection attempt from an unexpected client
// log that to warn the administrator.
- final LocalizableMessage message = INFO_SSL_SERVER_CON_ATTEMPT_ERROR.get(
- socket.getRemoteSocketAddress().toString(),
+ logger.debug(INFO_SSL_SERVER_CON_ATTEMPT_ERROR, socket.getRemoteSocketAddress().toString(),
socket.getLocalSocketAddress().toString(),
e.getLocalizedMessage());
- logError(message);
return null;
}
finally
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java
index 9f11db2..887ebd7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java
@@ -27,6 +27,7 @@
package org.opends.server.replication.server;
import java.io.IOException;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.*;
import org.forgerock.i18n.LocalizableMessage;
@@ -34,7 +35,6 @@
import org.opends.server.replication.protocol.*;
import org.opends.server.types.*;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.replication.common.ServerStatus.*;
import static org.opends.server.replication.common.StatusMachine.*;
import static org.opends.server.replication.protocol.ProtocolVersion.*;
@@ -45,6 +45,9 @@
*/
public class DataServerHandler extends ServerHandler
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* Temporary generationId received in handshake/phase1, and used after
* handshake/phase2.
@@ -100,13 +103,11 @@
{
// Prevent useless error message (full update status cannot lead to bad
// gen status)
- LocalizableMessage message = NOTE_BAD_GEN_ID_IN_FULL_UPDATE.get(
- Integer.toString(replicationServer.getServerId()),
+ logger.info(NOTE_BAD_GEN_ID_IN_FULL_UPDATE, Integer.toString(replicationServer.getServerId()),
getBaseDNString(),
Integer.toString(serverId),
Long.toString(generationId),
Long.toString(newGenId));
- logError(message);
return;
}
@@ -202,7 +203,7 @@
{
LocalizableMessage msg = ERR_RS_CANNOT_CHANGE_STATUS.get(getBaseDNString(),
Integer.toString(serverId), status.toString(), event.toString());
- logError(msg);
+ logger.error(msg);
// Only change allowed is from NORMAL_STATUS to DEGRADED_STATUS and vice
// versa. We may be trying to change the status while another status has
// just been entered: e.g a full update has just been engaged.
@@ -321,7 +322,7 @@
{
LocalizableMessage msg = ERR_RS_INVALID_NEW_STATUS.get(reqStatus.toString(),
getBaseDNString(), Integer.toString(serverId));
- logError(msg);
+ logger.error(msg);
return ServerStatus.INVALID_STATUS;
}
@@ -331,7 +332,7 @@
{
LocalizableMessage msg = ERR_RS_CANNOT_CHANGE_STATUS.get(getBaseDNString(),
Integer.toString(serverId), status.toString(), event.toString());
- logError(msg);
+ logger.error(msg);
return ServerStatus.INVALID_STATUS;
}
@@ -472,11 +473,9 @@
replicationServerDomain.register(this);
- LocalizableMessage message = INFO_REPLICATION_SERVER_CONNECTION_FROM_DS
- .get(getReplicationServerId(), getServerId(),
+ logger.debug(INFO_REPLICATION_SERVER_CONNECTION_FROM_DS, getReplicationServerId(), getServerId(),
replicationServerDomain.getBaseDN().toNormalizedString(),
session.getReadableRemoteAddress());
- logError(message);
super.finalizeStart();
}
@@ -613,11 +612,9 @@
{
if (generationId != localGenerationId)
{
- LocalizableMessage message = WARN_BAD_GENERATION_ID_FROM_DS.get(
- serverId, session.getReadableRemoteAddress(),
+ logger.warn(WARN_BAD_GENERATION_ID_FROM_DS, serverId, session.getReadableRemoteAddress(),
generationId, getBaseDNString(),
getReplicationServerId(), localGenerationId);
- logError(message);
}
}
else
@@ -627,11 +624,9 @@
{
// If the LDAP server has already sent changes
// it is not expected to connect to an empty RS
- LocalizableMessage message = WARN_BAD_GENERATION_ID_FROM_DS.get(
- serverId, session.getReadableRemoteAddress(),
+ logger.warn(WARN_BAD_GENERATION_ID_FROM_DS, serverId, session.getReadableRemoteAddress(),
generationId, getBaseDNString(),
getReplicationServerId(), localGenerationId);
- logError(message);
}
else
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java
index dc88b92..7216a31 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java
@@ -27,6 +27,7 @@
package org.opends.server.replication.server;
import java.io.IOException;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.*;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
@@ -42,7 +43,6 @@
import org.opends.server.util.ServerConstants;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.replication.protocol.ProtocolVersion.*;
import static org.opends.server.replication.protocol.StartECLSessionMsg
.ECLRequestType.*;
@@ -57,6 +57,9 @@
public final class ECLServerHandler extends ServerHandler
{
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
+
/**
* Marks the end of the search on the External Change Log.
*/
@@ -915,7 +918,7 @@
releaseCursor();
for (DomainContext domainCtxt : domainCtxts) {
if (!domainCtxt.unRegisterHandler()) {
- logError(LocalizableMessage.raw( this + " shutdown() - error when unregistering handler "
+ logger.error(LocalizableMessage.raw( this + " shutdown() - error when unregistering handler "
+ domainCtxt.mh));
}
domainCtxt.stopServer();
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerWriter.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerWriter.java
index 9f5266d..ff3a530 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerWriter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerWriter.java
@@ -41,7 +41,6 @@
import org.opends.server.workflowelement.externalchangelog.ECLWorkflowElement;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
/**
@@ -155,15 +154,14 @@
// session is always null if a socket exception has occurred.
if (session != null)
{
- logError(handler.getBadlyDisconnectedErrorMessage());
+ logger.error(handler.getBadlyDisconnectedErrorMessage());
}
}
catch (Exception e)
{
// An unexpected error happened.
// Log an error and close the connection.
- logError(ERR_WRITER_UNEXPECTED_EXCEPTION.get(
- handler + " " + stackTraceToSingleLineString(e)));
+ logger.error(ERR_WRITER_UNEXPECTED_EXCEPTION.get(handler + " " + stackTraceToSingleLineString(e)));
}
finally
{
@@ -259,7 +257,7 @@
}
catch (Exception e)
{
- logError(ERR_WRITER_UNEXPECTED_EXCEPTION.get(
+ logger.error(ERR_WRITER_UNEXPECTED_EXCEPTION.get(
handler + " " + stackTraceToSingleLineString(e)));
mypsearch.cancel();
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/MsgQueue.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/MsgQueue.java
index 13903d9..71f9327 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/MsgQueue.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/MsgQueue.java
@@ -27,6 +27,7 @@
package org.opends.server.replication.server;
import java.util.NavigableMap;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.TreeMap;
import org.forgerock.i18n.LocalizableMessage;
@@ -34,7 +35,6 @@
import org.opends.server.replication.protocol.UpdateMsg;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
/**
* This class is used to build ordered lists of UpdateMsg.
@@ -42,6 +42,9 @@
*/
public class MsgQueue
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
private NavigableMap<CSN, UpdateMsg> map = new TreeMap<CSN, UpdateMsg>();
private final Object lock = new Object();
@@ -125,7 +128,7 @@
LocalizableMessage errMsg = ERR_RSQUEUE_DIFFERENT_MSGS_WITH_SAME_CN.get(
msgSameCSN.getCSN().toString(),
msgSameCSN.toString(), update.toString());
- logError(errMsg);
+ logger.error(errMsg);
}
}
catch(Exception e)
@@ -155,7 +158,7 @@
{
// should never happen
LocalizableMessage msg = ERR_BYTE_COUNT.get(Integer.toString(bytesCount));
- logError(msg);
+ logger.error(msg);
bytesCount = 0;
}
return update;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java
index b35a759..909bf50 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java
@@ -62,7 +62,6 @@
import static org.opends.messages.JebMessages.*;
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.types.FilterType.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -498,9 +497,7 @@
rate = 1000f*exportedCount / totalTime;
}
- LocalizableMessage message = NOTE_JEB_EXPORT_FINAL_STATUS.get(
- exportedCount, skippedCount, totalTime/1000, rate);
- logError(message);
+ logger.info(NOTE_JEB_EXPORT_FINAL_STATUS, exportedCount, skippedCount, totalTime/1000, rate);
}
private List<ReplicationServerDomain> selectReplicationDomains(
@@ -591,7 +588,7 @@
catch (Exception e)
{
logger.traceException(e);
- logError(ERR_BACKEND_EXPORT_ENTRY.get(dnString, String.valueOf(e)));
+ logger.error(ERR_BACKEND_EXPORT_ENTRY.get(dnString, String.valueOf(e)));
}
}
}
@@ -873,7 +870,7 @@
{
message = ERR_BACKEND_SEARCH_ENTRY.get(dnStr, e.getLocalizedMessage());
}
- logError(message);
+ logger.error(message);
}
}
@@ -1091,9 +1088,7 @@
float rate = 1000f*deltaCount / deltaTime;
- LocalizableMessage message =
- NOTE_JEB_EXPORT_PROGRESS_REPORT.get(latestCount, skippedCount, rate);
- logError(message);
+ logger.info(NOTE_JEB_EXPORT_PROGRESS_REPORT, latestCount, skippedCount, rate);
previousCount = latestCount;
previousTime = latestTime;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationDomainMonitor.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationDomainMonitor.java
index 23cff08..2474f0e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationDomainMonitor.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationDomainMonitor.java
@@ -27,12 +27,12 @@
package org.opends.server.replication.server;
import java.io.IOException;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.common.ServerState;
import org.opends.server.replication.protocol.MonitorMsg;
@@ -40,7 +40,6 @@
import org.opends.server.util.TimeThread;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
/**
@@ -49,6 +48,9 @@
class ReplicationDomainMonitor
{
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
+
/**
* The monitor data consolidated over the topology.
*/
@@ -182,9 +184,7 @@
catch (IOException e)
{
// Log a message and do a best effort from here.
- LocalizableMessage message = ERR_SENDING_REMOTE_MONITOR_DATA_REQUEST.get(
- baseDN, serverId, e.getMessage());
- logError(message);
+ logger.error(ERR_SENDING_REMOTE_MONITOR_DATA_REQUEST, baseDN, serverId, e.getMessage());
}
}
@@ -207,7 +207,7 @@
// error log with repeated messages.
if (!pendingMonitorDataServerIDs.contains(serverId))
{
- logError(NOTE_MONITOR_DATA_RECEIVED.get(baseDN, serverId));
+ logger.info(NOTE_MONITOR_DATA_RECEIVED.get(baseDN, serverId));
}
}
@@ -218,8 +218,7 @@
// error log with repeated messages.
if (!monitorDataLateServers.contains(serverId))
{
- logError(WARN_MISSING_REMOTE_MONITOR_DATA.get(
- baseDN, serverId));
+ logger.warn(WARN_MISSING_REMOTE_MONITOR_DATA.get(baseDN, serverId));
}
}
@@ -312,8 +311,7 @@
{
// This is a response for an earlier request whose computing is
// already complete.
- logError(INFO_IGNORING_REMOTE_MONITOR_DATA.get(
- domain.getBaseDN().toNormalizedString(), msg.getSenderID()));
+ logger.debug(INFO_IGNORING_REMOTE_MONITOR_DATA.get(domain.getBaseDN().toNormalizedString(), msg.getSenderID()));
return;
}
@@ -371,7 +369,7 @@
catch (RuntimeException e)
{
// FIXME: do we really expect these???
- logError(ERR_PROCESSING_REMOTE_MONITOR_DATA.get(e.getMessage() + " "
+ logger.error(ERR_PROCESSING_REMOTE_MONITOR_DATA.get(e.getMessage() + " "
+ stackTraceToSingleLineString(e)));
}
finally
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
index daa1af6..45b969a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -57,7 +57,6 @@
import org.opends.server.workflowelement.externalchangelog.ECLWorkflowElement;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -196,7 +195,7 @@
getServerId(),
listenSocket.getInetAddress().getHostAddress(),
listenSocket.getLocalPort());
- logError(listenMsg);
+ logger.error(listenMsg);
while (!shutdown && !stopListen)
{
@@ -267,9 +266,7 @@
// Do not log the message during shutdown.
logger.traceException(e);
if (!shutdown) {
- LocalizableMessage message =
- ERR_EXCEPTION_LISTENING.get(e.getLocalizedMessage());
- logError(message);
+ logger.error(ERR_EXCEPTION_LISTENING, e.getLocalizedMessage());
}
}
}
@@ -430,12 +427,10 @@
" successfully initialized");
} catch (UnknownHostException e)
{
- logError(ERR_UNKNOWN_HOSTNAME.get());
+ logger.error(ERR_UNKNOWN_HOSTNAME.get());
} catch (IOException e)
{
- LocalizableMessage message = ERR_COULD_NOT_BIND_CHANGELOG.get(
- getReplicationPort(), e.getMessage());
- logError(message);
+ logger.error(ERR_COULD_NOT_BIND_CHANGELOG, getReplicationPort(), e.getMessage());
} catch (DirectoryException e)
{
//FIXME:DirectoryException is raised by initializeECL => fix err msg
@@ -443,7 +438,7 @@
LocalizableMessage
.raw("Directory Exception raised by ECL initialization: "
+ e.getMessage());
- logError(message);
+ logger.error(message);
}
}
@@ -811,13 +806,13 @@
{
if (logger.isTraceEnabled())
logger.traceException(e);
- logError(ERR_COULD_NOT_CLOSE_THE_SOCKET.get(e.toString()));
+ logger.error(ERR_COULD_NOT_CLOSE_THE_SOCKET.get(e.toString()));
}
catch (InterruptedException e)
{
if (logger.isTraceEnabled())
logger.traceException(e);
- logError(ERR_COULD_NOT_STOP_LISTEN_THREAD.get(e.toString()));
+ logger.error(ERR_COULD_NOT_STOP_LISTEN_THREAD.get(e.toString()));
}
}
@@ -1048,7 +1043,7 @@
LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
mb.append(e.getLocalizedMessage());
LocalizableMessage msg = ERR_DELETE_REPL_BACKEND_FAILED.get(mb.toString());
- logError(msg);
+ logger.error(msg);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
index 90ac10d..78b3806 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -245,7 +245,7 @@
Integer.toString(localReplicationServer.getServerId()),
assuredMode.toString(), baseDN.toNormalizedString(),
update.toString());
- logError(errorMsg);
+ logger.error(errorMsg);
assuredMessage = false;
}
} else
@@ -425,7 +425,7 @@
* job properly anymore and needs to close all its connections and
* shutdown itself.
*/
- logError(ERR_CHANGELOG_SHUTDOWN_DATABASE_ERROR
+ logger.error(ERR_CHANGELOG_SHUTDOWN_DATABASE_ERROR
.get(stackTraceToSingleLineString(e)));
localReplicationServer.shutdown();
return false;
@@ -599,7 +599,7 @@
Integer.toString(localReplicationServer.getServerId()),
Byte.toString(safeDataLevel), baseDN.toNormalizedString(),
update.toString());
- logError(errorMsg);
+ logger.error(errorMsg);
} else if (sourceGroupId == groupId
// Assured feature does not cross different group IDS
&& isSameGenerationId(sourceHandler.getGenerationId()))
@@ -753,7 +753,7 @@
csn.toString(), baseDN.toNormalizedString()));
mb.append(" ");
mb.append(stackTraceToSingleLineString(e));
- logError(mb.toMessage());
+ logger.error(mb.toMessage());
stopServer(origServer, false);
}
// Mark the ack info object as completed to prevent potential timeout
@@ -831,7 +831,7 @@
csn.toString(), baseDN.toNormalizedString()));
mb.append(" ");
mb.append(stackTraceToSingleLineString(e));
- logError(mb.toMessage());
+ logger.error(mb.toMessage());
stopServer(origServer, false);
}
// Increment assured counters
@@ -931,11 +931,9 @@
if (connectedDSs.containsKey(dsHandler.getServerId()))
{
// looks like two connected LDAP servers have the same serverId
- LocalizableMessage message = ERR_DUPLICATE_SERVER_ID.get(
- localReplicationServer.getMonitorInstanceName(),
+ logger.error(ERR_DUPLICATE_SERVER_ID, localReplicationServer.getMonitorInstanceName(),
connectedDSs.get(dsHandler.getServerId()).toString(),
dsHandler.toString(), dsHandler.getServerId());
- logError(message);
return true;
}
return false;
@@ -1020,7 +1018,7 @@
}
catch(Exception e)
{
- logError(LocalizableMessage.raw( stackTraceToSingleLineString(e)));
+ logger.error(LocalizableMessage.raw( stackTraceToSingleLineString(e)));
}
finally
{
@@ -1103,7 +1101,7 @@
}
catch(Exception e)
{
- logError(LocalizableMessage.raw( stackTraceToSingleLineString(e)));
+ logger.error(LocalizableMessage.raw( stackTraceToSingleLineString(e)));
}
finally
{
@@ -1416,7 +1414,7 @@
if (msg instanceof ErrorMsg)
{
ErrorMsg errorMsg = (ErrorMsg) msg;
- logError(ERR_ERROR_MSG_RECEIVED.get(errorMsg.getDetails()));
+ logger.error(ERR_ERROR_MSG_RECEIVED.get(errorMsg.getDetails()));
} else if (msg instanceof MonitorRequestMsg)
{
replyWithTopologyMonitorMsg(msg, msgEmitter);
@@ -1482,7 +1480,7 @@
{
// We log the error. The requestor will detect a timeout or
// any other failure on the connection.
- logError(ERR_CHANGELOG_ERROR_SENDING_MSG.get(Integer.toString(msg
+ logger.error(ERR_CHANGELOG_ERROR_SENDING_MSG.get(Integer.toString(msg
.getDestination())));
}
}
@@ -1493,7 +1491,7 @@
RoutableMsg msg)
{
String msgClassname = msg.getClass().getCanonicalName();
- logError(NOTE_ERR_ROUTING_TO_SERVER.get(msgClassname));
+ logger.info(NOTE_ERR_ROUTING_TO_SERVER.get(msgClassname));
LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
mb.append(NOTE_ERR_ROUTING_TO_SERVER.get(msgClassname));
@@ -1522,7 +1520,7 @@
mb.append(" unroutable message =").append(msg.getClass().getSimpleName());
mb.append(" Details:routing table is empty");
final LocalizableMessage message = mb.toMessage();
- logError(message);
+ logger.error(message);
ErrorMsg errMsg = new ErrorMsg(this.localReplicationServer.getServerId(),
msg.getSenderID(), message);
@@ -1541,7 +1539,7 @@
mb2.append(ERR_CHANGELOG_ERROR_SENDING_ERROR.get(this.toString()));
mb2.append(" ");
mb2.append(stackTraceToSingleLineString(ignored));
- logError(mb2.toMessage());
+ logger.error(mb2.toMessage());
stopServer(msgEmitter, false);
}
}
@@ -1568,7 +1566,7 @@
mb.append(" unroutable message =" + msg.getClass().getSimpleName());
mb.append(" Details: " + ioe.getLocalizedMessage());
final LocalizableMessage message = mb.toMessage();
- logError(message);
+ logger.error(message);
ErrorMsg errMsg = new ErrorMsg(msg.getSenderID(), message);
try
@@ -1747,10 +1745,8 @@
{
if (i == 2)
{
- LocalizableMessage message = ERR_EXCEPTION_SENDING_TOPO_INFO.get(
- baseDN.toNormalizedString(), "directory",
+ logger.error(ERR_EXCEPTION_SENDING_TOPO_INFO, baseDN.toNormalizedString(), "directory",
Integer.toString(dsHandler.getServerId()), e.getMessage());
- logError(message);
}
}
}
@@ -1783,10 +1779,8 @@
{
if (i == 2)
{
- LocalizableMessage message = ERR_EXCEPTION_SENDING_TOPO_INFO.get(
- baseDN.toNormalizedString(), "replication",
+ logger.error(ERR_EXCEPTION_SENDING_TOPO_INFO, baseDN.toNormalizedString(), "replication",
Integer.toString(rsHandler.getServerId()), e.getMessage());
- logError(message);
}
}
}
@@ -1975,8 +1969,7 @@
}
} catch (IOException e)
{
- logError(ERR_EXCEPTION_FORWARDING_RESET_GEN_ID.get(
- baseDN.toNormalizedString(), e.getMessage()));
+ logger.error(ERR_EXCEPTION_FORWARDING_RESET_GEN_ID.get(baseDN.toNormalizedString(), e.getMessage()));
}
}
@@ -1989,8 +1982,7 @@
dsHandler.changeStatusForResetGenId(newGenId);
} catch (IOException e)
{
- logError(ERR_EXCEPTION_CHANGING_STATUS_AFTER_RESET_GEN_ID.get(
- baseDN.toNormalizedString(),
+ logger.error(ERR_EXCEPTION_CHANGING_STATUS_AFTER_RESET_GEN_ID.get(baseDN.toNormalizedString(),
Integer.toString(dsHandler.getServerId()),
e.getMessage()));
}
@@ -2003,12 +1995,12 @@
// treatment.
sendTopoInfoToAll();
- logError(NOTE_RESET_GENERATION_ID.get(baseDN.toNormalizedString(),
+ logger.info(NOTE_RESET_GENERATION_ID.get(baseDN.toNormalizedString(),
newGenId));
}
catch(Exception e)
{
- logError(LocalizableMessage.raw( stackTraceToSingleLineString(e)));
+ logger.error(LocalizableMessage.raw( stackTraceToSingleLineString(e)));
}
finally
{
@@ -2057,14 +2049,12 @@
sendTopoInfoToAllExcept(senderHandler);
- LocalizableMessage message = NOTE_DIRECTORY_SERVER_CHANGED_STATUS.get(
- senderHandler.getServerId(), baseDN.toNormalizedString(),
+ logger.info(NOTE_DIRECTORY_SERVER_CHANGED_STATUS, senderHandler.getServerId(), baseDN.toNormalizedString(),
newStatus.toString());
- logError(message);
}
catch(Exception e)
{
- logError(LocalizableMessage.raw( stackTraceToSingleLineString(e)));
+ logger.error(LocalizableMessage.raw( stackTraceToSingleLineString(e)));
}
finally
{
@@ -2121,7 +2111,7 @@
}
catch (IOException e)
{
- logError(ERR_EXCEPTION_CHANGING_STATUS_FROM_STATUS_ANALYZER
+ logger.error(ERR_EXCEPTION_CHANGING_STATUS_FROM_STATUS_ANALYZER
.get(baseDN.toNormalizedString(),
Integer.toString(dsHandler.getServerId()),
e.getMessage()));
@@ -2138,7 +2128,7 @@
}
catch (Exception e)
{
- logError(LocalizableMessage.raw( stackTraceToSingleLineString(e)));
+ logger.error(LocalizableMessage.raw( stackTraceToSingleLineString(e)));
}
finally
{
@@ -2182,7 +2172,7 @@
LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
mb.append(ERR_ERROR_CLEARING_DB.get(baseDN.toString(), e.getMessage()
+ " " + stackTraceToSingleLineString(e)));
- logError(mb.toMessage());
+ logger.error(mb.toMessage());
}
}
@@ -2268,12 +2258,12 @@
if (isDifferentGenerationId(rsHandler.getGenerationId()))
{
- LocalizableMessage message = WARN_BAD_GENERATION_ID_FROM_RS.get(
- rsHandler.getServerId(),
- rsHandler.session.getReadableRemoteAddress(),
- rsHandler.getGenerationId(),
- baseDN.toNormalizedString(), getLocalRSServerId(), generationId);
- logError(message);
+ LocalizableMessage message =
+ WARN_BAD_GENERATION_ID_FROM_RS.get(rsHandler.getServerId(),
+ rsHandler.session.getReadableRemoteAddress(), rsHandler
+ .getGenerationId(), baseDN.toNormalizedString(),
+ getLocalRSServerId(), generationId);
+ logger.warn(message);
ErrorMsg errorMsg = new ErrorMsg(getLocalRSServerId(),
rsHandler.getServerId(), message);
@@ -2288,7 +2278,7 @@
}
catch(Exception e)
{
- logError(LocalizableMessage.raw( stackTraceToSingleLineString(e)));
+ logger.error(LocalizableMessage.raw( stackTraceToSingleLineString(e)));
}
finally
{
@@ -2643,7 +2633,7 @@
catch (IOException e)
{
logger.traceException(e);
- logError(ERR_CHANGELOG_ERROR_SENDING_MSG
+ logger.error(ERR_CHANGELOG_ERROR_SENDING_MSG
.get("Replication Server "
+ localReplicationServer.getReplicationPort() + " "
+ baseDN + " " + localReplicationServer.getServerId()));
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
index de7e5bc..f993bec 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
@@ -27,6 +27,7 @@
package org.opends.server.replication.server;
import java.io.IOException;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -40,7 +41,6 @@
import org.opends.server.replication.protocol.*;
import org.opends.server.types.*;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.replication.protocol.ProtocolVersion.*;
/**
@@ -50,6 +50,9 @@
public class ReplicationServerHandler extends ServerHandler
{
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
+
/**
* Properties filled only if remote server is a RS.
*/
@@ -246,11 +249,9 @@
replicationServerDomain.receiveTopoInfoFromRS(inTopoMsg, this, false);
}
- LocalizableMessage message = INFO_REPLICATION_SERVER_CONNECTION_TO_RS
- .get(getReplicationServerId(), getServerId(),
+ logger.debug(INFO_REPLICATION_SERVER_CONNECTION_TO_RS, getReplicationServerId(), getServerId(),
replicationServerDomain.getBaseDN().toNormalizedString(),
session.getReadableRemoteAddress());
- logError(message);
super.finalizeStart();
}
@@ -372,11 +373,9 @@
if (inTopoMsg!=null)
replicationServerDomain.receiveTopoInfoFromRS(inTopoMsg, this, false);
- LocalizableMessage message = INFO_REPLICATION_SERVER_CONNECTION_FROM_RS
- .get(getReplicationServerId(), getServerId(),
+ logger.debug(INFO_REPLICATION_SERVER_CONNECTION_FROM_RS, getReplicationServerId(), getServerId(),
replicationServerDomain.getBaseDN().toNormalizedString(),
session.getReadableRemoteAddress());
- logError(message);
super.finalizeStart();
}
@@ -517,10 +516,8 @@
* and we have a null state ?
* replicationServerDomain.setGenerationId(generationId, false);
*/
- LocalizableMessage message = WARN_BAD_GENERATION_ID_FROM_RS.get(
- serverId, session.getReadableRemoteAddress(), generationId,
+ logger.warn(WARN_BAD_GENERATION_ID_FROM_RS, serverId, session.getReadableRemoteAddress(), generationId,
getBaseDNString(), getReplicationServerId(), localGenerationId);
- logError(message);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java
index 71b7b31..2a85a66 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java
@@ -27,6 +27,7 @@
package org.opends.server.replication.server;
import java.io.IOException;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.List;
import java.util.Random;
import java.util.concurrent.Semaphore;
@@ -44,7 +45,6 @@
import org.opends.server.replication.protocol.*;
import org.opends.server.types.*;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
/**
* This class defines a server handler :
@@ -53,6 +53,9 @@
*/
public abstract class ServerHandler extends MessageHandler
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* Time during which the server will wait for existing thread to stop
* during the shutdownWriter.
@@ -75,7 +78,7 @@
logger.trace("In " +
((handler != null) ? handler.toString() : "Replication Server") +
" closing session with err=" + providedMsg);
- logError(providedMsg);
+ logger.error(providedMsg);
}
if (providedSession != null)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerReader.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerReader.java
index b2ac9a8..80523b2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerReader.java
@@ -35,7 +35,6 @@
import org.opends.server.replication.protocol.*;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.replication.common.ServerStatus.*;
import static org.opends.server.util.StaticUtils.*;
@@ -130,16 +129,14 @@
{
long referenceGenerationId = handler.getReferenceGenId();
if (dsStatus == BAD_GEN_ID_STATUS)
- logError(WARN_IGNORING_UPDATE_FROM_DS_BADGENID.get(
- handler.getReplicationServerId(),
+ logger.warn(WARN_IGNORING_UPDATE_FROM_DS_BADGENID.get(handler.getReplicationServerId(),
updateMsg.getCSN().toString(),
handler.getBaseDNString(), handler.getServerId(),
session.getReadableRemoteAddress(),
handler.getGenerationId(),
referenceGenerationId));
if (dsStatus == FULL_UPDATE_STATUS)
- logError(WARN_IGNORING_UPDATE_FROM_DS_FULLUP.get(
- handler.getReplicationServerId(),
+ logger.warn(WARN_IGNORING_UPDATE_FROM_DS_FULLUP.get(handler.getReplicationServerId(),
updateMsg.getCSN().toString(),
handler.getBaseDNString(), handler.getServerId(),
session.getReadableRemoteAddress()));
@@ -155,7 +152,7 @@
if (referenceGenerationId > 0
&& referenceGenerationId != handler.getGenerationId())
{
- logError(
+ logger.error(
WARN_IGNORING_UPDATE_FROM_RS.get(
handler.getReplicationServerId(),
updateMsg.getCSN().toString(),
@@ -203,7 +200,7 @@
handler.getBaseDNString(),
Integer.toString(handler.getServerId()),
csMsg.toString());
- logError(errMessage);
+ logger.error(errMessage);
}
} else if (msg instanceof ChangeTimeHeartbeatMsg)
{
@@ -226,7 +223,7 @@
* connection.
*/
errMessage = NOTE_READER_NULL_MSG.get(handler.toString());
- logError(errMessage);
+ logger.error(errMessage);
return;
}
} catch (NotSupportedOldVersionPDUException e)
@@ -249,7 +246,7 @@
if (!handler.shuttingDown())
{
errMessage = handler.getBadlyDisconnectedErrorMessage();
- logError(errMessage);
+ logger.error(errMessage);
}
}
catch (Exception e)
@@ -260,7 +257,7 @@
*/
errMessage = NOTE_READER_EXCEPTION.get(
handler.toString(), stackTraceToSingleLineString(e));
- logError(errMessage);
+ logger.error(errMessage);
}
finally
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerWriter.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerWriter.java
index e700346..6dd4d50 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerWriter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerWriter.java
@@ -36,7 +36,6 @@
import org.opends.server.replication.protocol.UpdateMsg;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
/**
@@ -126,8 +125,7 @@
{
if (dsStatus == ServerStatus.BAD_GEN_ID_STATUS)
{
- logError(WARN_IGNORING_UPDATE_TO_DS_BADGENID.get(
- handler.getReplicationServerId(),
+ logger.warn(WARN_IGNORING_UPDATE_TO_DS_BADGENID.get(handler.getReplicationServerId(),
update.getCSN().toString(),
handler.getBaseDNString(), handler.getServerId(),
session.getReadableRemoteAddress(),
@@ -136,8 +134,7 @@
}
else if (dsStatus == ServerStatus.FULL_UPDATE_STATUS)
{
- logError(WARN_IGNORING_UPDATE_TO_DS_FULLUP.get(
- handler.getReplicationServerId(),
+ logger.warn(WARN_IGNORING_UPDATE_TO_DS_FULLUP.get(handler.getReplicationServerId(),
update.getCSN().toString(),
handler.getBaseDNString(), handler.getServerId(),
session.getReadableRemoteAddress()));
@@ -155,7 +152,7 @@
|| referenceGenerationId == -1
|| handler.getGenerationId() == -1)
{
- logError(
+ logger.error(
WARN_IGNORING_UPDATE_TO_RS.get(
handler.getReplicationServerId(),
update.getCSN().toString(),
@@ -180,7 +177,7 @@
* be removed, just ignore the exception and let the thread die as well
*/
errMessage = handler.getBadlyDisconnectedErrorMessage();
- logError(errMessage);
+ logger.error(errMessage);
}
catch (Exception e)
{
@@ -190,7 +187,7 @@
*/
errMessage = ERR_WRITER_UNEXPECTED_EXCEPTION.get(handler +
" " + stackTraceToSingleLineString(e));
- logError(errMessage);
+ logger.error(errMessage);
}
finally {
session.close();
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java
index 35fe690..eeeb36e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java
@@ -40,7 +40,6 @@
import static com.sleepycat.je.OperationStatus.*;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
/**
@@ -134,7 +133,7 @@
}
catch (DatabaseException e)
{
- logError(NOTE_EXCEPTION_CLOSING_DATABASE.get(toString(),
+ logger.info(NOTE_EXCEPTION_CLOSING_DATABASE.get(toString(),
stackTraceToSingleLineString(e)));
}
finally
@@ -621,7 +620,7 @@
LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
mb.append(ERR_ERROR_CLEARING_DB.get(toString(),
e.getMessage() + " " + stackTraceToSingleLineString(e)));
- logError(mb.toMessage());
+ logger.error(mb.toMessage());
}
finally
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
index 006676c..864d10f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
@@ -47,7 +47,6 @@
import org.opends.server.replication.server.changelog.je.DraftCNDB.*;
import org.opends.server.types.*;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
/**
@@ -292,7 +291,7 @@
}
catch (Exception end)
{
- logError(ERR_EXCEPTION_CHANGELOG_TRIM_FLUSH
+ logger.error(ERR_EXCEPTION_CHANGELOG_TRIM_FLUSH
.get(stackTraceToSingleLineString(end)));
if (replicationServer != null)
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
index 7783f99..2563a5e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
@@ -49,7 +49,6 @@
import com.forgerock.opendj.util.Pair;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
/**
@@ -323,7 +322,7 @@
if (logger.isTraceEnabled())
logger.traceException(e);
- logError(ERR_COULD_NOT_READ_DB.get(this.dbDirectory.getAbsolutePath(),
+ logger.error(ERR_COULD_NOT_READ_DB.get(this.dbDirectory.getAbsolutePath(),
e.getLocalizedMessage()));
}
}
@@ -704,7 +703,7 @@
{
if (logger.isTraceEnabled())
logger.traceException(e);
- logError(ERR_CHANGENUMBER_DATABASE.get(e.getLocalizedMessage()));
+ logger.error(ERR_CHANGENUMBER_DATABASE.get(e.getLocalizedMessage()));
}
}
return cnIndexDB;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDB.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDB.java
index b85d132..7cdd2b2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDB.java
@@ -22,11 +22,12 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2013 ForgeRock AS
+ * Portions copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.replication.server.changelog.je;
import java.util.ArrayList;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
@@ -60,13 +61,18 @@
* It is responsible for efficiently saving the updates that is received from
* each master server into stable storage.
* <p>
- * This class is also able to generate a {@link DBCursor} that can be used to
+ * This class is also able to generate a {
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+@link DBCursor} that can be used to
* read all changes from a given {@link CSN}.
* <p>
* This class publish some monitoring information below cn=monitor.
*/
public class JEReplicaDB implements Runnable
{
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* The msgQueue holds all the updates not yet saved to stable storage.
* <p>
@@ -331,8 +337,7 @@
catch (ChangelogException e)
{
// We are already shutting down
- logError(ERR_EXCEPTION_CHANGELOG_TRIM_FLUSH
- .get(stackTraceToSingleLineString(e)));
+ logger.error(ERR_EXCEPTION_CHANGELOG_TRIM_FLUSH, stackTraceToSingleLineString(e));
}
}
@@ -409,8 +414,7 @@
private void stop(Exception e)
{
- logError(ERR_EXCEPTION_CHANGELOG_TRIM_FLUSH
- .get(stackTraceToSingleLineString(e)));
+ logger.error(ERR_EXCEPTION_CHANGELOG_TRIM_FLUSH, stackTraceToSingleLineString(e));
thread.initiateShutdown();
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java
index 687912c..5b866d0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java
@@ -27,12 +27,12 @@
package org.opends.server.replication.server.changelog.je;
import java.io.Closeable;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.io.UnsupportedEncodingException;
import java.util.List;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.protocol.UpdateMsg;
@@ -48,7 +48,6 @@
import static com.sleepycat.je.OperationStatus.*;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
/**
@@ -60,6 +59,9 @@
public class ReplicationDB
{
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
+
private Database db;
private ReplicationDbEnv dbenv;
private ReplicationServer replicationServer;
@@ -267,7 +269,7 @@
}
catch (DatabaseException e)
{
- logError(NOTE_EXCEPTION_CLOSING_DATABASE.get(toString(),
+ logger.info(NOTE_EXCEPTION_CLOSING_DATABASE.get(toString(),
stackTraceToSingleLineString(e)));
}
finally
@@ -805,11 +807,9 @@
* changes.
* TODO : This should be handled by the repair functionality.
*/
- LocalizableMessage message = ERR_REPLICATIONDB_CANNOT_PROCESS_CHANGE_RECORD
- .get(replicationServer.getServerId(),
+ logger.error(ERR_REPLICATIONDB_CANNOT_PROCESS_CHANGE_RECORD, replicationServer.getServerId(),
(csn == null ? "" : csn.toString()),
e.getMessage());
- logError(message);
}
}
return currentChange;
@@ -870,7 +870,7 @@
LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
mb.append(ERR_ERROR_CLEARING_DB.get(toString(),
e.getMessage() + " " + stackTraceToSingleLineString(e)));
- logError(mb.toMessage());
+ logger.error(mb.toMessage());
}
finally
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
index 488983d..07c6551 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
@@ -49,7 +49,6 @@
import static org.opends.messages.JebMessages.*;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
/**
@@ -436,7 +435,7 @@
}
catch (DatabaseException e)
{
- logError(closeDBErrorMessage(null, e));
+ logger.error(closeDBErrorMessage(null, e));
}
}
@@ -449,7 +448,7 @@
}
catch (DatabaseException e)
{
- logError(closeDBErrorMessage(db.getDatabaseName(), e));
+ logger.error(closeDBErrorMessage(db.getDatabaseName(), e));
}
}
@@ -562,7 +561,7 @@
mb.append(ERR_ERROR_CLEARING_DB.get(databaseName,
e.getMessage() + " " +
stackTraceToSingleLineString(e)));
- logError(mb.toMessage());
+ logger.error(mb.toMessage());
}
finally
{
@@ -609,7 +608,7 @@
*/
void shutdownOnException(DatabaseException e)
{
- logError(ERR_CHANGELOG_SHUTDOWN_DATABASE_ERROR
+ logger.error(ERR_CHANGELOG_SHUTDOWN_DATABASE_ERROR
.get(stackTraceToSingleLineString(e)));
replicationServer.shutdown();
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/service/HeartbeatMonitor.java b/opendj3-server-dev/src/server/org/opends/server/replication/service/HeartbeatMonitor.java
index e3b844a..923e3b9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/service/HeartbeatMonitor.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/service/HeartbeatMonitor.java
@@ -28,7 +28,6 @@
package org.opends.server.replication.service;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.logError;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.replication.protocol.Session;
@@ -135,7 +134,7 @@
if (gotOneFailure)
{
// Heartbeat is well overdue so the server is assumed to be dead.
- logError(WARN_HEARTBEAT_FAILURE.get(serverID,
+ logger.warn(WARN_HEARTBEAT_FAILURE.get(serverID,
replicationServerID, session.getReadableRemoteAddress(),
baseDN));
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java b/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java
index b03cee9..4427e6d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java
@@ -55,7 +55,6 @@
import org.opends.server.util.ServerConstants;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.replication.protocol.ProtocolVersion.*;
import static org.opends.server.replication.server.ReplicationServer.*;
import static org.opends.server.util.StaticUtils.*;
@@ -918,14 +917,12 @@
final int rsServerId = rs.rsInfo.getServerId();
if (rsGenId == getGenerationID() || rsGenId == -1)
{
- logError(NOTE_NOW_FOUND_SAME_GENERATION_CHANGELOG.get(
- serverId, rsServerId, baseDN.toNormalizedString(),
+ logger.info(NOTE_NOW_FOUND_SAME_GENERATION_CHANGELOG.get(serverId, rsServerId, baseDN.toNormalizedString(),
rs.replicationServer, getGenerationID()));
}
else
{
- logError(WARN_NOW_FOUND_BAD_GENERATION_CHANGELOG.get(
- serverId, rsServerId, baseDN.toNormalizedString(),
+ logger.warn(WARN_NOW_FOUND_BAD_GENERATION_CHANGELOG.get(serverId, rsServerId, baseDN.toNormalizedString(),
rs.replicationServer, getGenerationID(), rsGenId));
}
}
@@ -940,14 +937,13 @@
if (replicationServerInfos.size() > 0)
{
- logError(WARN_COULD_NOT_FIND_CHANGELOG.get(
- serverId, baseDN.toNormalizedString(),
- collectionToString(replicationServerInfos.keySet(), ", ")));
+ logger.warn(WARN_COULD_NOT_FIND_CHANGELOG.get(serverId, baseDN
+ .toNormalizedString(), collectionToString(
+ replicationServerInfos.keySet(), ", ")));
}
else
{
- logError(WARN_NO_AVAILABLE_CHANGELOGS.get(
- serverId, baseDN.toNormalizedString()));
+ logger.warn(WARN_NO_AVAILABLE_CHANGELOGS.get(serverId, baseDN.toNormalizedString()));
}
}
}
@@ -1016,10 +1012,10 @@
warn user and start heartbeat monitor to recover when a server
with the right group id shows up.
*/
- logError(WARN_CONNECTED_TO_SERVER_WITH_WRONG_GROUP_ID.get(
- Byte.toString(groupId), Integer.toString(rs.getServerId()),
- rsInfo.getServerURL(), Byte.toString(rs.getGroupId()),
- baseDN.toNormalizedString(), Integer.toString(getServerId())));
+ logger.warn(WARN_CONNECTED_TO_SERVER_WITH_WRONG_GROUP_ID.get(Byte
+ .toString(groupId), Integer.toString(rs.getServerId()), rsInfo
+ .getServerURL(), Byte.toString(rs.getGroupId()), baseDN
+ .toNormalizedString(), Integer.toString(getServerId())));
}
startRSHeartBeatMonitoring(rs);
if (rsInfo.getProtocolVersion() >=
@@ -1031,8 +1027,7 @@
}
catch (Exception e)
{
- logError(ERR_COMPUTING_FAKE_OPS.get(
- baseDN.toNormalizedString(), rsInfo.getServerURL(),
+ logger.error(ERR_COMPUTING_FAKE_OPS.get(baseDN.toNormalizedString(), rsInfo.getServerURL(),
e.getLocalizedMessage() + " " + stackTraceToSingleLineString(e)));
}
finally
@@ -1234,7 +1229,7 @@
if (keepSession) // Log error message only for final connection
{
// log the error message only once to avoid overflowing the error log
- logError(errorMessage);
+ logger.error(errorMessage);
}
if (logger.isTraceEnabled())
@@ -1276,8 +1271,7 @@
}
catch (Exception e)
{
- logError(WARN_EXCEPTION_STARTING_SESSION_PHASE.get(
- getServerId(), server, getBaseDN().toNormalizedString(),
+ logger.warn(WARN_EXCEPTION_STARTING_SESSION_PHASE.get(getServerId(), server, getBaseDN().toNormalizedString(),
stackTraceToSingleLineString(e)));
rs.session.close();
@@ -1330,7 +1324,7 @@
}
catch (Exception e)
{
- logError(WARN_EXCEPTION_STARTING_SESSION_PHASE.get(
+ logger.error(WARN_EXCEPTION_STARTING_SESSION_PHASE.get(
getServerId(), electedRS.rsInfo.getServerURL(),
getBaseDN().toNormalizedString(), stackTraceToSingleLineString(e)));
@@ -2296,7 +2290,7 @@
mb.append(NOTE_EXCEPTION_RESTARTING_SESSION.get(
getBaseDN().toNormalizedString(), e.getLocalizedMessage()));
mb.append(stackTraceToSingleLineString(e));
- logError(mb.toMessage());
+ logger.error(mb.toMessage());
}
if (rs.isConnected() || !infiniteTry)
@@ -2592,10 +2586,8 @@
else if (msg instanceof StopMsg)
{
// RS performs a proper disconnection
- LocalizableMessage message = WARN_REPLICATION_SERVER_PROPERLY_DISCONNECTED.get(
- previousRsServerID, rs.replicationServer,
+ logger.warn(WARN_REPLICATION_SERVER_PROPERLY_DISCONNECTED, previousRsServerID, rs.replicationServer,
serverId, baseDN.toNormalizedString());
- logError(message);
// Try to find a suitable RS
reStart(rs.session, true);
@@ -2672,7 +2664,7 @@
evals.getEvaluation(previousRsServerID).toString(),
evals.getEvaluation(bestRsServerId).toString());
}
- logError(message);
+ logger.error(message);
if (logger.isTraceEnabled())
debugInfo("best replication servers evaluation results: "
+ evals);
@@ -2702,7 +2694,7 @@
if (rs.session == null || !rs.session.closeInitiated())
{
// We did not initiate the close on our side, log an error message.
- logError(WARN_REPLICATION_SERVER_BADLY_DISCONNECTED.get(
+ logger.error(WARN_REPLICATION_SERVER_BADLY_DISCONNECTED.get(
serverId, baseDN.toNormalizedString(), previousRsServerID,
rs.replicationServer));
}
@@ -2958,11 +2950,9 @@
new ChangeStatusMsg(ServerStatus.INVALID_STATUS, newStatus));
} catch (IOException ex)
{
- LocalizableMessage message = ERR_EXCEPTION_SENDING_CS.get(
- getBaseDN().toNormalizedString(),
+ logger.error(ERR_EXCEPTION_SENDING_CS, getBaseDN().toNormalizedString(),
Integer.toString(getServerId()),
ex.getLocalizedMessage() + " " + stackTraceToSingleLineString(ex));
- logError(message);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java
index e50b4f1..7a74900 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java
@@ -54,7 +54,6 @@
import org.opends.server.types.ResultCode;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.replication.common.AssuredMode.*;
import static org.opends.server.replication.common.StatusMachine.*;
@@ -342,7 +341,7 @@
// Sanity check: is it a valid initial status?
if (!isValidInitialStatus(initStatus))
{
- logError(ERR_DS_INVALID_INIT_STATUS.get(initStatus.toString(),
+ logger.error(ERR_DS_INVALID_INIT_STATUS.get(initStatus.toString(),
getBaseDNString(), Integer.toString(getServerId())));
}
else
@@ -371,7 +370,7 @@
StatusMachineEvent event = StatusMachineEvent.statusToEvent(reqStatus);
if (event == StatusMachineEvent.INVALID_EVENT)
{
- logError(ERR_DS_INVALID_REQUESTED_STATUS.get(reqStatus.toString(),
+ logger.error(ERR_DS_INVALID_REQUESTED_STATUS.get(reqStatus.toString(),
getBaseDNString(), Integer.toString(getServerId())));
return;
}
@@ -758,14 +757,14 @@
attempt of initialization while we have started a new one
on this side.
*/
- logError(ERR_ERROR_MSG_RECEIVED.get(errorMsg.getDetails()));
+ logger.error(ERR_ERROR_MSG_RECEIVED.get(errorMsg.getDetails()));
}
}
else
{
// Simply log - happen if import/export has been terminated
// on our side before receiving this ErrorMsg.
- logError(ERR_ERROR_MSG_RECEIVED.get(errorMsg.getDetails()));
+ logger.error(ERR_ERROR_MSG_RECEIVED.get(errorMsg.getDetails()));
}
}
else if (msg instanceof ChangeStatusMsg)
@@ -888,7 +887,7 @@
Some problems detected: message did not correctly reach every
requested servers. Log problem
*/
- logError(NOTE_DS_RECEIVED_ACK_ERROR.get(
+ logger.error(NOTE_DS_RECEIVED_ACK_ERROR.get(
getBaseDNString(), Integer.toString(getServerId()),
update.toString(), ack.errorsToString()));
@@ -1388,7 +1387,7 @@
if (serverToInitialize == RoutableMsg.ALL_SERVERS)
{
- logError(NOTE_FULL_UPDATE_ENGAGED_FOR_REMOTE_START_ALL.get(
+ logger.error(NOTE_FULL_UPDATE_ENGAGED_FOR_REMOTE_START_ALL.get(
countEntries(), getBaseDNString(), getServerId()));
for (DSInfo dsi : getReplicasList())
@@ -1407,7 +1406,7 @@
}
else
{
- logError(NOTE_FULL_UPDATE_ENGAGED_FOR_REMOTE_START.get(countEntries(),
+ logger.error(NOTE_FULL_UPDATE_ENGAGED_FOR_REMOTE_START.get(countEntries(),
getBaseDNString(), getServerId(), serverToInitialize));
ieCtx.startList.add(serverToInitialize);
@@ -1524,7 +1523,7 @@
*/
try { Thread.sleep(1000); }
catch(Exception e){ /* do nothing */ }
- logError(NOTE_RESENDING_INIT_TARGET.get(
+ logger.error(NOTE_RESENDING_INIT_TARGET.get(
exportRootException.getLocalizedMessage()));
continue;
@@ -1565,12 +1564,12 @@
: exportRootException.getLocalizedMessage();
if (serverToInitialize == RoutableMsg.ALL_SERVERS)
{
- logError(NOTE_FULL_UPDATE_ENGAGED_FOR_REMOTE_END_ALL.get(
+ logger.error(NOTE_FULL_UPDATE_ENGAGED_FOR_REMOTE_END_ALL.get(
getBaseDNString(), getServerId(), cause));
}
else
{
- logError(NOTE_FULL_UPDATE_ENGAGED_FOR_REMOTE_END.get(
+ logger.error(NOTE_FULL_UPDATE_ENGAGED_FOR_REMOTE_END.get(
getBaseDNString(), getServerId(), serverToInitialize, cause));
}
@@ -2208,7 +2207,7 @@
{
// Should not happen
errMsg = LocalizableMessage.raw( e.getLocalizedMessage());
- logError(errMsg);
+ logger.error(errMsg);
}
// When error, update the task and raise the error to the caller
@@ -2249,7 +2248,7 @@
try
{
// Log starting
- logError(NOTE_FULL_UPDATE_ENGAGED_FROM_REMOTE_START.get(getBaseDNString(),
+ logger.error(NOTE_FULL_UPDATE_ENGAGED_FROM_REMOTE_START.get(getBaseDNString(),
initTargetMsgReceived.getSenderID(), getServerId()));
// Go into full update status
@@ -2326,7 +2325,7 @@
Restart the whole import protocol exchange by sending again
the request
*/
- logError(NOTE_RESENDING_INIT_FROM_REMOTE_REQUEST.get(
+ logger.error(NOTE_RESENDING_INIT_FROM_REMOTE_REQUEST.get(
ieCtx.getException().getLocalizedMessage()));
broker.publish(ieCtx.initReqMsgSent);
@@ -2345,7 +2344,7 @@
An error occurs when sending a new request for a new import.
This error is not stored, preferring to keep the initial one.
*/
- logError(ERR_SENDING_NEW_ATTEMPT_INIT_REQUEST.get(
+ logger.error(ERR_SENDING_NEW_ATTEMPT_INIT_REQUEST.get(
e.getLocalizedMessage(),
ieCtx.getException().getLocalizedMessage()));
}
@@ -2390,7 +2389,7 @@
getServerId(),
(ieCtx.getException() == null ? ""
: ieCtx.getException().getLocalizedMessage()));
- logError(msg);
+ logger.error(msg);
releaseIEContext();
} // finally
} // finally
@@ -2426,7 +2425,7 @@
ServerStatus newStatus = StatusMachine.computeNewStatus(status, event);
if (newStatus == ServerStatus.INVALID_STATUS)
{
- logError(ERR_DS_CANNOT_CHANGE_STATUS.get(getBaseDNString(),
+ logger.error(ERR_DS_CANNOT_CHANGE_STATUS.get(getBaseDNString(),
String.valueOf(getServerId()), status.toString(), event.toString()));
return;
}
@@ -3224,7 +3223,7 @@
}
else if (getAssuredMode() != AssuredMode.SAFE_DATA_MODE)
{
- logError(ERR_DS_UNKNOWN_ASSURED_MODE.get(String.valueOf(getServerId()),
+ logger.error(ERR_DS_UNKNOWN_ASSURED_MODE.get(String.valueOf(getServerId()),
msg.getAssuredMode().toString(), getBaseDNString(),
msg.toString()));
}
@@ -3434,7 +3433,7 @@
} catch (TimeoutException ex)
{
// This exception may only be raised if assured replication is enabled
- logError(NOTE_DS_ACK_TIMEOUT.get(getBaseDNString(),
+ logger.error(NOTE_DS_ACK_TIMEOUT.get(getBaseDNString(),
Long.toString(getAssuredTimeout()), update.toString()));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java
index 94d38e7..661ed32 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java
@@ -41,7 +41,6 @@
import org.opends.server.types.DN;
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
@@ -89,16 +88,14 @@
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_IA5_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
- EMR_CASE_IGNORE_IA5_OID, SYNTAX_ACI_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_CASE_IGNORE_IA5_OID, SYNTAX_ACI_NAME));
}
defaultSubstringMatchingRule =
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_IA5_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
- SMR_CASE_IGNORE_IA5_OID, SYNTAX_ACI_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_CASE_IGNORE_IA5_OID, SYNTAX_ACI_NAME));
}
}
@@ -225,7 +222,7 @@
{
logger.traceException(e);
- logError(e.getMessageObject());
+ logger.error(e.getMessageObject());
invalidReason.append(e.getMessageObject());
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
index 91d1e6d..91a80f7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
@@ -28,7 +28,6 @@
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.schema.SchemaConstants.*;
import java.util.Collection;
@@ -173,7 +172,7 @@
case REJECT:
throw de;
case WARN:
- logError(de.getMessageObject());
+ logger.error(de.getMessageObject());
return ByteString.valueOf(value.toString());
default:
return ByteString.valueOf(value.toString());
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java
index 372e949..a1e92d3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.schema;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -43,7 +44,6 @@
import org.opends.server.types.ResultCode;
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -57,6 +57,9 @@
public class AuthPasswordSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -86,7 +89,7 @@
DirectoryServer.getEqualityMatchingRule(EMR_AUTH_PASSWORD_EXACT_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
EMR_AUTH_PASSWORD_EXACT_NAME, SYNTAX_AUTH_PASSWORD_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java
index 428558f..538ca1e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java
@@ -29,13 +29,13 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.*;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -50,6 +50,9 @@
public class BinarySyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -102,24 +105,21 @@
DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
- EMR_OCTET_STRING_OID, SYNTAX_BINARY_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_OCTET_STRING_OID, SYNTAX_BINARY_NAME));
}
defaultOrderingMatchingRule =
DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
- OMR_OCTET_STRING_OID, SYNTAX_BINARY_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_OCTET_STRING_OID, SYNTAX_BINARY_NAME));
}
defaultSubstringMatchingRule =
DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
- SMR_OCTET_STRING_OID, SYNTAX_BINARY_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_OCTET_STRING_OID, SYNTAX_BINARY_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
index 4cf80e5..b6277b8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
@@ -29,7 +29,7 @@
import static org.opends.messages.SchemaMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.schema.SchemaConstants.*;
import java.util.Collection;
@@ -51,6 +51,9 @@
class BitStringEqualityMatchingRule
extends EqualityMatchingRule
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* Creates a new instance of this bitStringMatch matching rule.
*/
@@ -157,7 +160,7 @@
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
message);
case WARN:
- logError(message);
+ logger.error(message);
return ByteString.valueOf(valueString);
default:
return ByteString.valueOf(valueString);
@@ -179,7 +182,7 @@
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
message);
case WARN:
- logError(
+ logger.error(
message);
return ByteString.valueOf(valueString);
default:
@@ -207,7 +210,7 @@
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
message);
case WARN:
- logError(message);
+ logger.error(message);
return ByteString.valueOf(valueString);
default:
return ByteString.valueOf(valueString);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java
index edd0231..e77aa38 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java
@@ -29,6 +29,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.EqualityMatchingRule;
@@ -39,7 +40,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -53,6 +53,9 @@
public class BitStringSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -81,8 +84,7 @@
DirectoryServer.getEqualityMatchingRule(EMR_BIT_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
- EMR_BIT_STRING_OID, SYNTAX_BIT_STRING_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_BIT_STRING_OID, SYNTAX_BIT_STRING_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java
index 2933690..467c846 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java
@@ -29,6 +29,7 @@
import static org.opends.messages.SchemaMessages.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.schema.SchemaConstants.*;
import java.util.Collection;
@@ -37,7 +38,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
@@ -52,6 +52,9 @@
class BooleanEqualityMatchingRule
extends EqualityMatchingRule
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* Creates a new instance of this booleanMatch matching rule.
*/
@@ -166,7 +169,7 @@
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
message);
case WARN:
- ErrorLogger.logError(message);
+ logger.error(message);
return ByteString.valueOf(valueString);
default:
return ByteString.valueOf(valueString);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java
index b4bd459..05dde33 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.schema;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -43,7 +44,6 @@
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -60,6 +60,9 @@
public class BooleanSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -120,8 +123,7 @@
DirectoryServer.getEqualityMatchingRule(EMR_BOOLEAN_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
- EMR_BOOLEAN_OID, SYNTAX_BOOLEAN_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_BOOLEAN_OID, SYNTAX_BOOLEAN_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java
index 93754fe..87f5416 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java
@@ -29,6 +29,7 @@
import static org.opends.messages.SchemaMessages.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;
@@ -38,7 +39,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
@@ -54,6 +54,9 @@
class CaseExactIA5EqualityMatchingRule
extends EqualityMatchingRule
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* Creates a new instance of this caseExactMatch matching rule.
*/
@@ -196,7 +199,7 @@
case WARN:
if (! logged)
{
- ErrorLogger.logError(message);
+ logger.error(message);
logged = true;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java
index 883b063..ba166d6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java
@@ -29,7 +29,7 @@
import static org.opends.messages.SchemaMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.schema.SchemaConstants.*;
import java.util.Collection;
@@ -55,6 +55,9 @@
class CaseExactIA5SubstringMatchingRule
extends SubstringMatchingRule
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* Creates a new instance of this caseExactSubstringsMatch matching rule.
*/
@@ -196,7 +199,7 @@
case WARN:
if (! logged)
{
- logError(message);
+ logger.error(message);
logged = true;
}
@@ -282,7 +285,7 @@
case WARN:
if (! logged)
{
- logError(message);
+ logger.error(message);
logged = true;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java
index 47d018a..c895f46 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java
@@ -29,6 +29,7 @@
import static org.opends.messages.SchemaMessages.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;
@@ -38,7 +39,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
@@ -54,6 +54,9 @@
class CaseIgnoreIA5EqualityMatchingRule
extends EqualityMatchingRule
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* Creates a new instance of this caseIgnoreIA5Match matching rule.
*/
@@ -196,7 +199,7 @@
case WARN:
if (! logged)
{
- ErrorLogger.logError(message);
+ logger.error(message);
logged = true;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java
index 8cf64a2..9806c22 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java
@@ -29,6 +29,7 @@
import static org.opends.messages.SchemaMessages.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;
@@ -38,7 +39,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
@@ -54,6 +54,9 @@
class CaseIgnoreIA5SubstringMatchingRule
extends SubstringMatchingRule
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* Creates a new instance of this caseIgnoreSubstringsMatch matching rule.
*/
@@ -195,7 +198,7 @@
case WARN:
if (! logged)
{
- ErrorLogger.logError(message);
+ logger.error(message);
logged = true;
}
@@ -281,7 +284,7 @@
case WARN:
if (! logged)
{
- ErrorLogger.logError(message);
+ logger.error(message);
logged = true;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactAssertionSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactAssertionSyntax.java
index f314f02..fef16af 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactAssertionSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactAssertionSyntax.java
@@ -30,6 +30,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.EqualityMatchingRule;
@@ -40,7 +41,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -53,6 +53,9 @@
public class CertificateExactAssertionSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -87,7 +90,7 @@
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
EMR_CASE_IGNORE_OID, SYNTAX_CERTIFICATE_EXACT_ASSERTION_NAME));
}
@@ -95,7 +98,7 @@
DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
OMR_CASE_IGNORE_OID, SYNTAX_CERTIFICATE_EXACT_ASSERTION_NAME));
}
@@ -103,7 +106,7 @@
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
SMR_CASE_IGNORE_OID, SYNTAX_CERTIFICATE_EXACT_ASSERTION_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java
index 61fa4ce..08c67e7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java
@@ -46,7 +46,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.asn1.GSERException;
import org.opends.server.protocols.asn1.GSERParser;
@@ -226,7 +225,7 @@
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
message);
case WARN:
- ErrorLogger.logError(message);
+ logger.error(message);
certificateIssuer= toLowerCase(dnstring);
break;
@@ -328,7 +327,7 @@
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
message);
case WARN:
- ErrorLogger.logError(message);
+ logger.error(message);
break;
}
}
@@ -363,7 +362,7 @@
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
message);
case WARN:
- ErrorLogger.logError(message);
+ logger.error(message);
certificateIssuer= toLowerCase(dnstring);
break;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java
index fbd4877..640590a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java
@@ -29,6 +29,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.EqualityMatchingRule;
@@ -39,7 +40,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -54,6 +54,9 @@
public class CertificateListSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -88,24 +91,21 @@
DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
- EMR_OCTET_STRING_OID, SYNTAX_CERTLIST_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_OCTET_STRING_OID, SYNTAX_CERTLIST_NAME));
}
defaultOrderingMatchingRule =
DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
- OMR_OCTET_STRING_OID, SYNTAX_CERTLIST_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_OCTET_STRING_OID, SYNTAX_CERTLIST_NAME));
}
defaultSubstringMatchingRule =
DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
- SMR_OCTET_STRING_OID, SYNTAX_CERTLIST_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_OCTET_STRING_OID, SYNTAX_CERTLIST_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java
index 9a49dec..7faca06 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java
@@ -29,6 +29,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.EqualityMatchingRule;
@@ -39,7 +40,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -54,6 +54,9 @@
public class CertificatePairSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -88,24 +91,21 @@
DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
- EMR_OCTET_STRING_OID, SYNTAX_CERTPAIR_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_OCTET_STRING_OID, SYNTAX_CERTPAIR_NAME));
}
defaultOrderingMatchingRule =
DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
- OMR_OCTET_STRING_OID, SYNTAX_CERTPAIR_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_OCTET_STRING_OID, SYNTAX_CERTPAIR_NAME));
}
defaultSubstringMatchingRule =
DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
- SMR_OCTET_STRING_OID, SYNTAX_CERTPAIR_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_OCTET_STRING_OID, SYNTAX_CERTPAIR_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java
index 84b5fc2..82304e0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java
@@ -30,6 +30,7 @@
import java.util.List;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.CertificateAttributeSyntaxCfg;
@@ -48,7 +49,6 @@
import org.opends.server.protocols.asn1.ASN1Exception;
import org.opends.server.protocols.asn1.ASN1Reader;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessage;
@@ -66,6 +66,9 @@
extends AttributeSyntax<CertificateAttributeSyntaxCfg>
implements ConfigurationChangeListener<CertificateAttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -103,7 +106,7 @@
DirectoryServer.getEqualityMatchingRule(EMR_CERTIFICATE_EXACT_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
EMR_CERTIFICATE_EXACT_OID, SYNTAX_CERTIFICATE_NAME));
}
@@ -111,7 +114,7 @@
DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
OMR_OCTET_STRING_OID, SYNTAX_CERTIFICATE_NAME));
}
@@ -119,7 +122,7 @@
DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
SMR_OCTET_STRING_OID, SYNTAX_CERTIFICATE_NAME));
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java b/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
index 31993b6..6bb3cea 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
@@ -30,9 +30,9 @@
import static org.opends.messages.ConfigMessages.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.CoreMessages.*;
import static org.opends.messages.SchemaMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -79,6 +79,9 @@
ConfigurationChangeListener<CollationMatchingRuleCfg>
{
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
+
// Whether equality matching rules are enabled.
private boolean equalityMatchingRuleType;
@@ -252,7 +255,7 @@
LocalizableMessage msg =
WARN_ATTR_INVALID_COLLATION_MATCHING_RULE_FORMAT
.get(collation);
- logError(msg);
+ logger.error(msg);
continue;
}
@@ -274,7 +277,7 @@
collation, configuration.dn().toNormalizedString(),
languageTag);
- logError(msg);
+ logger.error(msg);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java
index e792ef9..a4846dd 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java
@@ -29,6 +29,7 @@
import java.util.List;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.CountryStringAttributeSyntaxCfg;
@@ -44,7 +45,6 @@
import org.opends.server.types.ResultCode;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
@@ -62,6 +62,9 @@
extends AttributeSyntax<CountryStringAttributeSyntaxCfg>
implements ConfigurationChangeListener<CountryStringAttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default approximate matching rule for this syntax.
private ApproximateMatchingRule defaultApproximateMatchingRule;
@@ -102,7 +105,7 @@
DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
if (defaultApproximateMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE.get(
AMR_DOUBLE_METAPHONE_OID, SYNTAX_COUNTRY_STRING_NAME));
}
@@ -110,7 +113,7 @@
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
EMR_CASE_IGNORE_OID, SYNTAX_COUNTRY_STRING_NAME));
}
@@ -118,7 +121,7 @@
DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
OMR_CASE_IGNORE_OID, SYNTAX_COUNTRY_STRING_NAME));
}
@@ -126,7 +129,7 @@
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
SMR_CASE_IGNORE_OID, SYNTAX_COUNTRY_STRING_NAME));
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
index 9a34255..0523c8d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
@@ -29,6 +29,7 @@
import java.util.HashSet;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.StringTokenizer;
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
@@ -42,7 +43,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -72,6 +72,9 @@
public class DeliveryMethodSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* The set of values that may be used as delivery methods.
*/
@@ -137,7 +140,7 @@
DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
if (defaultApproximateMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE.get(
AMR_DOUBLE_METAPHONE_OID, SYNTAX_DELIVERY_METHOD_NAME));
}
@@ -145,7 +148,7 @@
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
EMR_CASE_IGNORE_OID, SYNTAX_DELIVERY_METHOD_NAME));
}
@@ -153,7 +156,7 @@
DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
OMR_CASE_IGNORE_OID, SYNTAX_DELIVERY_METHOD_NAME));
}
@@ -161,7 +164,7 @@
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
SMR_CASE_IGNORE_OID, SYNTAX_DELIVERY_METHOD_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java
index b1bc26a..d883bb6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.schema;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -45,7 +46,6 @@
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
@@ -62,6 +62,9 @@
extends AttributeSyntax<DirectoryStringAttributeSyntaxCfg>
implements ConfigurationChangeListener<DirectoryStringAttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default approximate matching rule for this syntax.
private ApproximateMatchingRule defaultApproximateMatchingRule;
@@ -124,7 +127,7 @@
DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
if (defaultApproximateMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE.get(
AMR_DOUBLE_METAPHONE_OID, SYNTAX_DIRECTORY_STRING_NAME));
}
@@ -132,7 +135,7 @@
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
EMR_CASE_IGNORE_OID, SYNTAX_DIRECTORY_STRING_NAME));
}
@@ -140,7 +143,7 @@
DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
OMR_CASE_IGNORE_OID, SYNTAX_DIRECTORY_STRING_NAME));
}
@@ -148,7 +151,7 @@
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
SMR_CASE_IGNORE_OID, SYNTAX_DIRECTORY_STRING_NAME));
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
index 267a96b..880f2cc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
@@ -38,7 +38,6 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import static org.opends.server.loggers.ErrorLogger.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteSequence;
@@ -107,16 +106,14 @@
DirectoryServer.getEqualityMatchingRule(EMR_DN_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
- EMR_DN_OID, SYNTAX_DN_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_DN_OID, SYNTAX_DN_NAME));
}
defaultSubstringMatchingRule =
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
- SMR_CASE_IGNORE_OID, SYNTAX_DN_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_CASE_IGNORE_OID, SYNTAX_DN_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
index dec2bd6..e8380ee 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
@@ -29,6 +29,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.EqualityMatchingRule;
@@ -39,7 +40,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -54,6 +54,9 @@
public class EnhancedGuideSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -88,7 +91,7 @@
DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
EMR_OCTET_STRING_OID, SYNTAX_ENHANCED_GUIDE_NAME));
}
@@ -96,7 +99,7 @@
DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
OMR_OCTET_STRING_OID, SYNTAX_ENHANCED_GUIDE_NAME));
}
@@ -104,7 +107,7 @@
DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
SMR_OCTET_STRING_OID, SYNTAX_ENHANCED_GUIDE_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java
index 10ce15b..b4f26f0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java
@@ -29,6 +29,7 @@
import java.util.HashSet;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.opends.server.api.ApproximateMatchingRule;
@@ -41,7 +42,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -67,6 +67,9 @@
public class FaxNumberSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* The set of allowed fax parameter values, formatted entirely in lowercase
* characters.
@@ -121,24 +124,21 @@
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
- EMR_CASE_IGNORE_OID, SYNTAX_FAXNUMBER_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_CASE_IGNORE_OID, SYNTAX_FAXNUMBER_NAME));
}
defaultOrderingMatchingRule =
DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
- OMR_CASE_IGNORE_OID, SYNTAX_FAXNUMBER_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_CASE_IGNORE_OID, SYNTAX_FAXNUMBER_NAME));
}
defaultSubstringMatchingRule =
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
- SMR_CASE_IGNORE_OID, SYNTAX_FAXNUMBER_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_CASE_IGNORE_OID, SYNTAX_FAXNUMBER_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java
index b0d6544..7cc2ba9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java
@@ -29,6 +29,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.EqualityMatchingRule;
@@ -39,7 +40,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -53,6 +53,9 @@
public class FaxSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -87,24 +90,21 @@
DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
- EMR_OCTET_STRING_OID, SYNTAX_FAX_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_OCTET_STRING_OID, SYNTAX_FAX_NAME));
}
defaultOrderingMatchingRule =
DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
- OMR_OCTET_STRING_OID, SYNTAX_FAX_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_OCTET_STRING_OID, SYNTAX_FAX_NAME));
}
defaultSubstringMatchingRule =
DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
- SMR_OCTET_STRING_OID, SYNTAX_FAX_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_OCTET_STRING_OID, SYNTAX_FAX_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
index 10a2fcb..8820865 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
@@ -28,7 +28,6 @@
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.schema.SchemaConstants.*;
import java.util.Collection;
@@ -161,7 +160,7 @@
throw de;
case WARN:
- logError(de.getMessageObject());
+ logger.error(de.getMessageObject());
return value.toByteString();
default:
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
index e60bbf4..6a682ff 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
@@ -28,7 +28,6 @@
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.schema.SchemaConstants.*;
import java.util.Collection;
@@ -173,7 +172,7 @@
throw de;
case WARN:
- logError(de.getMessageObject());
+ logger.error(de.getMessageObject());
return value.toByteString();
default:
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
index f41fced..4b233ca 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
@@ -49,7 +49,6 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.ServerConstants.*;
@@ -108,7 +107,7 @@
DirectoryServer.getEqualityMatchingRule(EMR_GENERALIZED_TIME_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
EMR_GENERALIZED_TIME_OID, SYNTAX_GENERALIZED_TIME_NAME));
}
@@ -116,7 +115,7 @@
DirectoryServer.getOrderingMatchingRule(OMR_GENERALIZED_TIME_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
OMR_GENERALIZED_TIME_OID, SYNTAX_GENERALIZED_TIME_NAME));
}
@@ -124,7 +123,7 @@
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
SMR_CASE_IGNORE_OID, SYNTAX_GENERALIZED_TIME_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java
index 76534d7..f4a05c9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java
@@ -29,6 +29,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.EqualityMatchingRule;
@@ -39,7 +40,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -54,6 +54,9 @@
public class GuideSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -88,24 +91,21 @@
DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
- EMR_OCTET_STRING_OID, SYNTAX_GUIDE_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_OCTET_STRING_OID, SYNTAX_GUIDE_NAME));
}
defaultOrderingMatchingRule =
DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
- OMR_OCTET_STRING_OID, SYNTAX_GUIDE_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_OCTET_STRING_OID, SYNTAX_GUIDE_NAME));
}
defaultSubstringMatchingRule =
DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
- SMR_OCTET_STRING_OID, SYNTAX_GUIDE_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_OCTET_STRING_OID, SYNTAX_GUIDE_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java
index 6438751..2d6a52f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.schema;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -40,7 +41,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -55,6 +55,9 @@
public class IA5StringSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default approximate matching rule for this syntax.
private ApproximateMatchingRule defaultApproximateMatchingRule;
@@ -92,7 +95,7 @@
DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
if (defaultApproximateMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE.get(
AMR_DOUBLE_METAPHONE_OID, SYNTAX_IA5_STRING_NAME));
}
@@ -100,7 +103,7 @@
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_IA5_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
EMR_CASE_IGNORE_IA5_OID, SYNTAX_IA5_STRING_NAME));
}
@@ -108,7 +111,7 @@
DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
OMR_CASE_IGNORE_OID, SYNTAX_IA5_STRING_NAME));
}
@@ -116,7 +119,7 @@
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_IA5_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
SMR_CASE_IGNORE_IA5_OID, SYNTAX_IA5_STRING_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java
index bd49652..ada2a44 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java
@@ -29,6 +29,7 @@
import static org.opends.messages.SchemaMessages.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.schema.SchemaConstants.*;
import java.util.Collection;
@@ -37,7 +38,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
@@ -52,6 +52,9 @@
class IntegerEqualityMatchingRule
extends EqualityMatchingRule
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* Creates a new instance of this integerMatch matching rule.
*/
@@ -175,7 +178,7 @@
if (! logged)
{
logged = true;
- ErrorLogger.logError(message);
+ logger.error(message);
}
break;
}
@@ -197,7 +200,7 @@
if (! logged)
{
logged = true;
- ErrorLogger.logError(message);
+ logger.error(message);
}
break;
}
@@ -260,7 +263,7 @@
if (! logged)
{
logged = true;
- ErrorLogger.logError(message);
+ logger.error(message);
}
break;
}
@@ -279,7 +282,7 @@
if (! logged)
{
logged = true;
- ErrorLogger.logError(message);
+ logger.error(message);
}
break;
}
@@ -301,7 +304,7 @@
if (! logged)
{
logged = true;
- ErrorLogger.logError(message);
+ logger.error(message);
}
buffer.append("0");
@@ -326,7 +329,7 @@
if (! logged)
{
logged = true;
- ErrorLogger.logError(message);
+ logger.error(message);
}
buffer.setCharAt(0, '0');
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java
index 75d0de5..b024ab1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java
@@ -29,7 +29,7 @@
import static org.opends.messages.SchemaMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.schema.SchemaConstants.*;
import java.util.Collection;
@@ -54,6 +54,9 @@
extends AbstractMatchingRule
implements OrderingMatchingRule
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* The serial version identifier required to satisfy the compiler because this
* class implements the <CODE>java.io.Serializable</CODE> interface. This
@@ -188,7 +191,7 @@
if (! logged)
{
logged = true;
- logError(message);
+ logger.error(message);
}
break;
}
@@ -211,7 +214,7 @@
if (! logged)
{
logged = true;
- logError(
+ logger.error(
message);
}
break;
@@ -275,7 +278,7 @@
if (! logged)
{
logged = true;
- logError(
+ logger.error(
message);
}
break;
@@ -295,7 +298,7 @@
if (! logged)
{
logged = true;
- logError(
+ logger.error(
message);
}
break;
@@ -318,7 +321,7 @@
if (! logged)
{
logged = true;
- logError(
+ logger.error(
message);
}
@@ -345,7 +348,7 @@
if (! logged)
{
logged = true;
- logError(
+ logger.error(
message);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java
index e99395f..cbc32d7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.schema;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -43,7 +44,6 @@
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -57,6 +57,9 @@
public class IntegerSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -121,24 +124,21 @@
DirectoryServer.getEqualityMatchingRule(EMR_INTEGER_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
- EMR_INTEGER_OID, SYNTAX_INTEGER_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_INTEGER_OID, SYNTAX_INTEGER_NAME));
}
defaultOrderingMatchingRule =
DirectoryServer.getOrderingMatchingRule(OMR_INTEGER_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
- OMR_INTEGER_OID, SYNTAX_INTEGER_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_INTEGER_OID, SYNTAX_INTEGER_NAME));
}
defaultSubstringMatchingRule =
DirectoryServer.getSubstringMatchingRule(SMR_CASE_EXACT_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
- SMR_CASE_EXACT_OID, SYNTAX_INTEGER_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_CASE_EXACT_OID, SYNTAX_INTEGER_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java
index bac9a99..82b9d9d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java
@@ -30,6 +30,7 @@
import java.util.List;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.JPEGAttributeSyntaxCfg;
@@ -45,7 +46,6 @@
import org.opends.server.types.ResultCode;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessage;
@@ -63,6 +63,9 @@
extends AttributeSyntax<JPEGAttributeSyntaxCfg>
implements ConfigurationChangeListener<JPEGAttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -100,24 +103,21 @@
DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
- EMR_OCTET_STRING_OID, SYNTAX_JPEG_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_OCTET_STRING_OID, SYNTAX_JPEG_NAME));
}
defaultOrderingMatchingRule =
DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
- OMR_OCTET_STRING_OID, SYNTAX_JPEG_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_OCTET_STRING_OID, SYNTAX_JPEG_NAME));
}
defaultSubstringMatchingRule =
DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
- SMR_OCTET_STRING_OID, SYNTAX_JPEG_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_OCTET_STRING_OID, SYNTAX_JPEG_NAME));
}
this.config = configuration;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
index b8b441d..7cc7ac1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
@@ -59,7 +59,6 @@
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;
import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.messages.SchemaMessages.*;
@@ -111,24 +110,21 @@
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
- EMR_CASE_IGNORE_OID, SYNTAX_LDAP_SYNTAX_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_CASE_IGNORE_OID, SYNTAX_LDAP_SYNTAX_NAME));
}
defaultOrderingMatchingRule =
DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
- OMR_CASE_IGNORE_OID, SYNTAX_LDAP_SYNTAX_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_CASE_IGNORE_OID, SYNTAX_LDAP_SYNTAX_NAME));
}
defaultSubstringMatchingRule =
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
- SMR_CASE_IGNORE_OID, SYNTAX_LDAP_SYNTAX_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_CASE_IGNORE_OID, SYNTAX_LDAP_SYNTAX_NAME));
}
}
@@ -1465,7 +1461,7 @@
}
catch(DirectoryException de)
{
- logError(de.getMessageObject());
+ logger.error(de.getMessageObject());
}
}
return orderingMatchingRule;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
index 739ed85..3c5ec84 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
@@ -44,7 +44,6 @@
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
@@ -100,24 +99,21 @@
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
- EMR_CASE_IGNORE_OID, SYNTAX_MATCHING_RULE_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_CASE_IGNORE_OID, SYNTAX_MATCHING_RULE_NAME));
}
defaultOrderingMatchingRule =
DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
- OMR_CASE_IGNORE_OID, SYNTAX_MATCHING_RULE_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_CASE_IGNORE_OID, SYNTAX_MATCHING_RULE_NAME));
}
defaultSubstringMatchingRule =
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
- SMR_CASE_IGNORE_OID, SYNTAX_MATCHING_RULE_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_CASE_IGNORE_OID, SYNTAX_MATCHING_RULE_NAME));
}
}
@@ -567,9 +563,7 @@
false);
if (syntax == null)
{
- LocalizableMessage message = ERR_ATTR_SYNTAX_MR_UNKNOWN_SYNTAX.get(
- valueStr, oidBuffer.toString());
- logError(message);
+ logger.error(ERR_ATTR_SYNTAX_MR_UNKNOWN_SYNTAX, valueStr, oidBuffer.toString());
syntax = DirectoryServer.getDefaultAttributeSyntax();
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
index 89f74ac..1239617 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
@@ -41,7 +41,6 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.server.loggers.ErrorLogger.*;
import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
@@ -92,7 +91,7 @@
DirectoryServer.getEqualityMatchingRule(EMR_UNIQUE_MEMBER_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
EMR_UNIQUE_MEMBER_OID, SYNTAX_NAME_AND_OPTIONAL_UID_NAME));
}
@@ -100,7 +99,7 @@
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
SMR_CASE_IGNORE_OID, SYNTAX_NAME_AND_OPTIONAL_UID_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java
index 10a2a50..0d0e3bd 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java
@@ -29,6 +29,7 @@
import static org.opends.messages.SchemaMessages.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.schema.StringPrepProfile.*;
@@ -39,7 +40,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
@@ -55,6 +55,9 @@
class NumericStringEqualityMatchingRule
extends EqualityMatchingRule
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* Creates a new instance of this caseExactMatch matching rule.
*/
@@ -175,7 +178,7 @@
case WARN:
if (! logged)
{
- ErrorLogger.logError(message);
+ logger.error(message);
logged = true;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
index 3f52ff0..c5a9d86 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
@@ -29,6 +29,7 @@
import static org.opends.messages.SchemaMessages.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.schema.StringPrepProfile.*;
@@ -40,7 +41,6 @@
import org.opends.server.api.AbstractMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
@@ -57,6 +57,9 @@
extends AbstractMatchingRule
implements OrderingMatchingRule
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* The serial version identifier required to satisfy the compiler because this
* class implements the <CODE>java.io.Serializable</CODE> interface. This
@@ -187,7 +190,7 @@
case WARN:
if (! logged)
{
- ErrorLogger.logError(message);
+ logger.error(message);
logged = true;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java
index 8024217..ebfeb41 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java
@@ -29,6 +29,7 @@
import static org.opends.messages.SchemaMessages.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.schema.StringPrepProfile.*;
@@ -39,7 +40,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
@@ -54,6 +54,9 @@
class NumericStringSubstringMatchingRule
extends SubstringMatchingRule
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* Creates a new instance of this numericStringSubstringsMatch matching rule.
*/
@@ -174,7 +177,7 @@
case WARN:
if (! logged)
{
- ErrorLogger.logError(message);
+ logger.error(message);
logged = true;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java
index 62775bf..bcb780b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java
@@ -29,6 +29,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.EqualityMatchingRule;
@@ -39,7 +40,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -54,6 +54,9 @@
public class NumericStringSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -88,7 +91,7 @@
DirectoryServer.getEqualityMatchingRule(EMR_NUMERIC_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
EMR_NUMERIC_STRING_OID, SYNTAX_NUMERIC_STRING_NAME));
}
@@ -96,7 +99,7 @@
DirectoryServer.getOrderingMatchingRule(OMR_NUMERIC_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
OMR_NUMERIC_STRING_OID, SYNTAX_NUMERIC_STRING_NAME));
}
@@ -104,7 +107,7 @@
DirectoryServer.getSubstringMatchingRule(SMR_CASE_EXACT_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
SMR_NUMERIC_STRING_OID, SYNTAX_NUMERIC_STRING_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java
index 3100ff5..cec1009 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java
@@ -29,6 +29,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.EqualityMatchingRule;
@@ -39,7 +40,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -53,6 +53,9 @@
public class OIDSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -84,16 +87,14 @@
DirectoryServer.getEqualityMatchingRule(EMR_OID_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
- EMR_OID_OID, SYNTAX_OID_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_OID_OID, SYNTAX_OID_NAME));
}
defaultSubstringMatchingRule =
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
- SMR_CASE_IGNORE_OID, SYNTAX_OID_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_CASE_IGNORE_OID, SYNTAX_OID_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
index 43b4d55..31bde9c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
@@ -29,6 +29,7 @@
import static org.opends.messages.SchemaMessages.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -40,7 +41,6 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.MatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.opends.server.types.AttributeType;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
@@ -59,6 +59,9 @@
class ObjectIdentifierEqualityMatchingRule
extends EqualityMatchingRule
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* Creates a new instance of this objectIdentifierMatch matching rule.
*/
@@ -221,9 +224,7 @@
if (! isValidSchemaElement(lowerValue, 0, lowerValue.length(),
invalidReason))
{
- LocalizableMessage message = ERR_ATTR_SYNTAX_OID_INVALID_VALUE.get(
- lowerValue, invalidReason.toString());
- ErrorLogger.logError(message);
+ logger.error(ERR_ATTR_SYNTAX_OID_INVALID_VALUE, lowerValue, invalidReason.toString());
}
return ByteString.valueOf(lowerValue);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java
index ed31616..3eaad45 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java
@@ -29,6 +29,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.EqualityMatchingRule;
@@ -39,7 +40,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -53,6 +53,9 @@
public class OctetStringSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -87,24 +90,21 @@
DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
- EMR_OCTET_STRING_OID, SYNTAX_OCTET_STRING_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_OCTET_STRING_OID, SYNTAX_OCTET_STRING_NAME));
}
defaultOrderingMatchingRule =
DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
- OMR_OCTET_STRING_OID, SYNTAX_OCTET_STRING_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_OCTET_STRING_OID, SYNTAX_OCTET_STRING_NAME));
}
defaultSubstringMatchingRule =
DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
- SMR_OCTET_STRING_OID, SYNTAX_OCTET_STRING_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_OCTET_STRING_OID, SYNTAX_OCTET_STRING_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java
index 6c409f2..ce1c090 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java
@@ -29,6 +29,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.EqualityMatchingRule;
@@ -39,7 +40,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -54,6 +54,9 @@
public class OtherMailboxSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -85,7 +88,7 @@
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_LIST_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
EMR_CASE_IGNORE_LIST_OID, SYNTAX_OTHER_MAILBOX_NAME));
}
@@ -93,7 +96,7 @@
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_LIST_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
SMR_CASE_IGNORE_LIST_OID, SYNTAX_OTHER_MAILBOX_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java
index 4f8f13f..4432f2d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java
@@ -29,6 +29,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.EqualityMatchingRule;
@@ -39,7 +40,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -55,6 +55,9 @@
public class PostalAddressSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -86,7 +89,7 @@
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
EMR_CASE_IGNORE_OID, SYNTAX_DIRECTORY_STRING_NAME));
}
@@ -94,7 +97,7 @@
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
SMR_CASE_IGNORE_OID, SYNTAX_DIRECTORY_STRING_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java
index a2c46e3..6a65368 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java
@@ -29,6 +29,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.EqualityMatchingRule;
@@ -39,7 +40,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -53,6 +53,9 @@
public class PresentationAddressSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default approximate matching rule for this syntax.
private ApproximateMatchingRule defaultApproximateMatchingRule;
@@ -90,7 +93,7 @@
DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
if (defaultApproximateMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE.get(
AMR_DOUBLE_METAPHONE_OID, SYNTAX_PRESENTATION_ADDRESS_NAME));
}
@@ -98,7 +101,7 @@
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
EMR_CASE_IGNORE_OID, SYNTAX_PRESENTATION_ADDRESS_NAME));
}
@@ -106,7 +109,7 @@
DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
OMR_CASE_IGNORE_OID, SYNTAX_PRESENTATION_ADDRESS_NAME));
}
@@ -114,7 +117,7 @@
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
SMR_CASE_IGNORE_OID, SYNTAX_PRESENTATION_ADDRESS_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java
index 133b528..919c4de 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java
@@ -29,6 +29,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.EqualityMatchingRule;
@@ -39,7 +40,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -55,6 +55,9 @@
public class PrintableStringSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default approximate matching rule for this syntax.
private ApproximateMatchingRule defaultApproximateMatchingRule;
@@ -92,7 +95,7 @@
DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
if (defaultApproximateMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE.get(
AMR_DOUBLE_METAPHONE_OID, SYNTAX_PRINTABLE_STRING_NAME));
}
@@ -100,7 +103,7 @@
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
EMR_CASE_IGNORE_OID, SYNTAX_PRINTABLE_STRING_NAME));
}
@@ -108,7 +111,7 @@
DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
OMR_CASE_IGNORE_OID, SYNTAX_PRINTABLE_STRING_NAME));
}
@@ -116,7 +119,7 @@
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
SMR_CASE_IGNORE_OID, SYNTAX_PRINTABLE_STRING_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
index 5c6d182..2212f85 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
@@ -29,6 +29,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.EqualityMatchingRule;
@@ -39,7 +40,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -53,6 +53,9 @@
public class ProtocolInformationSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default approximate matching rule for this syntax.
private ApproximateMatchingRule defaultApproximateMatchingRule;
@@ -90,7 +93,7 @@
DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
if (defaultApproximateMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE.get(
AMR_DOUBLE_METAPHONE_OID, SYNTAX_PROTOCOL_INFORMATION_NAME));
}
@@ -98,7 +101,7 @@
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
EMR_CASE_IGNORE_OID, SYNTAX_PROTOCOL_INFORMATION_NAME));
}
@@ -106,7 +109,7 @@
DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
OMR_CASE_IGNORE_OID, SYNTAX_PROTOCOL_INFORMATION_NAME));
}
@@ -114,7 +117,7 @@
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
SMR_CASE_IGNORE_OID, SYNTAX_PROTOCOL_INFORMATION_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
index 8e0e652..f4d2842 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
@@ -29,6 +29,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.EqualityMatchingRule;
@@ -39,7 +40,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -54,6 +54,9 @@
public class SubstringAssertionSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -88,7 +91,7 @@
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
EMR_CASE_IGNORE_OID, SYNTAX_SUBSTRING_ASSERTION_NAME));
}
@@ -96,7 +99,7 @@
DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
OMR_CASE_IGNORE_OID, SYNTAX_SUBSTRING_ASSERTION_NAME));
}
@@ -104,7 +107,7 @@
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
SMR_CASE_IGNORE_OID, SYNTAX_SUBSTRING_ASSERTION_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java
index 95724d7..ec2aee4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java
@@ -27,7 +27,6 @@
package org.opends.server.schema;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -124,21 +123,21 @@
defaultEqualityMatchingRule = DirectoryServer
.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null) {
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
EMR_OCTET_STRING_OID, SYNTAX_SUBTREE_SPECIFICATION_NAME));
}
defaultOrderingMatchingRule = DirectoryServer
.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null) {
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
OMR_OCTET_STRING_OID, SYNTAX_SUBTREE_SPECIFICATION_NAME));
}
defaultSubstringMatchingRule = DirectoryServer
.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null) {
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
SMR_OCTET_STRING_OID, SYNTAX_SUBTREE_SPECIFICATION_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
index 8dac2ba..c60a986 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
@@ -29,6 +29,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.EqualityMatchingRule;
@@ -39,7 +40,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -54,6 +54,9 @@
public class SupportedAlgorithmSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -88,7 +91,7 @@
DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
EMR_OCTET_STRING_OID, SYNTAX_SUPPORTED_ALGORITHM_NAME));
}
@@ -96,7 +99,7 @@
DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
OMR_OCTET_STRING_OID, SYNTAX_SUPPORTED_ALGORITHM_NAME));
}
@@ -104,7 +107,7 @@
DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
SMR_OCTET_STRING_OID, SYNTAX_SUPPORTED_ALGORITHM_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
index 5677bda..73df2d7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.schema;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -46,7 +47,6 @@
import org.opends.server.types.ResultCode;
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
@@ -67,6 +67,9 @@
extends AttributeSyntax<TelephoneNumberAttributeSyntaxCfg>
implements ConfigurationChangeListener<TelephoneNumberAttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// Indicates whether this matching rule should operate in strict mode.
private boolean strictMode;
@@ -104,16 +107,14 @@
DirectoryServer.getEqualityMatchingRule(EMR_TELEPHONE_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
- EMR_TELEPHONE_OID, SYNTAX_TELEPHONE_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_TELEPHONE_OID, SYNTAX_TELEPHONE_NAME));
}
defaultSubstringMatchingRule =
DirectoryServer.getSubstringMatchingRule(SMR_TELEPHONE_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
- SMR_TELEPHONE_OID, SYNTAX_TELEPHONE_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_TELEPHONE_OID, SYNTAX_TELEPHONE_NAME));
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
index 9e95363..a5c9544 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
@@ -29,6 +29,7 @@
import java.util.HashSet;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.opends.server.api.ApproximateMatchingRule;
@@ -41,7 +42,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -67,6 +67,9 @@
public class TeletexTerminalIdentifierSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* The set of allowed fax parameter values, formatted entirely in lowercase
* characters.
@@ -119,7 +122,7 @@
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
EMR_CASE_IGNORE_OID, SYNTAX_TELETEX_TERM_ID_NAME));
}
@@ -127,7 +130,7 @@
DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
OMR_CASE_IGNORE_OID, SYNTAX_TELETEX_TERM_ID_NAME));
}
@@ -135,7 +138,7 @@
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
SMR_CASE_IGNORE_OID, SYNTAX_TELETEX_TERM_ID_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java
index 88408d6..310a866 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java
@@ -29,6 +29,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.EqualityMatchingRule;
@@ -39,7 +40,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -53,6 +53,9 @@
public class TelexNumberSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -87,24 +90,21 @@
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
- EMR_CASE_IGNORE_OID, SYNTAX_TELEX_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_CASE_IGNORE_OID, SYNTAX_TELEX_NAME));
}
defaultOrderingMatchingRule =
DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
- OMR_CASE_IGNORE_OID, SYNTAX_TELEX_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_CASE_IGNORE_OID, SYNTAX_TELEX_NAME));
}
defaultSubstringMatchingRule =
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
- SMR_CASE_IGNORE_OID, SYNTAX_TELEX_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_CASE_IGNORE_OID, SYNTAX_TELEX_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java b/opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java
index d33c578..79170f7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java
@@ -29,6 +29,7 @@
package org.opends.server.schema;
import org.opends.server.util.StaticUtils;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Calendar;
@@ -77,6 +78,9 @@
public final class TimeBasedMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
//Greater-than RelativeTimeMatchingRule.
private MatchingRule greaterThanRTMRule;
@@ -194,7 +198,7 @@
throw de;
case WARN:
- logError(de.getMessageObject());
+ logger.error(de.getMessageObject());
return value.toByteString();
default:
@@ -366,7 +370,7 @@
if(message !=null)
{
//Log the message and throw an exception.
- logError(message);
+ logger.error(message);
throw new DirectoryException(
ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -948,7 +952,7 @@
}
if(message !=null)
{
- logError(message);
+ logger.error(message);
throw new DirectoryException(
ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -966,7 +970,7 @@
LocalizableMessage message =
WARN_ATTR_INVALID_YEAR_ASSERTION_FORMAT.
get(value.toString(),year);
- logError(message);
+ logger.warn(message);
throw new DirectoryException(
ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -1016,7 +1020,7 @@
LocalizableMessage message =
WARN_ATTR_INVALID_MONTH_ASSERTION_FORMAT.
get(value.toString(),month);
- logError(message);
+ logger.warn(message);
throw new DirectoryException(
ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -1048,9 +1052,8 @@
if(invalidDate)
{
LocalizableMessage message =
- WARN_ATTR_INVALID_DATE_ASSERTION_FORMAT.
- get(value.toString(),date);
- logError(message);
+ WARN_ATTR_INVALID_DATE_ASSERTION_FORMAT.get(value.toString(), date);
+ logger.warn(message);
throw new DirectoryException(
ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -1060,27 +1063,27 @@
LocalizableMessage message =
WARN_ATTR_INVALID_HOUR_ASSERTION_FORMAT.
get(value.toString(),date);
- logError(message);
+ logger.warn(message);
throw new DirectoryException(
ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
if(!(minute >=-1 && minute <=59))
{
- LocalizableMessage message =
+ LocalizableMessage message =
WARN_ATTR_INVALID_MINUTE_ASSERTION_FORMAT.
get(value.toString(),date);
- logError(message);
+ logger.warn(message);
throw new DirectoryException(
ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
if(!(second >=-1 && second <=60)) //Consider leap seconds.
{
- LocalizableMessage message =
+ LocalizableMessage message =
WARN_ATTR_INVALID_SECOND_ASSERTION_FORMAT.
get(value.toString(),date);
- logError(message);
+ logger.warn(message);
throw new DirectoryException(
ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java
index f9db469..f232d9b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java
@@ -48,7 +48,6 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.ServerConstants.*;
@@ -148,24 +147,21 @@
DirectoryServer.getEqualityMatchingRule(EMR_GENERALIZED_TIME_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
- EMR_GENERALIZED_TIME_OID, SYNTAX_UTC_TIME_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_GENERALIZED_TIME_OID, SYNTAX_UTC_TIME_NAME));
}
defaultOrderingMatchingRule =
DirectoryServer.getOrderingMatchingRule(OMR_GENERALIZED_TIME_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
- OMR_GENERALIZED_TIME_OID, SYNTAX_UTC_TIME_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_GENERALIZED_TIME_OID, SYNTAX_UTC_TIME_NAME));
}
defaultSubstringMatchingRule =
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
- SMR_CASE_IGNORE_OID, SYNTAX_UTC_TIME_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_CASE_IGNORE_OID, SYNTAX_UTC_TIME_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
index 6e67ffe..827555b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
@@ -29,7 +29,7 @@
import static org.opends.messages.SchemaMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.schema.SchemaConstants.*;
import java.util.Collection;
@@ -52,6 +52,9 @@
class UUIDEqualityMatchingRule
extends EqualityMatchingRule
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* Creates a new instance of this caseExactMatch matching rule.
*/
@@ -154,7 +157,7 @@
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
message);
case WARN:
- logError(message);
+ logger.error(message);
return value.toByteString();
default:
return value.toByteString();
@@ -184,7 +187,7 @@
throw new DirectoryException(
ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
case WARN:
- logError(
+ logger.error(
message);
return value.toByteString();
default:
@@ -242,7 +245,7 @@
throw new DirectoryException(
ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
case WARN:
- logError(
+ logger.error(
message);
return value.toByteString();
default:
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java
index 0b762c6..1c4788b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java
@@ -29,6 +29,7 @@
import static org.opends.messages.SchemaMessages.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.schema.SchemaConstants.*;
import java.util.Collection;
@@ -38,7 +39,6 @@
import org.opends.server.api.AbstractMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
@@ -55,6 +55,9 @@
extends AbstractMatchingRule
implements OrderingMatchingRule
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* The serial version identifier required to satisfy the compiler because this
* class implements the <CODE>java.io.Serializable</CODE> interface. This
@@ -167,7 +170,7 @@
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
message);
case WARN:
- ErrorLogger.logError(message);
+ logger.error(message);
return value.toByteString();
default:
return value.toByteString();
@@ -197,7 +200,7 @@
throw new DirectoryException(
ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
case WARN:
- ErrorLogger.logError(message);
+ logger.error(message);
return value.toByteString();
default:
return value.toByteString();
@@ -254,7 +257,7 @@
throw new DirectoryException(
ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
case WARN:
- ErrorLogger.logError(message);
+ logger.error(message);
return value.toByteString();
default:
return value.toByteString();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java
index 24145fd..4afca46 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java
@@ -29,6 +29,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.EqualityMatchingRule;
@@ -39,7 +40,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -52,6 +52,9 @@
public class UUIDSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
@@ -83,16 +86,14 @@
DirectoryServer.getEqualityMatchingRule(EMR_UUID_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
- EMR_UUID_OID, SYNTAX_UUID_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_UUID_OID, SYNTAX_UUID_NAME));
}
defaultOrderingMatchingRule =
DirectoryServer.getOrderingMatchingRule(OMR_UUID_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
- OMR_UUID_OID, SYNTAX_UUID_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_UUID_OID, SYNTAX_UUID_NAME));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
index 167828c..4626190 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
@@ -38,7 +38,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.ErrorLogger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
@@ -195,7 +194,7 @@
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
message);
case WARN:
- ErrorLogger.logError(message);
+ logger.error(message);
valueBuffer.append(toLowerCase(valueString).substring(0, dnEndPos));
break;
@@ -238,7 +237,7 @@
case WARN:
if (! logged)
{
- ErrorLogger.logError(message);
+ logger.error(message);
logged = true;
}
break;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java
index 24fd01d..32cfbab 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.schema;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -55,7 +56,10 @@
* order:
* <BR>
* <UL>
- * <LI>An opening curly brace ("{") character.</LI>
+ * <LI>An opening curly brace ("{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+") character.</LI>
* <LI>The name of the storage scheme used to encode the value.</LI>
* <LI>A closing curly brace ("}") character.</LI>
* <LI>The encoded value.</LI>
@@ -64,11 +68,12 @@
public class UserPasswordSyntax
extends AttributeSyntax<AttributeSyntaxCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -92,8 +97,8 @@
DirectoryServer.getEqualityMatchingRule(EMR_USER_PASSWORD_EXACT_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
- EMR_USER_PASSWORD_EXACT_NAME, SYNTAX_USER_PASSWORD_NAME));
+ logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
+ EMR_USER_PASSWORD_EXACT_NAME, SYNTAX_USER_PASSWORD_NAME);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/AddSchemaFileTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/AddSchemaFileTask.java
index 8efded1..27ab61e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/AddSchemaFileTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/AddSchemaFileTask.java
@@ -188,9 +188,7 @@
final Lock schemaLock = LockManager.lockWrite(schemaDN);
if (schemaLock == null)
{
- LocalizableMessage message = ERR_TASK_ADDSCHEMAFILE_CANNOT_LOCK_SCHEMA.get(
- String.valueOf(schemaDN));
- logError(message);
+ logger.error(ERR_TASK_ADDSCHEMAFILE_CANNOT_LOCK_SCHEMA, String.valueOf(schemaDN));
return TaskState.STOPPED_BY_ERROR;
}
@@ -237,18 +235,16 @@
{
logger.traceException(ce);
- LocalizableMessage message = ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE.
- get(String.valueOf(schemaFile), ce.getMessage());
- logError(message);
+ logger.error(ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE, String
+ .valueOf(schemaFile), ce.getMessage());
return TaskState.STOPPED_BY_ERROR;
}
catch (InitializationException ie)
{
logger.traceException(ie);
- LocalizableMessage message = ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE.
- get(String.valueOf(schemaFile), ie.getMessage());
- logError(message);
+ logger.error(ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE, String
+ .valueOf(schemaFile), ie.getMessage());
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -266,10 +262,8 @@
{
logger.traceException(e);
- LocalizableMessage message =
- ERR_TASK_ADDSCHEMAFILE_CANNOT_NOTIFY_SYNC_PROVIDER.
- get(provider.getClass().getName(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_TASK_ADDSCHEMAFILE_CANNOT_NOTIFY_SYNC_PROVIDER,
+ provider.getClass().getName(), getExceptionMessage(e));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/BackupTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/BackupTask.java
index 7015dd8..1f03534 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/BackupTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/BackupTask.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.tasks;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.messages.TaskMessages;
import static org.opends.server.config.ConfigConstants.*;
@@ -73,6 +74,9 @@
public class BackupTask extends Task
{
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
+
/**
* Stores mapping between configuration attribute name and its label.
@@ -271,17 +275,15 @@
{
if (!backendIDList.isEmpty())
{
- LocalizableMessage message = ERR_BACKUPDB_CANNOT_MIX_BACKUP_ALL_AND_BACKEND_ID.get(
+ logger.error(ERR_BACKUPDB_CANNOT_MIX_BACKUP_ALL_AND_BACKEND_ID,
ATTR_TASK_BACKUP_ALL, ATTR_TASK_BACKUP_BACKEND_ID);
- logError(message);
return false;
}
}
else if (backendIDList.isEmpty())
{
- LocalizableMessage message = ERR_BACKUPDB_NEED_BACKUP_ALL_OR_BACKEND_ID.get(
+ logger.error(ERR_BACKUPDB_NEED_BACKUP_ALL_OR_BACKEND_ID,
ATTR_TASK_BACKUP_ALL, ATTR_TASK_BACKUP_BACKEND_ID);
- logError(message);
return false;
}
@@ -307,10 +309,8 @@
{
if (! incremental)
{
- LocalizableMessage message = ERR_BACKUPDB_INCREMENTAL_BASE_REQUIRES_INCREMENTAL.
- get(ATTR_TASK_BACKUP_INCREMENTAL_BASE_ID,
+ logger.error(ERR_BACKUPDB_INCREMENTAL_BASE_REQUIRES_INCREMENTAL, ATTR_TASK_BACKUP_INCREMENTAL_BASE_ID,
ATTR_TASK_BACKUP_INCREMENTAL);
- logError(message);
return false;
}
}
@@ -320,9 +320,7 @@
// was given.
if (signHash && (! hash))
{
- LocalizableMessage message = ERR_BACKUPDB_SIGN_REQUIRES_HASH.get(
- ATTR_TASK_BACKUP_SIGN_HASH, ATTR_TASK_BACKUP_HASH);
- logError(message);
+ logger.error(ERR_BACKUPDB_SIGN_REQUIRES_HASH, ATTR_TASK_BACKUP_SIGN_HASH, ATTR_TASK_BACKUP_HASH);
return false;
}
@@ -368,14 +366,11 @@
Backend b = DirectoryServer.getBackend(id);
if (b == null || configEntries.get(id) == null)
{
- LocalizableMessage message = ERR_BACKUPDB_NO_BACKENDS_FOR_ID.get(id);
- logError(message);
+ logger.error(ERR_BACKUPDB_NO_BACKENDS_FOR_ID, id);
}
else if (! b.supportsBackup())
{
- LocalizableMessage message =
- WARN_BACKUPDB_BACKUP_NOT_SUPPORTED.get(b.getBackendID());
- logError(message);
+ logger.warn(WARN_BACKUPDB_BACKUP_NOT_SUPPORTED, b.getBackendID());
}
else
{
@@ -394,8 +389,7 @@
// If there are no backends to archive, then print an error and exit.
if (backendsToArchive.isEmpty())
{
- LocalizableMessage message = WARN_BACKUPDB_NO_BACKENDS_TO_ARCHIVE.get();
- logError(message);
+ logger.warn(WARN_BACKUPDB_NO_BACKENDS_TO_ARCHIVE);
return false;
}
@@ -435,26 +429,20 @@
// backend
if (! backupDir.getConfigEntryDN().equals(cfg.dn()))
{
- LocalizableMessage message = ERR_BACKUPDB_CANNOT_BACKUP_IN_DIRECTORY.get(
- b.getBackendID(),backupLocation.getPath(),
+ logger.error(ERR_BACKUPDB_CANNOT_BACKUP_IN_DIRECTORY, b.getBackendID(),backupLocation.getPath(),
backupDir.getConfigEntryDN().rdn().
getAttributeValue(0).toString());
- logError(message);
return false ;
}
}
catch (ConfigException ce)
{
- LocalizableMessage message = ERR_BACKUPDB_CANNOT_PARSE_BACKUP_DESCRIPTOR.get(
- descriptorPath, ce.getMessage());
- logError(message);
+ logger.error(ERR_BACKUPDB_CANNOT_PARSE_BACKUP_DESCRIPTOR, descriptorPath, ce.getMessage());
return false;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_BACKUPDB_CANNOT_PARSE_BACKUP_DESCRIPTOR.get(
- descriptorPath, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_BACKUPDB_CANNOT_PARSE_BACKUP_DESCRIPTOR, descriptorPath, getExceptionMessage(e));
return false;
}
}
@@ -471,9 +459,7 @@
}
catch (Exception e)
{
- LocalizableMessage message = ERR_BACKUPDB_CANNOT_CREATE_BACKUP_DIR.get(
- backupLocation.getPath(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_BACKUPDB_CANNOT_CREATE_BACKUP_DIR, backupLocation.getPath(), getExceptionMessage(e));
return false;
}
@@ -502,17 +488,13 @@
catch (DirectoryException de)
{
DirectoryServer.notifyBackupEnded(b, backupConfig, false);
- LocalizableMessage message = ERR_BACKUPDB_ERROR_DURING_BACKUP.get(
- b.getBackendID(), de.getMessageObject());
- logError(message);
+ logger.error(ERR_BACKUPDB_ERROR_DURING_BACKUP, b.getBackendID(), de.getMessageObject());
return false;
}
catch (Exception e)
{
DirectoryServer.notifyBackupEnded(b, backupConfig, false);
- LocalizableMessage message = ERR_BACKUPDB_ERROR_DURING_BACKUP.get(
- b.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_BACKUPDB_ERROR_DURING_BACKUP, b.getBackendID(), getExceptionMessage(e));
return false;
}
@@ -532,17 +514,13 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
{
- LocalizableMessage message = ERR_BACKUPDB_CANNOT_LOCK_BACKEND.get(
- b.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.error(ERR_BACKUPDB_CANNOT_LOCK_BACKEND, b.getBackendID(), String.valueOf(failureReason));
return false;
}
}
catch (Exception e)
{
- LocalizableMessage message = ERR_BACKUPDB_CANNOT_LOCK_BACKEND.get(
- b.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_BACKUPDB_CANNOT_LOCK_BACKEND, b.getBackendID(), getExceptionMessage(e));
return false;
}
@@ -562,17 +540,13 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- LocalizableMessage message = WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND.get(
- b.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), String.valueOf(failureReason));
return false;
}
}
catch (Exception e)
{
- LocalizableMessage message = WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND.get(
- b.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), getExceptionMessage(e));
return false;
}
@@ -650,8 +624,7 @@
try
{
- LocalizableMessage message = NOTE_BACKUPDB_STARTING_BACKUP.get(b.getBackendID());
- logError(message);
+ logger.info(NOTE_BACKUPDB_STARTING_BACKUP, b.getBackendID());
// Get the path to the directory to use for this backup. If we will be
@@ -691,20 +664,17 @@
// completed at least for one of the backends.
if (errorsEncountered)
{
- LocalizableMessage message = NOTE_BACKUPDB_COMPLETED_WITH_ERRORS.get();
- logError(message);
+ logger.info(NOTE_BACKUPDB_COMPLETED_WITH_ERRORS);
return TaskState.STOPPED_BY_ERROR;
}
else if (isCancelled())
{
- LocalizableMessage message = NOTE_BACKUPDB_CANCELLED.get();
- logError(message);
+ logger.info(NOTE_BACKUPDB_CANCELLED);
return getTaskInterruptState();
}
else
{
- LocalizableMessage message = NOTE_BACKUPDB_COMPLETED_SUCCESSFULLY.get();
- logError(message);
+ logger.info(NOTE_BACKUPDB_COMPLETED_SUCCESSFULLY);
return TaskState.COMPLETED_SUCCESSFULLY;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/DisconnectClientTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/DisconnectClientTask.java
index 7e8e4ff..c578259 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/DisconnectClientTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/DisconnectClientTask.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.tasks;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -59,6 +60,9 @@
public class DisconnectClientTask
extends Task
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// Indicates whether to send a notification message to the client.
private boolean notifyClient;
@@ -217,10 +221,7 @@
// terminate it.
if (clientConnection == null)
{
- LocalizableMessage message =
- ERR_TASK_DISCONNECT_NO_SUCH_CONNECTION.get(
- String.valueOf(connectionID));
- logError(message);
+ logger.error(ERR_TASK_DISCONNECT_NO_SUCH_CONNECTION, String.valueOf(connectionID));
return TaskState.COMPLETED_WITH_ERRORS;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/ExportTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/ExportTask.java
index 32c0a9e..08ad7dc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/ExportTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/ExportTask.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.tasks;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.messages.TaskMessages;
import static org.opends.server.core.DirectoryServer.getAttributeType;
@@ -65,6 +66,9 @@
public class ExportTask extends Task
{
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
+
/**
* Stores mapping between configuration attribute name and its label.
*/
@@ -372,16 +376,12 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_PARSE_EXCLUDE_FILTER.get(
- filterString, de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFEXPORT_CANNOT_PARSE_EXCLUDE_FILTER, filterString, de.getMessageObject());
return TaskState.STOPPED_BY_ERROR;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_PARSE_EXCLUDE_FILTER.get(
- filterString, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFEXPORT_CANNOT_PARSE_EXCLUDE_FILTER, filterString, getExceptionMessage(e));
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -403,16 +403,12 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_PARSE_INCLUDE_FILTER.get(
- filterString, de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFEXPORT_CANNOT_PARSE_INCLUDE_FILTER, filterString, de.getMessageObject());
return TaskState.STOPPED_BY_ERROR;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_PARSE_INCLUDE_FILTER.get(
- filterString, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFEXPORT_CANNOT_PARSE_INCLUDE_FILTER, filterString, getExceptionMessage(e));
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -426,14 +422,12 @@
if (backend == null)
{
- LocalizableMessage message = ERR_LDIFEXPORT_NO_BACKENDS_FOR_ID.get(backendID);
- logError(message);
+ logger.error(ERR_LDIFEXPORT_NO_BACKENDS_FOR_ID, backendID);
return TaskState.STOPPED_BY_ERROR;
}
else if (! backend.supportsLDIFExport())
{
- LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_EXPORT_BACKEND.get(backendID);
- logError(message);
+ logger.error(ERR_LDIFEXPORT_CANNOT_EXPORT_BACKEND, backendID);
return TaskState.STOPPED_BY_ERROR;
}
@@ -455,16 +449,12 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_DECODE_EXCLUDE_BASE.get(
- s, de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFEXPORT_CANNOT_DECODE_EXCLUDE_BASE, s, de.getMessageObject());
return TaskState.STOPPED_BY_ERROR;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_DECODE_EXCLUDE_BASE.get(
- s, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFEXPORT_CANNOT_DECODE_EXCLUDE_BASE, s, getExceptionMessage(e));
return TaskState.STOPPED_BY_ERROR;
}
@@ -489,25 +479,19 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE.get(
- s, de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE, s, de.getMessageObject());
return TaskState.STOPPED_BY_ERROR;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE.get(
- s, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE, s, getExceptionMessage(e));
return TaskState.STOPPED_BY_ERROR;
}
if (! Backend.handlesEntry(includeBranch, defaultIncludeBranches,
excludeBranches))
{
- LocalizableMessage message =
- ERR_LDIFEXPORT_INVALID_INCLUDE_BASE.get(s, backendID);
- logError(message);
+ logger.error(ERR_LDIFEXPORT_INVALID_INCLUDE_BASE, s, backendID);
return TaskState.STOPPED_BY_ERROR;
}
@@ -563,17 +547,13 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
{
- LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND.get(
- backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.error(ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
return TaskState.STOPPED_BY_ERROR;
}
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND.get(
- backend.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND, backend.getBackendID(), getExceptionMessage(e));
return TaskState.STOPPED_BY_ERROR;
}
@@ -592,17 +572,13 @@
catch (DirectoryException de)
{
DirectoryServer.notifyExportEnded(backend, exportConfig, false);
- LocalizableMessage message =
- ERR_LDIFEXPORT_ERROR_DURING_EXPORT.get(de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFEXPORT_ERROR_DURING_EXPORT, de.getMessageObject());
return TaskState.STOPPED_BY_ERROR;
}
catch (Exception e)
{
DirectoryServer.notifyExportEnded(backend, exportConfig, false);
- LocalizableMessage message =
- ERR_LDIFEXPORT_ERROR_DURING_EXPORT.get(getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFEXPORT_ERROR_DURING_EXPORT, getExceptionMessage(e));
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -615,17 +591,13 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- LocalizableMessage message = WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND.get(
- backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.warn(WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
return TaskState.COMPLETED_WITH_ERRORS;
}
}
catch (Exception e)
{
- LocalizableMessage message = WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND.get(
- backend.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.warn(WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), getExceptionMessage(e));
return TaskState.COMPLETED_WITH_ERRORS;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java
index 1eb943c..15d0165 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java
@@ -639,9 +639,7 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_PARSE_EXCLUDE_FILTER.get(
- filterString, de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_PARSE_EXCLUDE_FILTER, filterString, de.getMessageObject());
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -656,9 +654,7 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_PARSE_INCLUDE_FILTER.get(
- filterString, de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_PARSE_INCLUDE_FILTER, filterString, de.getMessageObject());
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -681,16 +677,12 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE.get(
- s, de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE, s, de.getMessageObject());
return TaskState.STOPPED_BY_ERROR;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE.get(
- s, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE, s, getExceptionMessage(e));
return TaskState.STOPPED_BY_ERROR;
}
@@ -706,14 +698,12 @@
if (backend == null)
{
- LocalizableMessage message = ERR_LDIFIMPORT_NO_BACKENDS_FOR_ID.get();
- logError(message);
+ logger.error(ERR_LDIFIMPORT_NO_BACKENDS_FOR_ID);
return TaskState.STOPPED_BY_ERROR;
}
else if (! backend.supportsLDIFImport())
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_IMPORT.get(backendID);
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_IMPORT, backendID);
return TaskState.STOPPED_BY_ERROR;
}
// Make sure that if the "backendID" argument was provided, no include
@@ -730,9 +720,7 @@
builder.append(" / ");
builder.append(backend.getBaseDNs()[i].toNormalizedString());
}
- LocalizableMessage message = ERR_LDIFIMPORT_MISSING_CLEAR_BACKEND.get(
- builder.toString(), ATTR_IMPORT_CLEAR_BACKEND);
- logError(message);
+ logger.error(ERR_LDIFIMPORT_MISSING_CLEAR_BACKEND, builder.toString(), ATTR_IMPORT_CLEAR_BACKEND);
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -751,9 +739,8 @@
else if(backend != locatedBackend)
{
// The include branches span across multiple backends.
- LocalizableMessage message = ERR_LDIFIMPORT_INVALID_INCLUDE_BASE.get(
- includeBranch.toNormalizedString(), backend.getBackendID());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_INVALID_INCLUDE_BASE, includeBranch
+ .toNormalizedString(), backend.getBackendID());
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -801,16 +788,12 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_DECODE_EXCLUDE_BASE.get(
- s, de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_DECODE_EXCLUDE_BASE, s, de.getMessageObject());
return TaskState.STOPPED_BY_ERROR;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_DECODE_EXCLUDE_BASE.get(
- s, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_DECODE_EXCLUDE_BASE, s, getExceptionMessage(e));
return TaskState.STOPPED_BY_ERROR;
}
@@ -832,9 +815,7 @@
if (! Backend.handlesEntry(includeBranch, defaultIncludeBranches,
excludeBranches))
{
- LocalizableMessage message = ERR_LDIFIMPORT_INVALID_INCLUDE_BASE.get(
- includeBranch.toNormalizedString(), backend.getBackendID());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_INVALID_INCLUDE_BASE, includeBranch.toNormalizedString(), backend.getBackendID());
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -864,9 +845,7 @@
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_PARSE_TEMPLATE_FILE.get(
- templateFile, e.getMessage());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_PARSE_TEMPLATE_FILE, templateFile, e.getMessage());
return TaskState.STOPPED_BY_ERROR;
}
@@ -918,9 +897,7 @@
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_OPEN_REJECTS_FILE.get(
- rejectFile, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_OPEN_REJECTS_FILE, rejectFile, getExceptionMessage(e));
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -942,9 +919,7 @@
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_OPEN_SKIP_FILE.get(
- skipFile, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_OPEN_SKIP_FILE, skipFile, getExceptionMessage(e));
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -968,7 +943,7 @@
{
logger.traceException(e);
- logError(e.getMessageObject());
+ logger.error(e.getMessageObject());
return TaskState.STOPPED_BY_ERROR;
}
@@ -982,9 +957,7 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.acquireExclusiveLock(lockFile, failureReason))
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_LOCK_BACKEND.get(
- backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_LOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -992,9 +965,7 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_LOCK_BACKEND.get(
- backend.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_LOCK_BACKEND, backend.getBackendID(), getExceptionMessage(e));
return TaskState.STOPPED_BY_ERROR;
}
@@ -1021,7 +992,7 @@
message = ERR_LDIFIMPORT_ERROR_DURING_IMPORT.get(
de.getMessageObject());
}
- logError(message);
+ logger.error(message);
return TaskState.STOPPED_BY_ERROR;
}
catch (Exception e)
@@ -1029,9 +1000,7 @@
logger.traceException(e);
DirectoryServer.notifyImportEnded(backend, importConfig, false);
- LocalizableMessage message =
- ERR_LDIFIMPORT_ERROR_DURING_IMPORT.get(getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_ERROR_DURING_IMPORT, getExceptionMessage(e));
return TaskState.STOPPED_BY_ERROR;
}
finally
@@ -1043,9 +1012,7 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- LocalizableMessage message = WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND.get(
- backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.warn(WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
return TaskState.COMPLETED_WITH_ERRORS;
}
}
@@ -1053,9 +1020,7 @@
{
logger.traceException(e);
- LocalizableMessage message = WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND.get(
- backend.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.warn(WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), getExceptionMessage(e));
return TaskState.COMPLETED_WITH_ERRORS;
}
@@ -1076,7 +1041,7 @@
{
logger.traceException(e);
- logError(e.getMessageObject());
+ logger.error(e.getMessageObject());
return TaskState.STOPPED_BY_ERROR;
}
DirectoryServer.notifyImportEnded(backend, importConfig, true);
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTargetTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTargetTask.java
index 33a0933..fd597a1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTargetTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTargetTask.java
@@ -126,9 +126,7 @@
logger.traceException(e);
// This log will go to the task log message
- LocalizableMessage message = ERR_TASK_EXECUTE_FAILED.get(
- String.valueOf(getTaskEntryDN()), stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(ERR_TASK_EXECUTE_FAILED, String.valueOf(getTaskEntryDN()), stackTraceToSingleLineString(e));
return TaskState.STOPPED_BY_ERROR;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTask.java
index 187a0ae..430d1ab 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTask.java
@@ -157,14 +157,14 @@
// Error raised at completion time
if (taskCompletionError != null)
- logError(taskCompletionError);
+ logger.error(taskCompletionError);
}
catch(InterruptedException ie) {}
catch(DirectoryException de)
{
// Error raised at submission time
- logError(de.getMessageObject());
+ logger.error(de.getMessageObject());
initState = TaskState.STOPPED_BY_ERROR;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/PurgeConflictsHistoricalTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/PurgeConflictsHistoricalTask.java
index 3fdf526..7e458b0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/PurgeConflictsHistoricalTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/PurgeConflictsHistoricalTask.java
@@ -189,7 +189,7 @@
if (de.getResultCode() != ResultCode.ADMIN_LIMIT_EXCEEDED)
{
// Error raised at submission time
- logError(de.getMessageObject());
+ logger.error(de.getMessageObject());
initState = TaskState.STOPPED_BY_ERROR;
}
else
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/RebuildTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/RebuildTask.java
index 78a7f35..e99344f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/RebuildTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/RebuildTask.java
@@ -173,9 +173,7 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message =
- ERR_CANNOT_DECODE_BASE_DN.get(baseDN, de.getMessageObject());
- logError(message);
+ logger.error(ERR_CANNOT_DECODE_BASE_DN, baseDN, de.getMessageObject());
return TaskState.STOPPED_BY_ERROR;
}
@@ -201,15 +199,13 @@
if (backend == null)
{
- LocalizableMessage message = ERR_NO_BACKENDS_FOR_BASE.get(baseDN);
- logError(message);
+ logger.error(ERR_NO_BACKENDS_FOR_BASE, baseDN);
return TaskState.STOPPED_BY_ERROR;
}
if (!(backend instanceof BackendImpl))
{
- LocalizableMessage message = ERR_REBUILDINDEX_WRONG_BACKEND_TYPE.get();
- logError(message);
+ logger.error(ERR_REBUILDINDEX_WRONG_BACKEND_TYPE);
return TaskState.STOPPED_BY_ERROR;
}
@@ -230,7 +226,7 @@
{
logger.traceException(e);
- logError(e.getMessageObject());
+ logger.error(e.getMessageObject());
return TaskState.STOPPED_BY_ERROR;
}
@@ -238,19 +234,15 @@
{
if (!LockFileManager.acquireExclusiveLock(lockFile, failureReason))
{
- LocalizableMessage message =
- ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND.get(backend
+ logger.error(ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND, backend
.getBackendID(), String.valueOf(failureReason));
- logError(message);
return TaskState.STOPPED_BY_ERROR;
}
}
catch (Exception e)
{
- LocalizableMessage message =
- ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND.get(backend
+ logger.error(ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND, backend
.getBackendID(), getExceptionMessage(e));
- logError(message);
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -261,19 +253,15 @@
{
if (!LockFileManager.acquireSharedLock(lockFile, failureReason))
{
- LocalizableMessage message =
- ERR_REBUILDINDEX_CANNOT_SHARED_LOCK_BACKEND.get(backend
+ logger.error(ERR_REBUILDINDEX_CANNOT_SHARED_LOCK_BACKEND, backend
.getBackendID(), String.valueOf(failureReason));
- logError(message);
return TaskState.STOPPED_BY_ERROR;
}
}
catch (Exception e)
{
- LocalizableMessage message =
- ERR_REBUILDINDEX_CANNOT_SHARED_LOCK_BACKEND.get(backend
+ logger.error(ERR_REBUILDINDEX_CANNOT_SHARED_LOCK_BACKEND, backend
.getBackendID(), getExceptionMessage(e));
- logError(message);
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -293,7 +281,7 @@
LocalizableMessage message =
ERR_REBUILDINDEX_ERROR_DURING_REBUILD.get(e.getMessage());
logger.traceException(e);
- logError(message);
+ logger.error(message);
isBackendNeedToBeEnabled = true;
returnCode = TaskState.STOPPED_BY_ERROR;
}
@@ -301,9 +289,7 @@
{
logger.traceException(e);
- LocalizableMessage message =
- ERR_REBUILDINDEX_ERROR_DURING_REBUILD.get(e.getMessage());
- logError(message);
+ logger.error(ERR_REBUILDINDEX_ERROR_DURING_REBUILD, e.getMessage());
returnCode = TaskState.STOPPED_BY_ERROR;
}
finally
@@ -315,19 +301,15 @@
failureReason = new StringBuilder();
if (!LockFileManager.releaseLock(lockFile, failureReason))
{
- LocalizableMessage message =
- WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND.get(backend
+ logger.warn(WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND, backend
.getBackendID(), String.valueOf(failureReason));
- logError(message);
returnCode = TaskState.COMPLETED_WITH_ERRORS;
}
}
catch (Throwable t)
{
- LocalizableMessage message =
- WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(),
+ logger.warn(WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND, backend.getBackendID(),
getExceptionMessage(t));
- logError(message);
returnCode = TaskState.COMPLETED_WITH_ERRORS;
}
}
@@ -346,7 +328,7 @@
{
logger.traceException(e);
- logError(e.getMessageObject());
+ logger.error(e.getMessageObject());
returnCode = TaskState.STOPPED_BY_ERROR;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/RestoreTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/RestoreTask.java
index b3427e6..5b83014 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/RestoreTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/RestoreTask.java
@@ -175,17 +175,13 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.acquireExclusiveLock(lockFile, failureReason))
{
- LocalizableMessage message = ERR_RESTOREDB_CANNOT_LOCK_BACKEND.get(
- backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.error(ERR_RESTOREDB_CANNOT_LOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
return false;
}
}
catch (Exception e)
{
- LocalizableMessage message = ERR_RESTOREDB_CANNOT_LOCK_BACKEND.get(
- backend.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_RESTOREDB_CANNOT_LOCK_BACKEND, backend.getBackendID(), getExceptionMessage(e));
return false;
}
return true;
@@ -204,17 +200,13 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- LocalizableMessage message = WARN_RESTOREDB_CANNOT_UNLOCK_BACKEND.get(
- backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.warn(WARN_RESTOREDB_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
return false;
}
}
catch (Exception e)
{
- LocalizableMessage message = WARN_RESTOREDB_CANNOT_UNLOCK_BACKEND.get(
- backend.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.warn(WARN_RESTOREDB_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), getExceptionMessage(e));
return false;
}
return true;
@@ -259,9 +251,7 @@
}
catch (Exception e)
{
- LocalizableMessage message = ERR_RESTOREDB_CANNOT_READ_BACKUP_DIRECTORY.get(
- String.valueOf(backupDirectory), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_RESTOREDB_CANNOT_READ_BACKUP_DIRECTORY, String.valueOf(backupDirectory), getExceptionMessage(e));
return TaskState.STOPPED_BY_ERROR;
}
@@ -273,10 +263,7 @@
BackupInfo backupInfo = backupDir.getBackupInfo(backupID);
if (backupInfo == null)
{
- LocalizableMessage message =
- ERR_RESTOREDB_INVALID_BACKUP_ID.get(
- backupID, String.valueOf(backupDirectory));
- logError(message);
+ logger.error(ERR_RESTOREDB_INVALID_BACKUP_ID, backupID, String.valueOf(backupDirectory));
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -285,10 +272,7 @@
BackupInfo latestBackup = backupDir.getLatestBackup();
if (latestBackup == null)
{
- LocalizableMessage message =
- ERR_RESTOREDB_NO_BACKUPS_IN_DIRECTORY.get(
- String.valueOf(backupDirectory));
- logError(message);
+ logger.error(ERR_RESTOREDB_NO_BACKUPS_IN_DIRECTORY, String.valueOf(backupDirectory));
return TaskState.STOPPED_BY_ERROR;
}
else
@@ -309,9 +293,7 @@
catch (ConfigException e)
{
logger.traceException(e);
- LocalizableMessage message = ERR_RESTOREDB_NO_BACKENDS_FOR_DN.get(
- String.valueOf(backupDirectory), configEntryDN.toString());
- logError(message);
+ logger.error(ERR_RESTOREDB_NO_BACKENDS_FOR_DN, String.valueOf(backupDirectory), configEntryDN.toString());
return TaskState.STOPPED_BY_ERROR;
}
@@ -323,9 +305,7 @@
if (! backend.supportsRestore())
{
- LocalizableMessage message =
- ERR_RESTOREDB_CANNOT_RESTORE.get(backend.getBackendID());
- logError(message);
+ logger.error(ERR_RESTOREDB_CANNOT_RESTORE, backend.getBackendID());
return TaskState.STOPPED_BY_ERROR;
}
@@ -348,7 +328,7 @@
{
logger.traceException(e);
- logError(e.getMessageObject());
+ logger.error(e.getMessageObject());
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -371,17 +351,13 @@
catch (DirectoryException de)
{
DirectoryServer.notifyRestoreEnded(backend, restoreConfig, false);
- LocalizableMessage message = ERR_RESTOREDB_ERROR_DURING_BACKUP.get(
- backupID, backupDir.getPath(), de.getMessageObject());
- logError(message);
+ logger.error(ERR_RESTOREDB_ERROR_DURING_BACKUP, backupID, backupDir.getPath(), de.getMessageObject());
errorsEncountered = true;
}
catch (Exception e)
{
DirectoryServer.notifyRestoreEnded(backend, restoreConfig, false);
- LocalizableMessage message = ERR_RESTOREDB_ERROR_DURING_BACKUP.get(
- backupID, backupDir.getPath(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_RESTOREDB_ERROR_DURING_BACKUP, backupID, backupDir.getPath(), getExceptionMessage(e));
errorsEncountered = true;
}
}
@@ -411,7 +387,7 @@
{
logger.traceException(e);
- logError(e.getMessageObject());
+ logger.error(e.getMessageObject());
errorsEncountered = true;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/SetGenerationIdTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/SetGenerationIdTask.java
index 8b35c99..689ae1d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/SetGenerationIdTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/SetGenerationIdTask.java
@@ -133,7 +133,7 @@
}
catch(DirectoryException de)
{
- logError(de.getMessageObject());
+ logger.error(de.getMessageObject());
return TaskState.STOPPED_BY_ERROR;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java b/opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java
index 0dcb46d..90e0cda 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java
@@ -31,7 +31,6 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
import org.opends.server.util.ServerConstants;
@@ -91,16 +90,12 @@
}
catch (ConfigException ce)
{
- LocalizableMessage message = ERR_CANNOT_DETERMINE_BACKEND_ID.get(
- String.valueOf(configEntry.getDN()), ce.getMessage());
- logError(message);
+ logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, String.valueOf(configEntry.getDN()), ce.getMessage());
return null;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_CANNOT_DETERMINE_BACKEND_ID.get(
- String.valueOf(configEntry.getDN()), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, String.valueOf(configEntry.getDN()), getExceptionMessage(e));
return null;
}
}
@@ -124,16 +119,12 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_CANNOT_DECODE_BACKEND_BASE_DN.get(
- DN_BACKEND_BASE, de.getMessageObject());
- logError(message);
+ logger.error(ERR_CANNOT_DECODE_BACKEND_BASE_DN, DN_BACKEND_BASE, de.getMessageObject());
return configEntries;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_CANNOT_DECODE_BACKEND_BASE_DN.get(
- DN_BACKEND_BASE, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_CANNOT_DECODE_BACKEND_BASE_DN, DN_BACKEND_BASE, getExceptionMessage(e));
return configEntries;
}
@@ -144,16 +135,12 @@
}
catch (ConfigException ce)
{
- LocalizableMessage message = ERR_CANNOT_RETRIEVE_BACKEND_BASE_ENTRY.get(
- DN_BACKEND_BASE, ce.getMessage());
- logError(message);
+ logger.error(ERR_CANNOT_RETRIEVE_BACKEND_BASE_ENTRY, DN_BACKEND_BASE, ce.getMessage());
return configEntries;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_CANNOT_RETRIEVE_BACKEND_BASE_ENTRY.get(
- DN_BACKEND_BASE, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_CANNOT_RETRIEVE_BACKEND_BASE_ENTRY, DN_BACKEND_BASE, getExceptionMessage(e));
return configEntries;
}
@@ -186,16 +173,12 @@
}
catch (ConfigException ce)
{
- LocalizableMessage message = ERR_CANNOT_DETERMINE_BACKEND_ID.get(
- String.valueOf(configEntry.getDN()), ce.getMessage());
- logError(message);
+ logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, String.valueOf(configEntry.getDN()), ce.getMessage());
continue;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_CANNOT_DETERMINE_BACKEND_ID.get(
- String.valueOf(configEntry.getDN()), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, String.valueOf(configEntry.getDN()), getExceptionMessage(e));
continue;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java b/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java
index 7a629ee..ed36fb5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java
@@ -27,6 +27,7 @@
package org.opends.server.tools;
import java.io.File;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.io.OutputStream;
import java.io.PrintStream;
import java.text.SimpleDateFormat;
@@ -72,7 +73,6 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.tools.ToolConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -87,6 +87,9 @@
*/
public class BackUpDB extends TaskTool
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* The main method for BackUpDB tool.
*
@@ -777,9 +780,7 @@
{
if (! b.supportsBackup())
{
- LocalizableMessage message =
- WARN_BACKUPDB_BACKUP_NOT_SUPPORTED.get(b.getBackendID());
- logError(message);
+ logger.warn(WARN_BACKUPDB_BACKUP_NOT_SUPPORTED, b.getBackendID());
}
else
{
@@ -794,8 +795,7 @@
{
for (String id : requestedBackends)
{
- LocalizableMessage message = ERR_BACKUPDB_NO_BACKENDS_FOR_ID.get(id);
- logError(message);
+ logger.error(ERR_BACKUPDB_NO_BACKENDS_FOR_ID, id);
}
return 1;
@@ -810,8 +810,7 @@
// If there are no backends to archive, then print an error and exit.
if (backendsToArchive.isEmpty())
{
- LocalizableMessage message = WARN_BACKUPDB_NO_BACKENDS_TO_ARCHIVE.get();
- logError(message);
+ logger.warn(WARN_BACKUPDB_NO_BACKENDS_TO_ARCHIVE);
return 1;
}
@@ -827,25 +826,20 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
{
- LocalizableMessage message = ERR_BACKUPDB_CANNOT_LOCK_BACKEND.get(
- b.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.error(ERR_BACKUPDB_CANNOT_LOCK_BACKEND, b.getBackendID(), String.valueOf(failureReason));
errorsEncountered = true;
continue;
}
}
catch (Exception e)
{
- LocalizableMessage message = ERR_BACKUPDB_CANNOT_LOCK_BACKEND.get(
- b.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_BACKUPDB_CANNOT_LOCK_BACKEND, b.getBackendID(), getExceptionMessage(e));
errorsEncountered = true;
continue;
}
- LocalizableMessage message = NOTE_BACKUPDB_STARTING_BACKUP.get(b.getBackendID());
- logError(message);
+ logger.info(NOTE_BACKUPDB_STARTING_BACKUP, b.getBackendID());
// Get the config entry for this backend.
@@ -886,9 +880,7 @@
}
catch (ConfigException ce)
{
- message = ERR_BACKUPDB_CANNOT_PARSE_BACKUP_DESCRIPTOR.get(
- descriptorPath, ce.getMessage());
- logError(message);
+ logger.error(ERR_BACKUPDB_CANNOT_PARSE_BACKUP_DESCRIPTOR, descriptorPath, ce.getMessage());
errorsEncountered = true;
try
@@ -897,25 +889,19 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- message = WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND.get(
- b.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), String.valueOf(failureReason));
}
}
catch (Exception e)
{
- message = WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND.get(
- b.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), getExceptionMessage(e));
}
continue;
}
catch (Exception e)
{
- message = ERR_BACKUPDB_CANNOT_PARSE_BACKUP_DESCRIPTOR.get(
- descriptorPath, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_BACKUPDB_CANNOT_PARSE_BACKUP_DESCRIPTOR, descriptorPath, getExceptionMessage(e));
errorsEncountered = true;
try
@@ -924,16 +910,12 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- message = WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND.get(
- b.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), String.valueOf(failureReason));
}
}
catch (Exception e2)
{
- message = WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND.get(
- b.getBackendID(), getExceptionMessage(e2));
- logError(message);
+ logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), getExceptionMessage(e2));
}
continue;
@@ -952,9 +934,7 @@
}
catch (Exception e)
{
- message = ERR_BACKUPDB_CANNOT_CREATE_BACKUP_DIR.get(
- backupDirPath, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_BACKUPDB_CANNOT_CREATE_BACKUP_DIR, backupDirPath, getExceptionMessage(e));
errorsEncountered = true;
try
@@ -963,16 +943,12 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- message = WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND.get(
- b.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), String.valueOf(failureReason));
}
}
catch (Exception e2)
{
- message = WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND.get(
- b.getBackendID(), getExceptionMessage(e2));
- logError(message);
+ logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), getExceptionMessage(e2));
}
continue;
@@ -995,9 +971,7 @@
StringBuilder unsupportedReason = new StringBuilder();
if (! b.supportsBackup(backupConfig, unsupportedReason))
{
- message = ERR_BACKUPDB_CANNOT_BACKUP.get(
- b.getBackendID(), unsupportedReason.toString());
- logError(message);
+ logger.error(ERR_BACKUPDB_CANNOT_BACKUP, b.getBackendID(), unsupportedReason.toString());
errorsEncountered = true;
try
@@ -1006,16 +980,12 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- message = WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND.get(
- b.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), String.valueOf(failureReason));
}
}
catch (Exception e2)
{
- message = WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND.get(
- b.getBackendID(), getExceptionMessage(e2));
- logError(message);
+ logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), getExceptionMessage(e2));
}
continue;
@@ -1029,9 +999,7 @@
}
catch (DirectoryException de)
{
- message = ERR_BACKUPDB_ERROR_DURING_BACKUP.get(
- b.getBackendID(), de.getMessageObject());
- logError(message);
+ logger.error(ERR_BACKUPDB_ERROR_DURING_BACKUP, b.getBackendID(), de.getMessageObject());
errorsEncountered = true;
try
@@ -1040,25 +1008,19 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- message = WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND.get(
- b.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), String.valueOf(failureReason));
}
}
catch (Exception e)
{
- message = WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND.get(
- b.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), getExceptionMessage(e));
}
continue;
}
catch (Exception e)
{
- message = ERR_BACKUPDB_ERROR_DURING_BACKUP.get(
- b.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_BACKUPDB_ERROR_DURING_BACKUP, b.getBackendID(), getExceptionMessage(e));
errorsEncountered = true;
try
@@ -1067,16 +1029,12 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- message = WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND.get(
- b.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), String.valueOf(failureReason));
}
}
catch (Exception e2)
{
- message = WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND.get(
- b.getBackendID(), getExceptionMessage(e2));
- logError(message);
+ logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), getExceptionMessage(e2));
}
continue;
@@ -1090,17 +1048,13 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- message = WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND.get(
- b.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), String.valueOf(failureReason));
errorsEncountered = true;
}
}
catch (Exception e)
{
- message = WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND.get(
- b.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), getExceptionMessage(e));
errorsEncountered = true;
}
}
@@ -1111,14 +1065,12 @@
int ret = 0;
if (errorsEncountered)
{
- LocalizableMessage message = NOTE_BACKUPDB_COMPLETED_WITH_ERRORS.get();
- logError(message);
+ logger.info(NOTE_BACKUPDB_COMPLETED_WITH_ERRORS);
ret = 1;
}
else
{
- LocalizableMessage message = NOTE_BACKUPDB_COMPLETED_SUCCESSFULLY.get();
- logError(message);
+ logger.info(NOTE_BACKUPDB_COMPLETED_SUCCESSFULLY);
}
return ret;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/BackendToolUtils.java b/opendj3-server-dev/src/server/org/opends/server/tools/BackendToolUtils.java
index 0aa8b33..d3b3f53 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/BackendToolUtils.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/BackendToolUtils.java
@@ -26,7 +26,7 @@
*/
package org.opends.server.tools;
-import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.Backend;
import org.opends.server.config.ConfigEntry;
@@ -38,7 +38,6 @@
import org.opends.server.core.DirectoryServer;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.ToolMessages.*;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -54,6 +53,9 @@
*/
public class BackendToolUtils
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* Retrieves information about the backends defined in the Directory Server
* configuration.
@@ -81,18 +83,14 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message =
- ERR_CANNOT_DECODE_BACKEND_BASE_DN.get(DN_BACKEND_BASE, de
+ logger.error(ERR_CANNOT_DECODE_BACKEND_BASE_DN, DN_BACKEND_BASE, de
.getMessageObject());
- logError(message);
return 1;
}
catch (Exception e)
{
- LocalizableMessage message =
- ERR_CANNOT_DECODE_BACKEND_BASE_DN.get(DN_BACKEND_BASE,
+ logger.error(ERR_CANNOT_DECODE_BACKEND_BASE_DN, DN_BACKEND_BASE,
getExceptionMessage(e));
- logError(message);
return 1;
}
@@ -103,18 +101,14 @@
}
catch (ConfigException ce)
{
- LocalizableMessage message =
- ERR_CANNOT_RETRIEVE_BACKEND_BASE_ENTRY.get(DN_BACKEND_BASE, ce
+ logger.error(ERR_CANNOT_RETRIEVE_BACKEND_BASE_ENTRY, DN_BACKEND_BASE, ce
.getMessage());
- logError(message);
return 1;
}
catch (Exception e)
{
- LocalizableMessage message =
- ERR_CANNOT_RETRIEVE_BACKEND_BASE_ENTRY.get(DN_BACKEND_BASE,
+ logger.error(ERR_CANNOT_RETRIEVE_BACKEND_BASE_ENTRY, DN_BACKEND_BASE,
getExceptionMessage(e));
- logError(message);
return 1;
}
@@ -146,18 +140,14 @@
}
catch (ConfigException ce)
{
- LocalizableMessage message =
- ERR_CANNOT_DETERMINE_BACKEND_ID.get(String.valueOf(configEntry
+ logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, String.valueOf(configEntry
.getDN()), ce.getMessage());
- logError(message);
return 1;
}
catch (Exception e)
{
- LocalizableMessage message =
- ERR_CANNOT_DETERMINE_BACKEND_ID.get(String.valueOf(configEntry
+ logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, String.valueOf(configEntry
.getDN()), getExceptionMessage(e));
- logError(message);
return 1;
}
@@ -184,18 +174,14 @@
}
catch (ConfigException ce)
{
- LocalizableMessage message =
- ERR_CANNOT_DETERMINE_BACKEND_CLASS.get(String.valueOf(configEntry
+ logger.error(ERR_CANNOT_DETERMINE_BACKEND_CLASS, String.valueOf(configEntry
.getDN()), ce.getMessage());
- logError(message);
return 1;
}
catch (Exception e)
{
- LocalizableMessage message =
- ERR_CANNOT_DETERMINE_BACKEND_CLASS.get(String.valueOf(configEntry
+ logger.error(ERR_CANNOT_DETERMINE_BACKEND_CLASS, String.valueOf(configEntry
.getDN()), getExceptionMessage(e));
- logError(message);
return 1;
}
@@ -206,10 +192,8 @@
}
catch (Exception e)
{
- LocalizableMessage message =
- ERR_CANNOT_LOAD_BACKEND_CLASS.get(backendClassName, String
+ logger.error(ERR_CANNOT_LOAD_BACKEND_CLASS, backendClassName, String
.valueOf(configEntry.getDN()), getExceptionMessage(e));
- logError(message);
return 1;
}
@@ -224,10 +208,8 @@
}
catch (Exception e)
{
- LocalizableMessage message =
- ERR_CANNOT_INSTANTIATE_BACKEND_CLASS.get(backendClassName, String
+ logger.error(ERR_CANNOT_INSTANTIATE_BACKEND_CLASS, backendClassName, String
.valueOf(configEntry.getDN()), getExceptionMessage(e));
- logError(message);
return 1;
}
@@ -245,9 +227,7 @@
(DNConfigAttribute) configEntry.getConfigAttribute(baseDNStub);
if (baseDNAttr == null)
{
- LocalizableMessage message =
- ERR_NO_BASES_FOR_BACKEND.get(String.valueOf(configEntry.getDN()));
- logError(message);
+ logger.error(ERR_NO_BASES_FOR_BACKEND, String.valueOf(configEntry.getDN()));
}
else
{
@@ -256,10 +236,8 @@
}
catch (Exception e)
{
- LocalizableMessage message =
- ERR_CANNOT_DETERMINE_BASES_FOR_BACKEND.get(String
+ logger.error(ERR_CANNOT_DETERMINE_BASES_FOR_BACKEND, String
.valueOf(configEntry.getDN()), getExceptionMessage(e));
- logError(message);
return 1;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java b/opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java
index b53f560..47b2e21 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java
@@ -62,7 +62,6 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
import static org.opends.server.tools.ToolConstants.*;
import static org.opends.server.util.ServerConstants.*;
@@ -909,12 +908,9 @@
backend = (Backend) backendClass.newInstance();
} catch (Exception e) {
logger.traceException(e);
- LocalizableMessage message =
- ERR_CONFIG_BACKEND_CANNOT_INSTANTIATE.get(
- String.valueOf(className),
+ logger.error(ERR_CONFIG_BACKEND_CANNOT_INSTANTIATE, String.valueOf(className),
String.valueOf(backendCfg.dn()),
stackTraceToSingleLineString(e));
- logError(message);
continue;
}
backend.setBackendID(backendID);
@@ -924,23 +920,17 @@
backend.initializeBackend();
} catch (Exception e) {
logger.traceException(e);
- LocalizableMessage message =
- ERR_CONFIG_BACKEND_CANNOT_INITIALIZE.get(
- String.valueOf(className),
+ logger.error(ERR_CONFIG_BACKEND_CANNOT_INITIALIZE, String.valueOf(className),
String.valueOf(backendCfg.dn()),
stackTraceToSingleLineString(e));
- logError(message);
}
try {
DirectoryServer.registerBackend(backend);
} catch (Exception e)
{
logger.traceException(e);
- LocalizableMessage message =
- WARN_CONFIG_BACKEND_CANNOT_REGISTER_BACKEND.get(
- backendCfg.getBackendId(),
+ logger.warn(WARN_CONFIG_BACKEND_CANNOT_REGISTER_BACKEND, backendCfg.getBackendId(),
getExceptionMessage(e));
- logError(message);
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java b/opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java
index 4d9e06c..1f49f5c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java
@@ -27,6 +27,7 @@
package org.opends.server.tools;
import java.io.OutputStream;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.HashSet;
@@ -59,7 +60,6 @@
import org.forgerock.i18n.LocalizableMessage;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;
@@ -78,6 +78,9 @@
*/
public class ExportLDIF extends TaskTool {
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
+
/**
* The main method for ExportLDIF tool.
*
@@ -736,16 +739,12 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_PARSE_EXCLUDE_FILTER.get(
- filterString, de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFEXPORT_CANNOT_PARSE_EXCLUDE_FILTER, filterString, de.getMessageObject());
return 1;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_PARSE_EXCLUDE_FILTER.get(
- filterString, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFEXPORT_CANNOT_PARSE_EXCLUDE_FILTER, filterString, getExceptionMessage(e));
return 1;
}
}
@@ -767,16 +766,12 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_PARSE_INCLUDE_FILTER.get(
- filterString, de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFEXPORT_CANNOT_PARSE_INCLUDE_FILTER, filterString, de.getMessageObject());
return 1;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_PARSE_INCLUDE_FILTER.get(
- filterString, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFEXPORT_CANNOT_PARSE_INCLUDE_FILTER, filterString, getExceptionMessage(e));
return 1;
}
}
@@ -814,25 +809,19 @@
}
else
{
- LocalizableMessage message =
- ERR_LDIFEXPORT_MULTIPLE_BACKENDS_FOR_ID.get(backendID.getValue());
- logError(message);
+ logger.error(ERR_LDIFEXPORT_MULTIPLE_BACKENDS_FOR_ID, backendID.getValue());
return 1;
}
}
if (backend == null)
{
- LocalizableMessage message =
- ERR_LDIFEXPORT_NO_BACKENDS_FOR_ID.get(backendID.getValue());
- logError(message);
+ logger.error(ERR_LDIFEXPORT_NO_BACKENDS_FOR_ID, backendID.getValue());
return 1;
}
else if (! backend.supportsLDIFExport())
{
- LocalizableMessage message =
- ERR_LDIFEXPORT_CANNOT_EXPORT_BACKEND.get(backendID.getValue());
- logError(message);
+ logger.error(ERR_LDIFEXPORT_CANNOT_EXPORT_BACKEND, backendID.getValue());
return 1;
}
@@ -848,16 +837,12 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_DECODE_EXCLUDE_BASE.get(
- s, de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFEXPORT_CANNOT_DECODE_EXCLUDE_BASE, s, de.getMessageObject());
return 1;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_DECODE_EXCLUDE_BASE.get(
- s, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFEXPORT_CANNOT_DECODE_EXCLUDE_BASE, s, getExceptionMessage(e));
return 1;
}
@@ -882,25 +867,19 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE.get(
- s, de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE, s, de.getMessageObject());
return 1;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE.get(
- s, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE, s, getExceptionMessage(e));
return 1;
}
if (! Backend.handlesEntry(includeBranch, defaultIncludeBranches,
excludeBranches))
{
- LocalizableMessage message =
- ERR_LDIFEXPORT_INVALID_INCLUDE_BASE.get(s, backendID.getValue());
- logError(message);
+ logger.error(ERR_LDIFEXPORT_INVALID_INCLUDE_BASE, s, backendID.getValue());
return 1;
}
@@ -947,9 +926,7 @@
}
catch (ArgumentException ae)
{
- LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_DECODE_WRAP_COLUMN_AS_INTEGER.get(
- wrapColumn.getValue());
- logError(message);
+ logger.error(ERR_LDIFEXPORT_CANNOT_DECODE_WRAP_COLUMN_AS_INTEGER, wrapColumn.getValue());
return 1;
}
@@ -966,17 +943,13 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
{
- LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND.get(
- backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.error(ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
return 1;
}
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND.get(
- backend.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND, backend.getBackendID(), getExceptionMessage(e));
return 1;
}
@@ -989,16 +962,12 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message =
- ERR_LDIFEXPORT_ERROR_DURING_EXPORT.get(de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFEXPORT_ERROR_DURING_EXPORT, de.getMessageObject());
errorOccurred = true;
}
catch (Exception e)
{
- LocalizableMessage message =
- ERR_LDIFEXPORT_ERROR_DURING_EXPORT.get(getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFEXPORT_ERROR_DURING_EXPORT, getExceptionMessage(e));
errorOccurred = true;
}
@@ -1010,16 +979,12 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- LocalizableMessage message = WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND.get(
- backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.warn(WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
}
}
catch (Exception e)
{
- LocalizableMessage message = WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND.get(
- backend.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.warn(WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), getExceptionMessage(e));
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java b/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java
index 14b8002..cccd3c5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java
@@ -29,8 +29,8 @@
import static org.opends.messages.ToolMessages.*;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.tools.ToolConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -90,6 +90,9 @@
* server process (e.g., via the tasks interface).
*/
public class ImportLDIF extends TaskTool {
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* The buffer size that should be used when reading data from LDIF.
*/
@@ -1077,16 +1080,12 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_PARSE_EXCLUDE_FILTER.get(
- filterString, de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_PARSE_EXCLUDE_FILTER, filterString, de.getMessageObject());
return 1;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_PARSE_EXCLUDE_FILTER.get(
- filterString, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_PARSE_EXCLUDE_FILTER, filterString, getExceptionMessage(e));
return 1;
}
}
@@ -1108,16 +1107,12 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_PARSE_INCLUDE_FILTER.get(
- filterString, de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_PARSE_INCLUDE_FILTER, filterString, de.getMessageObject());
return 1;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_PARSE_INCLUDE_FILTER.get(
- filterString, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_PARSE_INCLUDE_FILTER, filterString, getExceptionMessage(e));
return 1;
}
}
@@ -1145,16 +1140,12 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE.get(
- s, de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE, s, de.getMessageObject());
return 1;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE.get(
- s, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE, s, getExceptionMessage(e));
return 1;
}
@@ -1214,23 +1205,19 @@
}
else
{
- LocalizableMessage message = ERR_LDIFIMPORT_MULTIPLE_BACKENDS_FOR_ID.get();
- logError(message);
+ logger.error(ERR_LDIFIMPORT_MULTIPLE_BACKENDS_FOR_ID);
return 1;
}
}
if (backend == null)
{
- LocalizableMessage message =
- ERR_LDIFIMPORT_NO_BACKENDS_FOR_ID.get();
- logError(message);
+ logger.error(ERR_LDIFIMPORT_NO_BACKENDS_FOR_ID);
return 1;
}
else if (! backend.supportsLDIFImport())
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_IMPORT.get(backendID.getValue());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_IMPORT, backendID.getValue());
return 1;
}
@@ -1286,16 +1273,12 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_DECODE_EXCLUDE_BASE.get(
- s, de.getMessageObject());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_DECODE_EXCLUDE_BASE, s, de.getMessageObject());
return 1;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_DECODE_EXCLUDE_BASE.get(
- s, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_DECODE_EXCLUDE_BASE, s, getExceptionMessage(e));
return 1;
}
@@ -1317,9 +1300,7 @@
if (! Backend.handlesEntry(includeBranch, defaultIncludeBranches,
excludeBranches))
{
- LocalizableMessage message = ERR_LDIFIMPORT_INVALID_INCLUDE_BASE.get(
- includeBranch.toNormalizedString(), backendID.getValue());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_INVALID_INCLUDE_BASE, includeBranch.toNormalizedString(), backendID.getValue());
return 1;
}
}
@@ -1337,8 +1318,7 @@
File f = new File(pathname);
if (!f.canRead())
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_READ_FILE.get(pathname);
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_READ_FILE, pathname);
badFileCount++;
}
}
@@ -1375,9 +1355,7 @@
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_PARSE_TEMPLATE_FILE.get(
- templateFile.getValue(), e.getMessage());
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_PARSE_TEMPLATE_FILE, templateFile.getValue(), e.getMessage());
return 1;
}
@@ -1409,7 +1387,7 @@
{
LocalizableMessage msg = ERR_LDIFIMPORT_CANNOT_PARSE_THREAD_COUNT.get(
threadCount.getValue(), e.getMessage());
- logError(msg);
+ logger.error(msg);
return 1;
}
@@ -1444,9 +1422,7 @@
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_OPEN_REJECTS_FILE.get(
- rejectFile.getValue(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_OPEN_REJECTS_FILE, rejectFile.getValue(), getExceptionMessage(e));
return 1;
}
}
@@ -1470,9 +1446,7 @@
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_OPEN_SKIP_FILE.get(
- skipFile.getValue(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_OPEN_SKIP_FILE, skipFile.getValue(), getExceptionMessage(e));
return 1;
}
}
@@ -1489,17 +1463,13 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.acquireExclusiveLock(lockFile, failureReason))
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_LOCK_BACKEND.get(
- backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_LOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
return 1;
}
}
catch (Exception e)
{
- LocalizableMessage message = ERR_LDIFIMPORT_CANNOT_LOCK_BACKEND.get(
- backend.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_CANNOT_LOCK_BACKEND, backend.getBackendID(), getExceptionMessage(e));
return 1;
}
@@ -1534,14 +1504,12 @@
{
message = ERR_LDIFIMPORT_ERROR_DURING_IMPORT.get(de.getMessageObject());
}
- logError(message);
+ logger.error(message);
retCode = 1;
}
catch (Exception e)
{
- LocalizableMessage message =
- ERR_LDIFIMPORT_ERROR_DURING_IMPORT.get(getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_LDIFIMPORT_ERROR_DURING_IMPORT, getExceptionMessage(e));
retCode = 1;
}
@@ -1553,17 +1521,13 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- LocalizableMessage message = WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND.get(
- backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.warn(WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
retCode = 1;
}
}
catch (Exception e)
{
- LocalizableMessage message = WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND.get(
- backend.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.warn(WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), getExceptionMessage(e));
retCode = 1;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java b/opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java
index 0d81793..4a74114 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java
@@ -27,10 +27,10 @@
package org.opends.server.tools;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -79,6 +79,9 @@
*/
public class RebuildIndex extends TaskTool
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
private StringArgument configClass = null;
private StringArgument configFile = null;
private StringArgument baseDNString = null;
@@ -365,10 +368,8 @@
}
catch (Exception e)
{
- final LocalizableMessage message =
- ERR_CANNOT_DECODE_BASE_DN.get(dn,
+ logger.error(ERR_CANNOT_DECODE_BASE_DN, dn,
getExceptionMessage(e));
- logError(message);
return false;
}
@@ -379,7 +380,7 @@
}
catch (Exception e)
{
- logError(LocalizableMessage.raw(e.getMessage()));
+ logger.error(LocalizableMessage.raw(e.getMessage()));
return false;
}
@@ -603,19 +604,15 @@
final StringBuilder failureReason = new StringBuilder();
if (!LockFileManager.acquireExclusiveLock(lockFile, failureReason))
{
- final LocalizableMessage message =
- ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND.get(backend
+ logger.error(ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND, backend
.getBackendID(), String.valueOf(failureReason));
- logError(message);
return 1;
}
}
catch (Exception e)
{
- final LocalizableMessage message =
- ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND.get(backend
+ logger.error(ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND, backend
.getBackendID(), getExceptionMessage(e));
- logError(message);
return 1;
}
@@ -626,12 +623,12 @@
}
catch (InitializationException e)
{
- logError(ERR_REBUILDINDEX_ERROR_DURING_REBUILD.get(e.getMessage()));
+ logger.error(ERR_REBUILDINDEX_ERROR_DURING_REBUILD.get(e.getMessage()));
returnCode = 1;
}
catch (Exception e)
{
- logError(ERR_REBUILDINDEX_ERROR_DURING_REBUILD
+ logger.error(ERR_REBUILDINDEX_ERROR_DURING_REBUILD
.get(getExceptionMessage(e)));
returnCode = 1;
}
@@ -644,13 +641,13 @@
final StringBuilder failureReason = new StringBuilder();
if (!LockFileManager.releaseLock(lockFile, failureReason))
{
- logError(WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND.get(backend
+ logger.warn(WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND.get(backend
.getBackendID(), String.valueOf(failureReason)));
}
}
catch (Exception e)
{
- logError(WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND.get(backend
+ logger.error(WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND.get(backend
.getBackendID(), getExceptionMessage(e)));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java b/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java
index aaae67d..7941e85 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.tools;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -61,7 +62,6 @@
import org.opends.server.util.args.LDAPConnectionArgumentParser;
import org.opends.server.util.cli.CLIException;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -79,6 +79,9 @@
* internally within the server process (e.g., via the tasks interface).
*/
public class RestoreDB extends TaskTool {
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* The main method for RestoreDB tool.
*
@@ -484,9 +487,7 @@
}
catch (Exception e)
{
- LocalizableMessage message = ERR_RESTOREDB_CANNOT_READ_BACKUP_DIRECTORY.get(
- backupDirectory.getValue(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_RESTOREDB_CANNOT_READ_BACKUP_DIRECTORY, backupDirectory.getValue(), getExceptionMessage(e));
return 1;
}
@@ -572,9 +573,7 @@
BackupInfo backupInfo = backupDir.getLatestBackup();
if (backupInfo == null)
{
- LocalizableMessage message = ERR_RESTOREDB_NO_BACKUPS_IN_DIRECTORY.get(
- backupDirectory.getValue());
- logError(message);
+ logger.error(ERR_RESTOREDB_NO_BACKUPS_IN_DIRECTORY, backupDirectory.getValue());
return 1;
}
backupID = backupInfo.getBackupID();
@@ -584,15 +583,12 @@
backupInfo = backupDir.getBackupInfo(backupID);
if (backupInfo == null)
{
- LocalizableMessage message = ERR_RESTOREDB_INVALID_BACKUP_ID.get(
- backupID, backupDirectory.getValue());
- logError(message);
+ logger.error(ERR_RESTOREDB_INVALID_BACKUP_ID, backupID, backupDirectory.getValue());
return 1;
}
}
if (backupInfo.isEncrypted() || null != backupInfo.getSignedHash()) {
- LocalizableMessage message = ERR_RESTOREDB_ENCRYPT_OR_SIGN_REQUIRES_ONLINE.get();
- logError(message);
+ logger.error(ERR_RESTOREDB_ENCRYPT_OR_SIGN_REQUIRES_ONLINE);
return 1;
}
}
@@ -626,16 +622,12 @@
if (backend == null)
{
- LocalizableMessage message = ERR_RESTOREDB_NO_BACKENDS_FOR_DN.get(
- backupDirectory.getValue(), configEntryDN.toString());
- logError(message);
+ logger.error(ERR_RESTOREDB_NO_BACKENDS_FOR_DN, backupDirectory.getValue(), configEntryDN.toString());
return 1;
}
else if (! backend.supportsRestore())
{
- LocalizableMessage message =
- ERR_RESTOREDB_CANNOT_RESTORE.get(backend.getBackendID());
- logError(message);
+ logger.error(ERR_RESTOREDB_CANNOT_RESTORE, backend.getBackendID());
return 1;
}
@@ -652,17 +644,13 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.acquireExclusiveLock(lockFile, failureReason))
{
- LocalizableMessage message = ERR_RESTOREDB_CANNOT_LOCK_BACKEND.get(
- backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.error(ERR_RESTOREDB_CANNOT_LOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
return 1;
}
}
catch (Exception e)
{
- LocalizableMessage message = ERR_RESTOREDB_CANNOT_LOCK_BACKEND.get(
- backend.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_RESTOREDB_CANNOT_LOCK_BACKEND, backend.getBackendID(), getExceptionMessage(e));
return 1;
}
@@ -674,15 +662,11 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_RESTOREDB_ERROR_DURING_BACKUP.get(
- backupID, backupDir.getPath(), de.getMessageObject());
- logError(message);
+ logger.error(ERR_RESTOREDB_ERROR_DURING_BACKUP, backupID, backupDir.getPath(), de.getMessageObject());
}
catch (Exception e)
{
- LocalizableMessage message = ERR_RESTOREDB_ERROR_DURING_BACKUP.get(
- backupID, backupDir.getPath(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_RESTOREDB_ERROR_DURING_BACKUP, backupID, backupDir.getPath(), getExceptionMessage(e));
}
@@ -693,16 +677,12 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- LocalizableMessage message = WARN_RESTOREDB_CANNOT_UNLOCK_BACKEND.get(
- backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.warn(WARN_RESTOREDB_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
}
}
catch (Exception e)
{
- LocalizableMessage message = WARN_RESTOREDB_CANNOT_UNLOCK_BACKEND.get(
- backend.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.warn(WARN_RESTOREDB_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), getExceptionMessage(e));
}
return 0;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java b/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java
index b0794ce..82bf1c2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java
@@ -29,6 +29,7 @@
import org.opends.server.api.Backend;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ErrorLogPublisher;
import org.opends.server.api.DebugLogPublisher;
import org.opends.server.backends.jeb.BackendImpl;
@@ -56,7 +57,6 @@
import java.util.ArrayList;
import java.util.List;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.ToolMessages.*;
import org.forgerock.i18n.LocalizableMessage;
@@ -75,6 +75,9 @@
*/
public class VerifyIndex
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* Processes the command-line arguments and invokes the verify process.
*
@@ -395,16 +398,12 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_CANNOT_DECODE_BASE_DN.get(
- baseDNString.getValue(), de.getMessageObject());
- logError(message);
+ logger.error(ERR_CANNOT_DECODE_BASE_DN, baseDNString.getValue(), de.getMessageObject());
return 1;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_CANNOT_DECODE_BASE_DN.get(
- baseDNString.getValue(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_CANNOT_DECODE_BASE_DN, baseDNString.getValue(), getExceptionMessage(e));
return 1;
}
@@ -434,9 +433,7 @@
}
else
{
- LocalizableMessage message =
- ERR_MULTIPLE_BACKENDS_FOR_BASE.get(baseDNString.getValue());
- logError(message);
+ logger.error(ERR_MULTIPLE_BACKENDS_FOR_BASE, baseDNString.getValue());
return 1;
}
break;
@@ -446,15 +443,13 @@
if (backend == null)
{
- LocalizableMessage message = ERR_NO_BACKENDS_FOR_BASE.get(baseDNString.getValue());
- logError(message);
+ logger.error(ERR_NO_BACKENDS_FOR_BASE, baseDNString.getValue());
return 1;
}
if (!(backend instanceof BackendImpl))
{
- LocalizableMessage message = ERR_BACKEND_NO_INDEXING_SUPPORT.get();
- logError(message);
+ logger.error(ERR_BACKEND_NO_INDEXING_SUPPORT);
return 1;
}
@@ -484,17 +479,13 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
{
- LocalizableMessage message = ERR_VERIFYINDEX_CANNOT_LOCK_BACKEND.get(
- backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.error(ERR_VERIFYINDEX_CANNOT_LOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
return 1;
}
}
catch (Exception e)
{
- LocalizableMessage message = ERR_VERIFYINDEX_CANNOT_LOCK_BACKEND.get(
- backend.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_VERIFYINDEX_CANNOT_LOCK_BACKEND, backend.getBackendID(), getExceptionMessage(e));
return 1;
}
@@ -519,9 +510,7 @@
}
catch (Exception e)
{
- LocalizableMessage message = ERR_VERIFYINDEX_ERROR_DURING_VERIFY.get(
- stackTraceToSingleLineString(e));
- logError(message);
+ logger.error(ERR_VERIFYINDEX_ERROR_DURING_VERIFY, stackTraceToSingleLineString(e));
returnCode = 1;
}
@@ -533,16 +522,12 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- LocalizableMessage message = WARN_VERIFYINDEX_CANNOT_UNLOCK_BACKEND.get(
- backend.getBackendID(), String.valueOf(failureReason));
- logError(message);
+ logger.warn(WARN_VERIFYINDEX_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
}
}
catch (Exception e)
{
- LocalizableMessage message = WARN_VERIFYINDEX_CANNOT_UNLOCK_BACKEND.get(
- backend.getBackendID(), getExceptionMessage(e));
- logError(message);
+ logger.warn(WARN_VERIFYINDEX_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), getExceptionMessage(e));
}
return returnCode;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/Entry.java b/opendj3-server-dev/src/server/org/opends/server/types/Entry.java
index e14b8a6..235339c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/Entry.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/Entry.java
@@ -53,7 +53,6 @@
import static org.opends.messages.CoreMessages.*;
import static org.opends.messages.UtilityMessages.*;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.types.ResultCode.*;
import static org.opends.server.util.LDIFWriter.*;
import static org.opends.server.util.ServerConstants.*;
@@ -1852,7 +1851,7 @@
else if (structuralPolicy == AcceptRejectWarn.WARN
&& !multipleOCErrorLogged)
{
- logError(message);
+ logger.error(message);
multipleOCErrorLogged = true;
}
}
@@ -1874,7 +1873,7 @@
}
else if (structuralPolicy == AcceptRejectWarn.WARN)
{
- logError(message);
+ logger.error(message);
}
}
else
@@ -2011,7 +2010,7 @@
}
else if (structuralPolicy == AcceptRejectWarn.WARN)
{
- logError(message);
+ logger.error(message);
}
}
@@ -2163,7 +2162,7 @@
}
else if (structuralPolicy == AcceptRejectWarn.WARN)
{
- logError(message);
+ logger.error(message);
}
}
}
@@ -2188,7 +2187,7 @@
}
else if (structuralPolicy == AcceptRejectWarn.WARN)
{
- logError(message);
+ logger.error(message);
}
}
}
@@ -2237,7 +2236,7 @@
}
else if (structuralPolicy == AcceptRejectWarn.WARN)
{
- logError(message);
+ logger.error(message);
}
}
}
@@ -2261,7 +2260,7 @@
}
else if (structuralPolicy == AcceptRejectWarn.WARN)
{
- logError(message);
+ logger.error(message);
}
}
}
@@ -2343,7 +2342,7 @@
}
else if (structuralPolicy == AcceptRejectWarn.WARN)
{
- logError(message);
+ logger.error(message);
}
}
else
@@ -2365,7 +2364,7 @@
}
else if (structuralPolicy == AcceptRejectWarn.WARN)
{
- logError(message);
+ logger.error(message);
}
}
else
@@ -2399,7 +2398,7 @@
}
else if (structuralPolicy == AcceptRejectWarn.WARN)
{
- logError(message);
+ logger.error(message);
}
}
finally
@@ -2443,7 +2442,7 @@
}
else if (structuralPolicy == AcceptRejectWarn.WARN)
{
- logError(message);
+ logger.error(message);
}
}
else
@@ -2465,7 +2464,7 @@
}
else if (structuralPolicy == AcceptRejectWarn.WARN)
{
- logError(message);
+ logger.error(message);
}
}
else
@@ -2490,7 +2489,7 @@
}
else if (structuralPolicy == AcceptRejectWarn.WARN)
{
- logError(message);
+ logger.error(message);
}
}
finally
@@ -2516,7 +2515,7 @@
}
else if (structuralPolicy == AcceptRejectWarn.WARN)
{
- logError(message);
+ logger.error(message);
}
}
else
@@ -2545,7 +2544,7 @@
}
else if (structuralPolicy == AcceptRejectWarn.WARN)
{
- logError(message);
+ logger.error(message);
}
}
}
@@ -2599,7 +2598,7 @@
}
else if (structuralPolicy == AcceptRejectWarn.WARN)
{
- logError(message);
+ logger.error(message);
}
}
@@ -2628,7 +2627,7 @@
}
else if (structuralPolicy == AcceptRejectWarn.WARN)
{
- logError(message);
+ logger.error(message);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/HostPort.java b/opendj3-server-dev/src/server/org/opends/server/types/HostPort.java
index ead704d..b635820 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/HostPort.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/HostPort.java
@@ -31,11 +31,9 @@
import java.util.HashSet;
import java.util.Set;
-import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
/**
* This class defines a data structure that combines an address and port number,
@@ -313,8 +311,7 @@
catch (UnknownHostException e)
{
// We could not resolve this host name, default to the provided host name
- LocalizableMessage message = ERR_COULD_NOT_SOLVE_HOSTNAME.get(host);
- logError(message);
+ logger.error(ERR_COULD_NOT_SOLVE_HOSTNAME, host);
return host;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/Schema.java b/opendj3-server-dev/src/server/org/opends/server/types/Schema.java
index d64f8be..b552b45 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/Schema.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/Schema.java
@@ -57,7 +57,6 @@
import static org.opends.messages.BackendMessages.*;
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -3516,8 +3515,8 @@
// changes could potentially be sent to the other servers again
// when this server is restarted, which shouldn't hurt anything.
// Still, we should log a warning message.
- logError(ERR_SCHEMA_CANNOT_WRITE_CONCAT_SCHEMA_FILE.get(
- String.valueOf(concatFilePath), getExceptionMessage(e)));
+ logger.error(ERR_SCHEMA_CANNOT_WRITE_CONCAT_SCHEMA_FILE.get(String
+ .valueOf(concatFilePath), getExceptionMessage(e)));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java b/opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java
index ce486d7..0944c52 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java
@@ -46,7 +46,6 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.util.ServerConstants.*;
@@ -2262,10 +2261,8 @@
case UNDEFINED:
return false;
default:
- LocalizableMessage message = ERR_SEARCH_FILTER_INVALID_RESULT_TYPE.
- get(String.valueOf(entry.getName()), toString(),
+ logger.error(ERR_SEARCH_FILTER_INVALID_RESULT_TYPE, String.valueOf(entry.getName()), toString(),
String.valueOf(result));
- logError(message);
return false;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/ExpirationCheckTrustManager.java b/opendj3-server-dev/src/server/org/opends/server/util/ExpirationCheckTrustManager.java
index 602a81c..109e259 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/ExpirationCheckTrustManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/ExpirationCheckTrustManager.java
@@ -29,6 +29,7 @@
import java.security.cert.CertificateException;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.security.cert.CertificateExpiredException;
import java.security.cert.CertificateNotYetValidException;
import java.security.cert.X509Certificate;
@@ -37,9 +38,7 @@
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.UtilityMessages.*;
-import org.forgerock.i18n.LocalizableMessage;
/**
@@ -55,6 +54,9 @@
public final class ExpirationCheckTrustManager
implements X509TrustManager
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// The trust manager that is wrapped by this trust manager.
private X509TrustManager trustManager;
@@ -98,17 +100,15 @@
}
catch (CertificateExpiredException cee)
{
- LocalizableMessage message = ERR_EXPCHECK_TRUSTMGR_CLIENT_CERT_EXPIRED.get(
- c.getSubjectDN().getName(), String.valueOf(c.getNotAfter()));
- logError(message);
+ logger.error(ERR_EXPCHECK_TRUSTMGR_CLIENT_CERT_EXPIRED, c
+ .getSubjectDN().getName(), String.valueOf(c.getNotAfter()));
throw cee;
}
catch (CertificateNotYetValidException cnyve)
{
- LocalizableMessage message = ERR_EXPCHECK_TRUSTMGR_CLIENT_CERT_NOT_YET_VALID.get(
- c.getSubjectDN().getName(), String.valueOf(c.getNotBefore()));
- logError(message);
+ logger.error(ERR_EXPCHECK_TRUSTMGR_CLIENT_CERT_NOT_YET_VALID, c
+ .getSubjectDN().getName(), String.valueOf(c.getNotBefore()));
throw cnyve;
}
@@ -143,17 +143,15 @@
}
catch (CertificateExpiredException cee)
{
- LocalizableMessage message = ERR_EXPCHECK_TRUSTMGR_SERVER_CERT_EXPIRED.get(
- c.getSubjectDN().getName(), String.valueOf(c.getNotAfter()));
- logError(message);
+ logger.error(ERR_EXPCHECK_TRUSTMGR_SERVER_CERT_EXPIRED, c
+ .getSubjectDN().getName(), String.valueOf(c.getNotAfter()));
throw cee;
}
catch (CertificateNotYetValidException cnyve)
{
- LocalizableMessage message = ERR_EXPCHECK_TRUSTMGR_SERVER_CERT_NOT_YET_VALID.get(
- c.getSubjectDN().getName(), String.valueOf(c.getNotBefore()));
- logError(message);
+ logger.error(ERR_EXPCHECK_TRUSTMGR_SERVER_CERT_NOT_YET_VALID, c
+ .getSubjectDN().getName(), String.valueOf(c.getNotBefore()));
throw cnyve;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java b/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
index ea8034f..412d577 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
@@ -27,7 +27,6 @@
package org.opends.server.util;
import static org.opends.messages.UtilityMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
import static org.forgerock.util.Reject.*;
@@ -1076,8 +1075,7 @@
if (objectClasses.containsKey(objectClass))
{
- logError(WARN_LDIF_DUPLICATE_OBJECTCLASS.get(
- String.valueOf(entryDN), lastEntryLineNumber, ocName));
+ logger.warn(WARN_LDIF_DUPLICATE_OBJECTCLASS.get(String.valueOf(entryDN), lastEntryLineNumber, ocName));
}
else
{
@@ -1128,7 +1126,7 @@
if (DirectoryServer.getSyntaxEnforcementPolicy() ==
AcceptRejectWarn.WARN)
{
- logError(message);
+ logger.error(message);
}
else
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/RuntimeInformation.java b/opendj3-server-dev/src/server/org/opends/server/util/RuntimeInformation.java
index 18c1e59..ce8a3b1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/RuntimeInformation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/RuntimeInformation.java
@@ -22,11 +22,12 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Copyright 2013 ForgeRock AS
+ * Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.util;
import java.io.File;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
import java.net.InetAddress;
@@ -41,7 +42,6 @@
import static org.opends.messages.CoreMessages.*;
import static org.opends.messages.RuntimeMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.DynamicConstants.*;
/**
@@ -50,6 +50,9 @@
*/
public class RuntimeInformation {
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
+
private static boolean is64Bit=false;
@@ -262,35 +265,35 @@
String installDir = toCanonicalPath(DirectoryServer.getServerRoot());
if (installDir == null)
{
- logError(NOTE_UNKNOWN_INSTALL_DIRECTORY.get());
+ logger.info(NOTE_UNKNOWN_INSTALL_DIRECTORY.get());
}
else
{
- logError(NOTE_INSTALL_DIRECTORY.get(installDir));
+ logger.info(NOTE_INSTALL_DIRECTORY.get(installDir));
}
String instanceDir = toCanonicalPath(DirectoryServer.getInstanceRoot());
if (instanceDir == null)
{
- logError(NOTE_UNKNOWN_INSTANCE_DIRECTORY.get());
+ logger.info(NOTE_UNKNOWN_INSTANCE_DIRECTORY.get());
}
else
{
- logError(NOTE_INSTANCE_DIRECTORY.get(instanceDir));
+ logger.info(NOTE_INSTANCE_DIRECTORY.get(instanceDir));
}
- logError(NOTE_JVM_INFO.get(System.getProperty("java.runtime.version"),
+ logger.info(NOTE_JVM_INFO.get(System.getProperty("java.runtime.version"),
System.getProperty("java.vendor"),
getArch(),Runtime.getRuntime().maxMemory()));
long physicalMemorySize = getPhysicalMemorySize();
if (physicalMemorySize != -1)
{
- logError(NOTE_JVM_HOST.get(getHostName(), getOSInfo(),
+ logger.info(NOTE_JVM_HOST.get(getHostName(), getOSInfo(),
physicalMemorySize, Runtime.getRuntime().availableProcessors()));
}
else
{
- logError(NOTE_JVM_HOST_WITH_UNKNOWN_PHYSICAL_MEM.get(getHostName(),
+ logger.info(NOTE_JVM_HOST_WITH_UNKNOWN_PHYSICAL_MEM.get(getHostName(),
getOSInfo(), Runtime.getRuntime().availableProcessors()));
}
- logError(NOTE_JVM_ARGS.get(getInputArguments()));
+ logger.info(NOTE_JVM_ARGS.get(getInputArguments()));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java
index a260d31..a67bad3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java
@@ -52,7 +52,6 @@
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.replication.protocol.StartECLSessionMsg
.ECLRequestType.*;
import static org.opends.server.replication.protocol.StartECLSessionMsg
@@ -747,7 +746,7 @@
// Unable to decode the message - log an error.
logger.traceException(e);
- logError(LocalizableMessage.raw("An exception was encountered while try to encode a "
+ logger.error(LocalizableMessage.raw("An exception was encountered while try to encode a "
+ "replication add message for entry \""
+ addMsg.getDN()
+ "\" into an External Change Log entry: "
@@ -805,7 +804,7 @@
// Unable to decode the message - log an error.
logger.traceException(e);
- logError(LocalizableMessage.raw("An exception was encountered while try to encode a "
+ logger.error(LocalizableMessage.raw("An exception was encountered while try to encode a "
+ "replication modify message for entry \""
+ modifyMsg.getDN()
+ "\" into an External Change Log entry: "
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
index 12df079..12b9776 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
@@ -28,7 +28,6 @@
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -220,7 +219,7 @@
{
logger.traceException(e);
- logError(ERR_ADD_ERROR_NOTIFYING_CHANGE_LISTENER
+ logger.error(ERR_ADD_ERROR_NOTIFYING_CHANGE_LISTENER
.get(getExceptionMessage(e)));
}
}
@@ -294,7 +293,7 @@
}
catch (DirectoryException de)
{
- logError(ERR_ADD_SYNCH_CONFLICT_RESOLUTION_FAILED.get(
+ logger.error(ERR_ADD_SYNCH_CONFLICT_RESOLUTION_FAILED.get(
getConnectionID(), getOperationID(), getExceptionMessage(de)));
throw de;
}
@@ -503,7 +502,7 @@
}
catch (DirectoryException de)
{
- logError(ERR_ADD_SYNCH_PREOP_FAILED.get(getConnectionID(),
+ logger.error(ERR_ADD_SYNCH_PREOP_FAILED.get(getConnectionID(),
getOperationID(), getExceptionMessage(de)));
throw de;
}
@@ -539,7 +538,7 @@
{
logger.traceException(de);
- logError(ERR_ADD_SYNCH_POSTOP_FAILED.get(getConnectionID(),
+ logger.error(ERR_ADD_SYNCH_POSTOP_FAILED.get(getConnectionID(),
getOperationID(), getExceptionMessage(de)));
setResponseData(de);
break;
@@ -1098,7 +1097,7 @@
throw new DirectoryException(
ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
case WARN:
- logError(message);
+ logger.error(message);
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
index 71b0f14..09e9ce0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
@@ -49,7 +49,6 @@
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -1149,13 +1148,13 @@
{
logger.traceException(e);
- logError(cannotProcessAttributeMessage.get(v.getValue().toString(),
+ logger.error(cannotProcessAttributeMessage.get(v.getValue().toString(),
String.valueOf(userEntry.getName())));
}
}
else if (a.size() > 1)
{
- logError(nonUniqueAttributeMessage.get(String
+ logger.error(nonUniqueAttributeMessage.get(String
.valueOf(userEntry.getName())));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java
index c7e0361..122ab46 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java
@@ -27,7 +27,6 @@
package org.opends.server.workflowelement.localbackend;
import static org.opends.messages.CoreMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -205,10 +204,7 @@
{
logger.traceException(e);
- LocalizableMessage message =
- ERR_DELETE_ERROR_NOTIFYING_CHANGE_LISTENER
- .get(getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_DELETE_ERROR_NOTIFYING_CHANGE_LISTENER, getExceptionMessage(e));
}
}
}
@@ -589,8 +585,7 @@
}
} catch (DirectoryException de) {
logger.traceException(de);
- logError(ERR_DELETE_SYNCH_CONFLICT_RESOLUTION_FAILED.get(
- getConnectionID(), getOperationID(),
+ logger.error(ERR_DELETE_SYNCH_CONFLICT_RESOLUTION_FAILED.get(getConnectionID(), getOperationID(),
getExceptionMessage(de)));
setResponseData(de);
return false;
@@ -609,7 +604,7 @@
provider.doPostOperation(this);
} catch (DirectoryException de) {
logger.traceException(de);
- logError(ERR_DELETE_SYNCH_POSTOP_FAILED.get(getConnectionID(),
+ logger.error(ERR_DELETE_SYNCH_POSTOP_FAILED.get(getConnectionID(),
getOperationID(), getExceptionMessage(de)));
setResponseData(de);
return;
@@ -637,7 +632,7 @@
}
} catch (DirectoryException de) {
logger.traceException(de);
- logError(ERR_DELETE_SYNCH_PREOP_FAILED.get(getConnectionID(),
+ logger.error(ERR_DELETE_SYNCH_PREOP_FAILED.get(getConnectionID(),
getOperationID(), getExceptionMessage(de)));
setResponseData(de);
return false;
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
index 0ebb0b0..400575d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
@@ -47,7 +47,6 @@
import org.opends.server.types.operation.PreOperationModifyDNOperation;
import static org.opends.messages.CoreMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -237,10 +236,7 @@
{
logger.traceException(e);
- LocalizableMessage message =
- ERR_MODDN_ERROR_NOTIFYING_CHANGE_LISTENER
- .get(getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_MODDN_ERROR_NOTIFYING_CHANGE_LISTENER, getExceptionMessage(e));
}
}
}
@@ -925,8 +921,7 @@
}
} catch (DirectoryException de) {
logger.traceException(de);
- logError(ERR_MODDN_SYNCH_CONFLICT_RESOLUTION_FAILED.get(
- getConnectionID(), getOperationID(),
+ logger.error(ERR_MODDN_SYNCH_CONFLICT_RESOLUTION_FAILED.get(getConnectionID(), getOperationID(),
getExceptionMessage(de)));
setResponseData(de);
@@ -957,7 +952,7 @@
}
} catch (DirectoryException de) {
logger.traceException(de);
- logError(ERR_MODDN_SYNCH_PREOP_FAILED.get(getConnectionID(),
+ logger.error(ERR_MODDN_SYNCH_PREOP_FAILED.get(getConnectionID(),
getOperationID(), getExceptionMessage(de)));
setResponseData(de);
return false;
@@ -977,7 +972,7 @@
provider.doPostOperation(this);
} catch (DirectoryException de) {
logger.traceException(de);
- logError(ERR_MODDN_SYNCH_POSTOP_FAILED.get(getConnectionID(),
+ logger.error(ERR_MODDN_SYNCH_POSTOP_FAILED.get(getConnectionID(),
getOperationID(), getExceptionMessage(de)));
setResponseData(de);
return;
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java
index e28a6c6..3c1f0d0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java
@@ -28,7 +28,6 @@
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -364,9 +363,7 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_MODIFY_ERROR_NOTIFYING_CHANGE_LISTENER
- .get(getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_MODIFY_ERROR_NOTIFYING_CHANGE_LISTENER, getExceptionMessage(e));
}
}
}
@@ -1432,12 +1429,12 @@
if (!syntax.isHumanReadable() || syntax.isBinary())
{
// Value is not human-readable
- logError(ERR_MODIFY_ADD_INVALID_SYNTAX_NO_VALUE.get(
- String.valueOf(entryDN), attr.getName(), invalidReason));
+ logger.error(ERR_MODIFY_ADD_INVALID_SYNTAX_NO_VALUE.get(String
+ .valueOf(entryDN), attr.getName(), invalidReason));
}
else
{
- logError(ERR_MODIFY_ADD_INVALID_SYNTAX.get(String
+ logger.error(ERR_MODIFY_ADD_INVALID_SYNTAX.get(String
.valueOf(entryDN), attr.getName(), v.getValue().toString(),
invalidReason));
}
@@ -1641,12 +1638,12 @@
if (!syntax.isHumanReadable() || syntax.isBinary())
{
// Value is not human-readable
- logError(ERR_MODIFY_REPLACE_INVALID_SYNTAX_NO_VALUE.get(String
+ logger.error(ERR_MODIFY_REPLACE_INVALID_SYNTAX_NO_VALUE.get(String
.valueOf(entryDN), attr.getName(), invalidReason));
}
else
{
- logError(ERR_MODIFY_REPLACE_INVALID_SYNTAX.get(String
+ logger.error(ERR_MODIFY_REPLACE_INVALID_SYNTAX.get(String
.valueOf(entryDN), attr.getName(), v.getValue().toString(),
invalidReason));
}
@@ -2063,8 +2060,7 @@
}
} catch (DirectoryException de) {
logger.traceException(de);
- logError(ERR_MODIFY_SYNCH_CONFLICT_RESOLUTION_FAILED.get(
- getConnectionID(), getOperationID(),
+ logger.error(ERR_MODIFY_SYNCH_CONFLICT_RESOLUTION_FAILED.get(getConnectionID(), getOperationID(),
getExceptionMessage(de)));
setResponseData(de);
return false;
@@ -2093,7 +2089,7 @@
}
} catch (DirectoryException de) {
logger.traceException(de);
- logError(ERR_MODIFY_SYNCH_PREOP_FAILED.get(getConnectionID(),
+ logger.error(ERR_MODIFY_SYNCH_PREOP_FAILED.get(getConnectionID(),
getOperationID(), getExceptionMessage(de)));
setResponseData(de);
return false;
@@ -2112,7 +2108,7 @@
provider.doPostOperation(this);
} catch (DirectoryException de) {
logger.traceException(de);
- logError(ERR_MODIFY_SYNCH_POSTOP_FAILED.get(getConnectionID(),
+ logger.error(ERR_MODIFY_SYNCH_POSTOP_FAILED.get(getConnectionID(),
getOperationID(), getExceptionMessage(de)));
setResponseData(de);
return;
diff --git a/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java b/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java
index 00aef72..f8d49db 100644
--- a/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java
+++ b/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java
@@ -27,13 +27,9 @@
package org.opends.server.snmp;
import com.sun.management.comm.CommunicatorServer;
+
import java.io.File;
-import org.opends.server.loggers.debug.DebugLogger;
-import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.DebugLogLevel;
-
-import static org.opends.server.loggers.debug.DebugLogger.*;
import com.sun.management.comm.SnmpV3AdaptorServer;
import com.sun.management.snmp.InetAddressAcl;
@@ -43,9 +39,11 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.SortedSet;
+
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.forgerock.i18n.LocalizableMessage;
+
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.admin.std.server.SNMPConnectionHandlerCfg;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;
@@ -54,17 +52,14 @@
import org.forgerock.util.Reject;
import static org.opends.messages.ProtocolMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
/**
* The SNMPClassLoaderProvider.
*/
public class SNMPClassLoaderProvider {
- /**
- * The debug log tracer for this class.
- */
- private static final DebugTracer TRACER = DebugLogger.getTracer();
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* The current configuration state.
*/
@@ -180,9 +175,7 @@
}
}
} catch (Exception ex) {
- if (debugEnabled()) {
- TRACER.debugCaught(DebugLogLevel.ERROR, ex);
- }
+ logger.traceException(ex);
}
// Check if the security file
@@ -262,9 +255,7 @@
this.currentConfig.getTrapsDestination());
if (this.sentTraps == false) {
- LocalizableMessage message =
- ERR_SNMP_CONNHANDLER_NO_VALID_TRAP_DESTINATIONS.get();
- logError(message);
+ logger.error(ERR_SNMP_CONNHANDLER_NO_VALID_TRAP_DESTINATIONS);
} else {
// Send a coldStart SNMP Trap.
this.snmpAdaptor.setTrapPort(snmpTrapPort);
@@ -309,7 +300,7 @@
0,
null);
}
- String[] names = this.snmpAdaptor.getMibs();
+ this.snmpAdaptor.getMibs();
// Stop the SNMP Adaptor
this.snmpAdaptor.stop();
@@ -331,9 +322,7 @@
this.server.unregisterMBean(this.UsmObjName);
}
} catch (Exception ex) {
- if (debugEnabled()) {
- TRACER.debugCaught(DebugLogLevel.ERROR, ex);
- }
+ logger.traceException(ex);
}
}
@@ -367,12 +356,12 @@
engineParameters.activateEncryption();
// Create the UACL controller
- UserAcl uacls = (UserAcl) new SNMPUserAcl(configuration);
+ UserAcl uacls = new SNMPUserAcl(configuration);
engineParameters.setUserAcl(uacls);
// V1/V2 Security parameters
InetAddressAcl acls =
- (InetAddressAcl) new SNMPInetAddressAcl(configuration);
+ new SNMPInetAddressAcl(configuration);
adaptor = new SnmpV3AdaptorServer(engineParameters, null, acls,
configuration.getListenPort(), null);
@@ -382,7 +371,7 @@
return adaptor;
} catch (Exception ex) {
- TRACER.debugError("Could not instanciate the SNMP Adaptor");
+ logger.trace("Could not instanciate the SNMP Adaptor");
return null;
}
}
@@ -397,12 +386,10 @@
boolean found = false;
for (String dest : destinations) {
try {
- InetAddress addr = InetAddress.getByName(dest);
+ InetAddress.getByName(dest);
found = true;
} catch (UnknownHostException ex) {
- LocalizableMessage message = ERR_SNMP_CONNHANDLER_TRAPS_DESTINATION.get(
- dest);
- logError(message);
+ logger.error(ERR_SNMP_CONNHANDLER_TRAPS_DESTINATION, dest);
}
}
return found;
diff --git a/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java b/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java
index d1ffafa..5ff0b84 100644
--- a/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java
+++ b/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java
@@ -34,7 +34,9 @@
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
+
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.ClientConnection;
@@ -42,12 +44,11 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.HostPort;
-
import org.opends.server.admin.std.server.SNMPConnectionHandlerCfg;
-
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.InitializationException;
+
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
@@ -62,6 +63,8 @@
implements ConfigurationChangeListener<SNMPConnectionHandlerCfg>,
AlertGenerator {
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
// Current configuration
SNMPConnectionHandlerCfg currentConfig;
/**
@@ -98,8 +101,7 @@
throws ConfigException, InitializationException {
if (configuration == null) {
- LocalizableMessage message = ERR_SNMP_CONNHANDLER_NO_CONFIGURATION.get();
- logError(message);
+ logger.error(ERR_SNMP_CONNHANDLER_NO_CONFIGURATION);
return;
}
@@ -108,9 +110,8 @@
String jarLocation = this.currentConfig.getOpendmkJarfile();
if ((jarLocation==null) || (jarLocation.length()==0)){
- LocalizableMessage message = ERR_SNMP_CONNHANDLER_NO_OPENDMK_JARFILES.get();
- logError(message);
- return;
+ logger.error(ERR_SNMP_CONNHANDLER_NO_OPENDMK_JARFILES);
+ return;
}
// Get the jarFile Location and test if exists to be able to
@@ -126,10 +127,8 @@
}
if (!fullpathFile.exists()) {
- LocalizableMessage message =
- ERR_SNMP_CONNHANDLER_OPENDMK_JARFILES_DOES_NOT_EXIST.get(
+ logger.error(ERR_SNMP_CONNHANDLER_OPENDMK_JARFILES_DOES_NOT_EXIST,
fullpathFile.getAbsolutePath());
- logError(message);
return;
}
@@ -139,10 +138,8 @@
this.currentConfig.getListenPort()));
if (!this.isOperational(fullpathFile)) {
- LocalizableMessage message =
- ERR_SNMP_CONNHANDLER_OPENDMK_JARFILES_NOT_OPERATIONAL.get(
+ logger.error(ERR_SNMP_CONNHANDLER_OPENDMK_JARFILES_NOT_OPERATIONAL,
fullpathFile.getAbsolutePath());
- logError(message);
return;
}
@@ -154,8 +151,7 @@
this.provider.initializeConnectionHandler(this.currentConfig);
}
catch (Exception ex) {
- LocalizableMessage message = ERR_SNMP_CONNHANDLER_BAD_CONFIGURATION.get();
- logError(message);
+ logger.error(ERR_SNMP_CONNHANDLER_BAD_CONFIGURATION);
return;
}
}
@@ -258,7 +254,6 @@
try {
String url = "jar:" + file.toURI().toURL() + "!/";
URL u = new URL(url);
- Class[] parameters = new Class[]{URL.class};
URLClassLoader sysloader =
(URLClassLoader)ClassLoader.getSystemClassLoader();
Class sysclass = URLClassLoader.class;
diff --git a/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPMonitor.java b/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPMonitor.java
index a45fbb4..47e50b8 100644
--- a/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPMonitor.java
+++ b/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPMonitor.java
@@ -22,14 +22,11 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock Inc.
+ * Portions Copyright 2012-2014 ForgeRock Inc.
*/
package org.opends.server.snmp;
-import com.sun.management.snmp.SnmpStatusException;
import java.security.PrivilegedAction;
-
-
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@@ -38,23 +35,23 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.security.auth.Subject;
-import org.opends.server.loggers.debug.DebugLogger;
-import org.opends.server.loggers.debug.DebugTracer;
+
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.jmx.Credential;
import org.opends.server.protocols.jmx.OpendsJmxPrincipal;
-import org.opends.server.types.DebugLogLevel;
+
+import com.sun.management.snmp.SnmpStatusException;
/**
* The SNMPMonitor Class allows to get a singleton SNMPMonitor object allowing
* to access the JMX cn=monitor MBean.
*/
-public class SNMPMonitor {
+public class SNMPMonitor
+{
- /**
- * Debug Tracer for this class.
- */
- private static final DebugTracer TRACER = DebugLogger.getTracer();
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* Singleton SNMPMonitor object.
*/
@@ -72,38 +69,47 @@
*/
public static ObjectName pattern;
- static {
- try {
- pattern = new ObjectName(
- SNMPConnectionHandlerDefinitions.JMX_DOMAIN +
- "Name=rootDSE,Rdn1=cn-monitor,*");
- } catch (Exception ex) {
- if (DebugLogger.debugEnabled()) {
- TRACER.debugCaught(DebugLogLevel.ERROR, ex);
- }
+ static
+ {
+ try
+ {
+ pattern =
+ new ObjectName(SNMPConnectionHandlerDefinitions.JMX_DOMAIN
+ + "Name=rootDSE,Rdn1=cn-monitor,*");
+ }
+ catch (Exception ex)
+ {
+ logger.traceException(ex);
}
}
/**
* Creates an SNMPMonitor object mapping.
- * @param server to use to the mapping
+ *
+ * @param server
+ * to use to the mapping
*/
- private SNMPMonitor(MBeanServer server) {
+ private SNMPMonitor(MBeanServer server)
+ {
this.server = server;
this.subject = new Subject();
this.subject.getPrincipals().add(new OpendsJmxPrincipal("cn=anonymous"));
InternalClientConnection clientConnection =
- InternalClientConnection.getRootConnection();
+ InternalClientConnection.getRootConnection();
this.subject.getPrivateCredentials().add(new Credential(clientConnection));
}
/**
* Gets the singleton SNMPMonitor object.
- * @param server The server
+ *
+ * @param server
+ * The server
* @return the SNMPMonitor mapping object.
*/
- public static SNMPMonitor getMonitor(MBeanServer server) {
- if (monitor == null) {
+ public static SNMPMonitor getMonitor(MBeanServer server)
+ {
+ if (monitor == null)
+ {
monitor = new SNMPMonitor(server);
}
return monitor;
@@ -111,44 +117,55 @@
/**
* Gets the Connection Handlers Statistics MBean.
- * @return the Set of Connection Handlers Statistics.
- * If Statistics do not exist then an empty Set is returned
+ *
+ * @return the Set of Connection Handlers Statistics. If Statistics do not
+ * exist then an empty Set is returned
*/
- public Set<ObjectName> getConnectionHandlersStatistics() {
+ public Set<ObjectName> getConnectionHandlersStatistics()
+ {
Set<ObjectName> results = new HashSet<ObjectName>();
- try {
+ try
+ {
Set monitorObjects = this.server.queryNames(SNMPMonitor.pattern, null);
- for (Iterator iter = monitorObjects.iterator(); iter.hasNext();) {
+ for (Iterator iter = monitorObjects.iterator(); iter.hasNext();)
+ {
ObjectName name = (ObjectName) iter.next();
- if ((name.getCanonicalName().contains("Connection_Handler")) &&
- (name.getCanonicalName().endsWith("_Statistics"))) {
+ if ((name.getCanonicalName().contains("Connection_Handler"))
+ && (name.getCanonicalName().endsWith("_Statistics")))
+ {
results.add(name);
}
}
- } catch (Exception ex) {
- if (DebugLogger.debugEnabled()) {
- TRACER.debugCaught(DebugLogLevel.ERROR, ex);
- }
+ }
+ catch (Exception ex)
+ {
+ logger.traceException(ex);
}
return results;
}
/**
- * Return the ObjectName of the Connection Handler corresponding to
- * the statistics name.
- * @param statistics ObjectName
+ * Return the ObjectName of the Connection Handler corresponding to the
+ * statistics name.
+ *
+ * @param statistics
+ * ObjectName
* @return the Connection Handler ObjectName, null otherwise
*/
- public ObjectName getConnectionHandler(ObjectName statistics) {
+ public ObjectName getConnectionHandler(ObjectName statistics)
+ {
// Check parameter
- if (statistics == null) {
+ if (statistics == null)
+ {
return null;
}
- try {
+ try
+ {
String value = statistics.getCanonicalName();
- if (!value.endsWith("_Statistics")) {
+ if (!value.endsWith("_Statistics"))
+ {
return null;
}
int index = value.indexOf("_Statistics");
@@ -157,199 +174,256 @@
// Check if the MBean exists
Set query = this.server.queryNames(connectionHandlerName, null);
- if ((query != null) && (!query.isEmpty())) {
+ if ((query != null) && (!query.isEmpty()))
+ {
return connectionHandlerName;
}
- } catch (Exception ex) {
- if (DebugLogger.debugEnabled()) {
- TRACER.debugCaught(DebugLogLevel.ERROR, ex);
- }
+ }
+ catch (Exception ex)
+ {
+ logger.traceException(ex);
}
return null;
}
/**
* Return a Set of Connection Handler ObjectNames.
+ *
* @return the Set of ObjectNames, an empty Set if no connection handlers
*/
- public Set<ObjectName> getConnectionHandlers() {
+ public Set<ObjectName> getConnectionHandlers()
+ {
Set monitorObjects;
Set<ObjectName> results = new HashSet<ObjectName>();
- try {
+ try
+ {
monitorObjects = this.server.queryNames(SNMPMonitor.pattern, null);
- for (Iterator iter = monitorObjects.iterator(); iter.hasNext();) {
+ for (Iterator iter = monitorObjects.iterator(); iter.hasNext();)
+ {
ObjectName name = (ObjectName) iter.next();
- if ((name.getCanonicalName().contains("Connection_Handler")) &&
- (!(name.getCanonicalName().endsWith("_Statistics"))) &&
- (name.getKeyProperty("Rdn3") == null)) {
+ if ((name.getCanonicalName().contains("Connection_Handler"))
+ && (!(name.getCanonicalName().endsWith("_Statistics")))
+ && (name.getKeyProperty("Rdn3") == null))
+ {
results.add(name);
}
}
return results;
- } catch (Exception ex) {
- if (DebugLogger.debugEnabled()) {
- TRACER.debugCaught(DebugLogLevel.ERROR, ex);
- }
- return results;
}
+ catch (Exception ex)
+ {
+ logger.traceException(ex);
+ }
+ return results;
}
/**
* Returns the ObjectName of the Statistics Connection Handler name.
* corresponding to the Connection Handler name
- * @param connectionHandlerName The connection handler name
- * @return the ObjectName of the statistics ObjectName,
- * null if the statistics could not be found
+ *
+ * @param connectionHandlerName
+ * The connection handler name
+ * @return the ObjectName of the statistics ObjectName, null if the statistics
+ * could not be found
*/
public ObjectName getConnectionHandlerStatistics(
- ObjectName connectionHandlerName) {
+ ObjectName connectionHandlerName)
+ {
- if (connectionHandlerName == null) {
+ if (connectionHandlerName == null)
+ {
return null;
}
- try {
+ try
+ {
String value =
- connectionHandlerName.getCanonicalName().concat("_Statistics");
+ connectionHandlerName.getCanonicalName().concat("_Statistics");
ObjectName statistics = new ObjectName(value);
// Check if the MBean exists
Set query = this.server.queryNames(statistics, null);
- if ((query != null) && (!query.isEmpty())) {
+ if ((query != null) && (!query.isEmpty()))
+ {
return statistics;
}
- } catch (Exception ex) {
- if (DebugLogger.debugEnabled()) {
- TRACER.debugCaught(DebugLogLevel.ERROR, ex);
- }
+ }
+ catch (Exception ex)
+ {
+ logger.traceException(ex);
}
return null;
}
/**
* Get the value of the attribute.
- * @param name of Mbean as a String
- * @param attribute to look for
- * @return the value of the attribute, null if the attribute could not
- * be found
+ *
+ * @param name
+ * of Mbean as a String
+ * @param attribute
+ * to look for
+ * @return the value of the attribute, null if the attribute could not be
+ * found
*/
- public Object getAttribute(String name, String attribute) {
- try {
- ObjectName objName = new ObjectName(
- SNMPConnectionHandlerDefinitions.JMX_DOMAIN +
- "Name=" + name);
+ public Object getAttribute(String name, String attribute)
+ {
+ try
+ {
+ ObjectName objName =
+ new ObjectName(SNMPConnectionHandlerDefinitions.JMX_DOMAIN + "Name="
+ + name);
return getAttribute(objName, attribute);
- } catch (Exception ex) {
- if (DebugLogger.debugEnabled()) {
- TRACER.debugCaught(DebugLogLevel.ERROR, ex);
- }
- return null;
}
+ catch (Exception ex)
+ {
+ logger.traceException(ex);
+ }
+ return null;
}
/**
* Gets the value of an attribute.
- * @param name of the Mbean
- * @param attribute to look for
+ *
+ * @param name
+ * of the Mbean
+ * @param attribute
+ * to look for
* @return the value of the attribute, null if the attribute value could not
- * be found
+ * be found
*/
@SuppressWarnings("unchecked")
- public Object getAttribute(final ObjectName name, final String attribute) {
- return Subject.doAs(this.subject, new PrivilegedAction() {
+ public Object getAttribute(final ObjectName name, final String attribute)
+ {
+ return Subject.doAs(this.subject, new PrivilegedAction()
+ {
- public Object run() {
- try {
+ public Object run()
+ {
+ try
+ {
Attribute attr = (Attribute) server.getAttribute(name, attribute);
- if (attr != null) {
+ if (attr != null)
+ {
return attr.getValue();
}
- } catch (Exception ex) {
- if (DebugLogger.debugEnabled()) {
- TRACER.debugCaught(DebugLogLevel.ERROR, ex);
- }
+ }
+ catch (Exception ex)
+ {
+ logger.traceException(ex);
}
return null;
}
- });
+ });
}
- /**
+ /**
* Wrapper for SNMP Byte[].
- * @param s value string
+ *
+ * @param s
+ * value string
* @return a Byte[]
*/
- public static Byte[] string2ByteArray(String s) {
+ public static Byte[] string2ByteArray(String s)
+ {
byte[] b = s.getBytes();
Byte[] barray = new Byte[b.length];
- for (int index=0; index<b.length; index++) {
- barray[index] = new Byte(b[index]);
+ for (int index = 0; index < b.length; index++)
+ {
+ barray[index] = new Byte(b[index]);
}
return barray;
}
-
/**
* Wrapper for SNMP Counter32.
- * @param v value
+ *
+ * @param v
+ * value
* @return a counter32
*/
- public static long counter32Value(long v) {
- if (v > (pow(2, 32) - 1)) {
+ public static long counter32Value(long v)
+ {
+ if (v > (pow(2, 32) - 1))
+ {
return (v % pow(2, 32));
- } else {
+ }
+ else
+ {
return v;
}
}
/**
* Wrapper for SNMP Counter32.
- * @param V Value
+ *
+ * @param V
+ * Value
* @return a Counter32
*/
- public static Long counter32Value(Long V) {
+ public static Long counter32Value(Long V)
+ {
long v = V.longValue();
- if (v > (pow(2, 32) - 1)) {
+ if (v > (pow(2, 32) - 1))
+ {
return new Long(v % pow(2, 32));
- } else {
+ }
+ else
+ {
return V;
}
}
/**
* Latcher for SNMP Gauge32.
- * @param v value
+ *
+ * @param v
+ * value
* @return a gauge32
*/
- public static long gauge32Value(long v) {
- if (v > (pow(2, 32) - 1)) {
+ public static long gauge32Value(long v)
+ {
+ if (v > (pow(2, 32) - 1))
+ {
return (pow(2, 32) - 1);
- } else {
+ }
+ else
+ {
return v;
}
}
/**
* Latcher for SNMP Gauge32.
- * @param V value
+ *
+ * @param V
+ * value
* @return a gauge32
*/
- public static Long gauge32Value(Long V) {
+ public static Long gauge32Value(Long V)
+ {
long v = V.longValue();
- if (v > (pow(2, 32) - 1)) {
+ if (v > (pow(2, 32) - 1))
+ {
return new Long(pow(2, 32) - 1);
- } else {
+ }
+ else
+ {
return V;
}
}
/**
* Checker for SNMP INTEGER.
- * @param V value
+ *
+ * @param V
+ * value
* @return an Integer
- * @throws com.sun.management.snmp.SnmpStatusException If an error occurs
+ * @throws com.sun.management.snmp.SnmpStatusException
+ * If an error occurs
*/
- public static Integer integerValue(Long V) throws SnmpStatusException {
+ public static Integer integerValue(Long V) throws SnmpStatusException
+ {
long v = V.longValue();
- if (v > (pow(2, 31) - 1)) {
+ if (v > (pow(2, 31) - 1))
+ {
throw new SnmpStatusException("Returned intrumented value size too big");
}
Integer ret = new Integer(V.intValue());
@@ -359,16 +433,20 @@
/**
* pow x^y.
*/
- private static long pow(long x, long y) {
+ private static long pow(long x, long y)
+ {
int j = 1;
long k = x;
- if (y == 0) {
+ if (y == 0)
+ {
return 1;
}
- if (y == 1) {
+ if (y == 1)
+ {
return x;
}
- while (j < y) {
+ while (j < y)
+ {
k = k * x;
j++;
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java
index 71f7132..99dc3fa 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java
@@ -29,6 +29,7 @@
import java.io.IOException;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -65,6 +66,9 @@
public class DisconnectClientPlugin
extends DirectoryServerPlugin<PluginCfg>
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* The OID for the disconnect request control, which is used to flag
* operations that should cause the client connection to be terminated.
@@ -762,7 +766,7 @@
}
catch (Exception e)
{
- ErrorLogger.logError(LocalizableMessage.raw("Unable to decode the disconnect client control: " +
+ logger.error(LocalizableMessage.raw("Unable to decode the disconnect client control: " +
e));
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
index d1c35ce..8ca99e6 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
@@ -138,7 +138,7 @@
private void debugInfo(String s)
{
- logError(LocalizableMessage.raw("** TEST **" + s));
+ logger.error(LocalizableMessage.raw("** TEST **" + s));
if (logger.isTraceEnabled())
{
logger.trace("** TEST **" + s);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
index 322dad1..c3ecc3d 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
@@ -114,7 +114,7 @@
private void log(String s)
{
- logError(LocalizableMessage.raw("InitOnLineTests/" + s));
+ logger.error(LocalizableMessage.raw("InitOnLineTests/" + s));
if (logger.isTraceEnabled())
{
logger.trace(s);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
index 791b855..4206566 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
@@ -27,6 +27,7 @@
package org.opends.server.replication;
import java.net.SocketTimeoutException;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.List;
import java.util.NoSuchElementException;
@@ -60,6 +61,9 @@
@SuppressWarnings("javadoc")
public class ProtocolWindowTest extends ReplicationTestCase
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
private static final int WINDOW_SIZE = 10;
private static final int REPLICATION_QUEUE_SIZE = 100;
@@ -86,7 +90,7 @@
@Test(enabled=true, groups="slow")
public void saturateQueueAndRestart() throws Exception
{
- logError(LocalizableMessage.raw("Starting Replication ProtocolWindowTest : saturateAndRestart"));
+ logger.error(LocalizableMessage.raw("Starting Replication ProtocolWindowTest : saturateAndRestart"));
// suffix synchronized
String testName = "protocolWindowTest";
@@ -179,11 +183,11 @@
if (op.getResultCode() != ResultCode.SUCCESS
&& op.getResultCode() != ResultCode.NO_SUCH_OBJECT)
{
- logError(LocalizableMessage.raw("saturateQueueAndRestart: error cleaning config entry: " + dn));
+ logger.error(LocalizableMessage.raw("saturateQueueAndRestart: error cleaning config entry: " + dn));
}
} catch (NoSuchElementException e)
{
- logError(LocalizableMessage.raw("saturateQueueAndRestart: error cleaning config entry: " + dn));
+ logger.error(LocalizableMessage.raw("saturateQueueAndRestart: error cleaning config entry: " + dn));
}
clearChangelogDB(replicationServer);
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
index 47c9a7c..3fbc7df 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
@@ -54,7 +54,7 @@
private void debugInfo(String s)
{
- logError(LocalizableMessage.raw(s));
+ logger.error(LocalizableMessage.raw(s));
if (logger.isTraceEnabled())
{
logger.trace(s);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
index 50e90ef..19f476b 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
@@ -280,7 +280,7 @@
*/
protected void cleanConfigEntries() throws Exception
{
- logError(LocalizableMessage.raw("ReplicationTestCase/Cleaning config entries"));
+ logger.error(LocalizableMessage.raw("ReplicationTestCase/Cleaning config entries"));
for (DN dn : configEntriesToCleanup)
{
@@ -297,7 +297,7 @@
*/
protected void cleanRealEntries() throws Exception
{
- logError(LocalizableMessage.raw("ReplicationTestCase/Cleaning entries"));
+ logger.error(LocalizableMessage.raw("ReplicationTestCase/Cleaning entries"));
for (DN dn : entriesToCleanup)
{
@@ -314,7 +314,7 @@
@AfterClass
public void classCleanUp() throws Exception
{
- logError(LocalizableMessage.raw(" ##### Calling ReplicationTestCase.classCleanUp ##### "));
+ logger.error(LocalizableMessage.raw(" ##### Calling ReplicationTestCase.classCleanUp ##### "));
removeReplicationServerDB();
@@ -341,7 +341,7 @@
*/
protected void paranoiaCheck() throws Exception
{
- logError(LocalizableMessage.raw("Performing paranoia check"));
+ logger.error(LocalizableMessage.raw("Performing paranoia check"));
// Check for config entries for replication server
assertNoConfigEntriesWithFilter("(objectclass=ds-cfg-replication-server)",
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
index 6e9a115..9524860 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
@@ -27,6 +27,7 @@
package org.opends.server.replication;
import java.io.File;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.io.FileInputStream;
import java.util.ArrayList;
import java.util.List;
@@ -58,6 +59,9 @@
public class SchemaReplicationTest extends ReplicationTestCase
{
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
+
private List<Modification> rcvdMods;
private int replServerPort;
@@ -108,7 +112,7 @@
@Test()
public void pushSchemaChange() throws Exception
{
- logError(LocalizableMessage.raw("Starting replication test : pushSchemaChange "));
+ logger.error(LocalizableMessage.raw("Starting replication test : pushSchemaChange "));
cleanUpReplicationServersDB();
@@ -175,7 +179,7 @@
@Test(enabled=true,dependsOnMethods = { "pushSchemaChange" })
public void replaySchemaChange() throws Exception
{
- logError(LocalizableMessage.raw("Starting replication test : replaySchemaChange "));
+ logger.error(LocalizableMessage.raw("Starting replication test : replaySchemaChange "));
cleanUpReplicationServersDB();
@@ -211,7 +215,7 @@
@Test(enabled=true, dependsOnMethods = { "replaySchemaChange" })
public void pushSchemaFilesChange() throws Exception
{
- logError(LocalizableMessage.raw("Starting replication test : pushSchemaFilesChange "));
+ logger.error(LocalizableMessage.raw("Starting replication test : pushSchemaFilesChange "));
cleanUpReplicationServersDB();
@@ -292,6 +296,6 @@
{
broker.stop();
}
- logError(LocalizableMessage.raw("Ending replication test : pushSchemaFilesChange "));
+ logger.error(LocalizableMessage.raw("Ending replication test : pushSchemaFilesChange "));
}
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
index 7cf85dd..bc20f2c 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
@@ -27,6 +27,7 @@
package org.opends.server.replication;
import java.util.LinkedList;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.List;
import org.assertj.core.api.Assertions;
@@ -57,6 +58,9 @@
public class StressTest extends ReplicationTestCase
{
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
+
private static final String REPLICATION_STRESS_TEST =
"Replication Stress Test";
@@ -76,7 +80,7 @@
@Test(enabled=false, groups="slow")
public void fromServertoBroker() throws Exception
{
- logError(LocalizableMessage.raw("Starting replication StressTest : fromServertoBroker"));
+ logger.error(LocalizableMessage.raw("Starting replication StressTest : fromServertoBroker"));
final DN baseDN = DN.valueOf("ou=People," + TEST_ROOT_DN_STRING);
final int TOTAL_MESSAGES = 1000;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
index b1af75c..a4e2614 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
@@ -27,6 +27,7 @@
package org.opends.server.replication;
import java.net.SocketTimeoutException;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -64,6 +65,9 @@
@SuppressWarnings("javadoc")
public class UpdateOperationTest extends ReplicationTestCase
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* An entry with a entryUUID
*/
@@ -266,7 +270,7 @@
public void toggleReceiveStatus() throws Exception
{
testSetUp("toggleReceiveStatus");
- logError(LocalizableMessage.raw("Starting synchronization test : toggleReceiveStatus"));
+ logger.error(LocalizableMessage.raw("Starting synchronization test : toggleReceiveStatus"));
/*
* Open a session to the replicationServer using the broker API.
@@ -327,7 +331,7 @@
public void lostHeartbeatFailover() throws Exception
{
testSetUp("lostHeartbeatFailover");
- logError(LocalizableMessage.raw("Starting replication test : lostHeartbeatFailover"));
+ logger.error(LocalizableMessage.raw("Starting replication test : lostHeartbeatFailover"));
/*
* Open a session to the replicationServer using the broker API.
@@ -536,7 +540,7 @@
public void namingConflicts() throws Exception
{
testSetUp("namingConflicts");
- logError(LocalizableMessage.raw("Starting replication test : namingConflicts"));
+ logger.error(LocalizableMessage.raw("Starting replication test : namingConflicts"));
String resolvedMonitorAttr = "resolved-naming-conflicts";
String unresolvedMonitorAttr = "unresolved-naming-conflicts";
@@ -1104,7 +1108,7 @@
public void updateOperations(boolean assured) throws Exception
{
testSetUp("updateOperations");
- logError(LocalizableMessage.raw("Starting replication test : updateOperations " + assured));
+ logger.error(LocalizableMessage.raw("Starting replication test : updateOperations " + assured));
// Cleanup from previous run
cleanupTest();
@@ -1262,7 +1266,7 @@
public void deleteNoSuchObject() throws Exception
{
testSetUp("deleteNoSuchObject");
- logError(LocalizableMessage.raw("Starting replication test : deleteNoSuchObject"));
+ logger.error(LocalizableMessage.raw("Starting replication test : deleteNoSuchObject"));
DeleteOperation op = connection.processDelete("cn=No Such Object," + baseDN);
assertEquals(op.getResultCode(), ResultCode.NO_SUCH_OBJECT);
@@ -1277,7 +1281,7 @@
public void infiniteReplayLoop() throws Exception
{
testSetUp("infiniteReplayLoop");
- logError(LocalizableMessage.raw("Starting replication test : infiniteReplayLoop"));
+ logger.error(LocalizableMessage.raw("Starting replication test : infiniteReplayLoop"));
int serverId = 11;
ReplicationBroker broker =
@@ -1376,7 +1380,7 @@
public void csnGeneratorAdjust() throws Exception
{
testSetUp("csnGeneratorAdjust");
- logError(LocalizableMessage.raw("Starting synchronization test : CSNGeneratorAdjust"));
+ logger.error(LocalizableMessage.raw("Starting synchronization test : CSNGeneratorAdjust"));
/*
* Open a session to the replicationServer using the broker API.
@@ -1447,7 +1451,7 @@
if (!msgs.isEmpty())
{
- logError(LocalizableMessage.raw("Leftover messages from previous test runs " + msgs));
+ logger.error(LocalizableMessage.raw("Leftover messages from previous test runs " + msgs));
}
}
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
index 7e11a4a..c0159d9 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
@@ -135,7 +135,7 @@
private void debugInfo(String s)
{
- logError(LocalizableMessage.raw(s));
+ logger.error(LocalizableMessage.raw(s));
if (logger.isTraceEnabled())
{
logger.trace("** TEST **" + s);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java
index 47cfd51..f0fac52 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java
@@ -123,7 +123,7 @@
private static String ENTRY_DN2 = "uid=1," + TEST2_ORG_DN_STRING;
private void debugInfo(String s) {
- logError(LocalizableMessage.raw(s));
+ logger.error(LocalizableMessage.raw(s));
if (logger.isTraceEnabled())
{
logger.trace("** TEST **" + s);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java
index 7a12a96..837b232 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java
@@ -69,7 +69,7 @@
private void debugInfo(String s)
{
- logError(LocalizableMessage.raw(s));
+ logger.error(LocalizableMessage.raw(s));
if (logger.isTraceEnabled())
{
logger.trace("** TEST **" + s);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
index 7fd8fae..a1c71ef 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
@@ -27,6 +27,7 @@
package org.opends.server.replication.plugin;
import java.util.LinkedList;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -60,6 +61,9 @@
public class HistoricalCsnOrderingTest extends ReplicationTestCase
{
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
+
private final int serverId = 123;
private SortedSet<String> replServers = new TreeSet<String>();
@@ -125,7 +129,7 @@
final AttributeType histType =
DirectoryServer.getAttributeType(EntryHistorical.HISTORICAL_ATTRIBUTE_NAME);
- logError(LocalizableMessage.raw("Starting replication test : changesCmpTest"));
+ logger.error(LocalizableMessage.raw("Starting replication test : changesCmpTest"));
// Add the first test entry.
TestCaseUtils.addEntry(
@@ -155,7 +159,7 @@
String histValue =
attrs1.get(0).iterator().next().getValue().toString();
- logError(LocalizableMessage.raw("First historical value:" + histValue));
+ logger.error(LocalizableMessage.raw("First historical value:" + histValue));
// Perform a 2nd modification to update the hist attribute with
// a second value
@@ -171,7 +175,7 @@
Assertions.assertThat(attrs2).isNotEmpty();
for (AttributeValue av : attrs2.get(0)) {
- logError(LocalizableMessage.raw("Second historical value:" + av.getValue()));
+ logger.error(LocalizableMessage.raw("Second historical value:" + av.getValue()));
}
LinkedList<ReplicationMsg> opList = new LinkedList<ReplicationMsg>();
@@ -186,7 +190,7 @@
// Build a CSN from the first modification
String hv[] = histValue.split(":");
- logError(LocalizableMessage.raw(hv[1]));
+ logger.error(LocalizableMessage.raw(hv[1]));
CSN fromCSN = new CSN(hv[1]);
opList = new LinkedList<ReplicationMsg>();
@@ -221,7 +225,7 @@
try
{
- logError(LocalizableMessage.raw("Starting replication test : changesCmpTest"));
+ logger.error(LocalizableMessage.raw("Starting replication test : changesCmpTest"));
// Add 3 entries.
DN dnTest1 = DN.valueOf("cn=test1," + baseDN);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java
index 83c0235..a85ba25 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java
@@ -68,7 +68,7 @@
private void debugInfo(String s)
{
- logError(LocalizableMessage.raw(s));
+ logger.error(LocalizableMessage.raw(s));
if (logger.isTraceEnabled())
{
logger.trace("*** TEST *** " + s);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java
index 83f2d11..cb35d83 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java
@@ -68,7 +68,7 @@
private void debugInfo(String s)
{
- logError(LocalizableMessage.raw(s));
+ logger.error(LocalizableMessage.raw(s));
if (logger.isTraceEnabled())
{
logger.trace("** TEST **" + s);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java
index daec47c..830a574 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java
@@ -88,7 +88,7 @@
private void debugInfo(String s)
{
- logError(LocalizableMessage.raw(s));
+ logger.error(LocalizableMessage.raw(s));
if (logger.isTraceEnabled())
{
logger.trace("** TEST **" + s);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TopologyViewTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TopologyViewTest.java
index 29e6497..54f5797 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TopologyViewTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TopologyViewTest.java
@@ -142,7 +142,7 @@
private void debugInfo(String s)
{
- logError(LocalizableMessage.raw(s));
+ logger.error(LocalizableMessage.raw(s));
if (logger.isTraceEnabled())
{
logger.trace("** TEST **" + s);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java
index 87f9405..1bc6b17 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java
@@ -175,7 +175,7 @@
private void debugInfo(String s)
{
- logError(LocalizableMessage.raw(s));
+ logger.error(LocalizableMessage.raw(s));
if (logger.isTraceEnabled())
{
logger.trace("** TEST **" + s);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
index f3329cd..1daa470 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
@@ -85,7 +85,7 @@
private void debugInfo(String s)
{
- logError(LocalizableMessage.raw(s));
+ logger.error(LocalizableMessage.raw(s));
if (logger.isTraceEnabled())
{
logger.trace("** TEST **" + s);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
index adcae9d..a7e80a8 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
@@ -149,7 +149,7 @@
private void debugInfo(String s)
{
- //ErrorLogger.logError(LocalizableMessage.raw("** TEST ** " + s));
+ //logger.error(LocalizableMessage.raw("** TEST ** " + s));
if (logger.isTraceEnabled())
{
logger.trace("** TEST ** " + s);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ComputeBestServerTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ComputeBestServerTest.java
index e9fd21a..93a3959 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ComputeBestServerTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ComputeBestServerTest.java
@@ -76,7 +76,7 @@
private void debugInfo(String s)
{
- logError(LocalizableMessage.raw(s));
+ logger.error(LocalizableMessage.raw(s));
if (logger.isTraceEnabled())
{
logger.trace("** TEST **" + s);
--
Gitblit v1.10.0