mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Nicolas Capponi
28.34.2014 1d5d1a6a4a0a58d6bb4803527dacb6641c027816
Checkpoint commit for OPENDJ-1288 : 
Migrate I18n and logging support to i18n framework and SLF4J

* Replace all DebugTracer usages by LocalizedLogger usage
** No more direct call to DebugTracer
** All debug logging made through #trace or #traceException methods
of LocalizedLogger

* Replace most java.util.Logger usages by LocalizedLogger usage
** java.util.logging classes still used in few places where logging
configuration is needed (handler or level setup)



466 files modified
16458 ■■■■ changed files
opendj3-server-dev/build.xml 6 ●●●● patch | view | raw | blame | history
opendj3-server-dev/replace.rb 84 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/ads/org/opends/admin/ads/ADSContext.java 27 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/ads/org/opends/admin/ads/ServerDescriptor.java 20 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/ads/org/opends/admin/ads/TopologyCache.java 33 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/ads/org/opends/admin/ads/util/ApplicationKeyManager.java 17 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/ads/org/opends/admin/ads/util/ApplicationTrustManager.java 24 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/ads/org/opends/admin/ads/util/ConnectionUtils.java 36 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/ads/org/opends/admin/ads/util/ServerLoader.java 32 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java 30 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/BrowserController.java 15 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java 11 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java 39 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BackupListPanel.java 11 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BackupPanel.java 11 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java 11 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java 11 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java 41 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java 33 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java 11 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java 11 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ApplicationPrintStream.java 11 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigReader.java 11 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ControlPanelLog.java 10 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java 125 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java 109 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java 37 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Application.java 17 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/BuildInformation.java 12 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/CliUserInteraction.java 9 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/CurrentInstallStatus.java 9 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Installation.java 25 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Launcher.java 10 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/QuickSetupCli.java 23 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/QuickSetupLog.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java 92 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java 23 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java 31 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java 25 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/ui/CertificateDialog.java 21 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java 23 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/FileManager.java 21 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java 11 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/OutputReader.java 10 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java 49 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/UIKeyStore.java 36 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java 34 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/webstart/WebStartDownloader.java 11 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/admin/AdministrationConnector.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/admin/AggregationPropertyDefinition.java 16 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/admin/ClassLoaderProvider.java 40 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java 45 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java 20 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigAddListenerAdaptor.java 15 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java 19 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java 15 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/admin/server/DelayedConfigAddListener.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObject.java 34 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagementContext.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java 7 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java 52 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/api/ClientConnection.java 31 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/api/DebugLogPublisher.java 50 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/api/DirectoryThread.java 17 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/api/EntryCache.java 19 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/api/VirtualAttributeProvider.java 58 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java 19 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java 18 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/DNS.java 15 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternDN.java 18 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java 56 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java 56 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/MemoryBackend.java 34 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/MonitorBackend.java 59 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/NullBackend.java 32 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java 53 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java 267 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java 86 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/ApproximateIndexer.java 19 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java 49 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java 186 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java 118 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/ConfigurableEnvironment.java 24 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/DN2ID.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/DN2URI.java 43 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/DatabaseContainer.java 107 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/DbPreloadComparator.java 9 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java 29 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java 77 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EnvManager.java 19 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EqualityIndexer.java 20 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/ExportJob.java 20 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2Entry.java 13 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java 52 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/JECompressedSchema.java 22 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/JebFormat.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/OrderingIndexer.java 20 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java 40 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/SubstringIndexer.java 18 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java 56 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java 302 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/task/RecurringTask.java 34 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/task/Task.java 28 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java 112 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/task/TaskScheduler.java 118 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/task/TaskThread.java 24 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/config/DNConfigAttribute.java 48 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/config/IntegerConfigAttribute.java 33 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java 18 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java 48 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java 18 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/config/StringConfigAttribute.java 18 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/controls/AccountUsableResponseControl.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/controls/EntryChangeNotificationControl.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/controls/EntryChangelogNotificationControl.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/controls/GetEffectiveRightsRequestControl.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java 16 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/controls/LDAPPreReadRequestControl.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/controls/LDAPPreReadResponseControl.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesControl.java 19 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesFilter.java 78 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/controls/PagedResultsControl.java 29 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/controls/PasswordExpiringControl.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/controls/PasswordPolicyResponseControl.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/controls/PersistentSearchControl.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV1Control.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV2Control.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/controls/SubentriesControl.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/AddOperationBasis.java 20 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/AuthenticatedUsers.java 19 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java 128 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/BindOperationBasis.java 20 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/CompareOperationBasis.java 24 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java 49 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/DefaultCompressedSchema.java 30 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/DeleteOperationBasis.java 20 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java 230 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/DirectoryServerShutdownHook.java 11 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java 23 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationBasis.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationConfigManager.java 39 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java 38 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/IdleTimeLimitThread.java 26 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/LockFileManager.java 62 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java 19 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/LogRotationPolicyConfigManager.java 19 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/ModifyDNOperationBasis.java 31 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/ModifyOperationBasis.java 26 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java 36 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java 39 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java 532 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/PersistentSearch.java 78 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java 188 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/SchemaConfigManager.java 208 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/SearchOperationBasis.java 43 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/SubentryManager.java 103 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/SubentryPasswordPolicy.java 13 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java 27 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/UnbindOperationBasis.java 11 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroup.java 25 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupConfigManager.java 30 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java 109 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java 13 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java 16 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/AESPasswordStorageScheme.java 28 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/Base64PasswordStorageScheme.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/BlowfishPasswordStorageScheme.java 28 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java 33 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/CancelExtendedOperation.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java 223 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/DefaultEntryCache.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/DictionaryPasswordValidator.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java 22 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/DiskSpaceMonitor.java 28 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java 23 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java 23 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/FIFOEntryCache.java 64 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java 49 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java 39 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java 113 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java 19 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java 19 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java 55 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/GetConnectionIDExtendedOperation.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java 23 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java 33 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/JMXAlertHandler.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java 90 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java 33 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/MemberVirtualAttributeProvider.java 24 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java 23 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java 43 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java 24 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java 45 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkerThread.java 46 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java 21 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java 86 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java 38 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java 20 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java 43 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/RC4PasswordStorageScheme.java 28 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/RandomPasswordGenerator.java 53 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/SASLContext.java 87 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java 33 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java 110 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java 43 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java 43 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java 43 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java 43 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java 43 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/SimpleStaticGroupMemberList.java 19 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java 18 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java 28 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/TLSByteChannel.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkQueue.java 35 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkerThread.java 46 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/TripleDESPasswordStorageScheme.java 28 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/VirtualStaticGroup.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java 21 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java 23 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java 19 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/loggers/GZIPAction.java 26 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java 45 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/loggers/RotationActionThread.java 20 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java 35 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/loggers/TimeStampNaming.java 15 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/loggers/debug/DebugTracer.java 172 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/loggers/debug/TextDebugLogPublisher.java 106 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/loggers/debug/TraceSettings.java 11 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/monitors/BackendMonitor.java 15 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java 19 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java 15 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/monitors/VersionMonitorProvider.java 10 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/plugins/AttributeCleanupPlugin.java 26 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/plugins/LDAPADListPlugin.java 16 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/plugins/LastModPlugin.java 18 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java 33 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java 49 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java 15 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfileStack.java 15 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfileStackFrame.java 15 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java 19 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfilerThread.java 20 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java 64 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReader.java 10 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1InputStreamReader.java 43 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1OutputStreamWriter.java 83 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilter.java 16 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPClientConnection.java 22 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java 46 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java 12 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java 24 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java 13 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java 18 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java 33 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/jmx/RmiConnector.java 75 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java 9 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/AddResponseProtocolOp.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/BindRequestProtocolOp.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/BindResponseProtocolOp.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java 129 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java 90 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPFilter.java 18 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java 596 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java 79 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java 9 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java 9 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/common/FirstChangeNumberVirtualAttributeProvider.java 7 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/common/LastChangeNumberVirtualAttributeProvider.java 7 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/common/LastCookieVirtualProvider.java 11 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java 13 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java 41 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplayThread.java 16 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/protocol/ErrorMsg.java 14 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/protocol/HeartbeatThread.java 49 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/protocol/Session.java 28 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java 86 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerWriter.java 17 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/LightweightServerHandler.java 16 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/MessageHandler.java 12 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/MonitoringPublisher.java 28 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java 36 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationDomainMonitorData.java 25 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java 64 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java 51 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java 39 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java 19 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/SafeReadExpectedAcksInfo.java 15 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java 49 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/ServerReader.java 33 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/ServerWriter.java 16 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/StatusAnalyzer.java 39 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ChangeNumberIndexer.java 9 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java 12 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java 24 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBCursor.java 11 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java 30 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEUtils.java 11 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java 23 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/service/CTHeartbeatPublisherThread.java 29 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/service/HeartbeatMonitor.java 25 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java 49 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java 133 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java 31 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java 19 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java 18 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java 19 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java 19 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java 43 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java 24 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java 43 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tasks/AddSchemaFileTask.java 38 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java 39 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTargetTask.java 17 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTask.java 17 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tasks/PurgeConflictsHistoricalTask.java 16 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tasks/RebuildTask.java 29 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tasks/RestoreTask.java 24 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tasks/SetGenerationIdTask.java 17 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/ConsoleDebugLogPublisher.java 99 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/DBTest.java 16 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java 26 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/InstallDS.java 69 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/InstallDSArgumentParser.java 15 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java 53 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/LDAPConnection.java 62 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java 44 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java 83 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/LDAPReader.java 26 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java 58 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/LDAPWriter.java 26 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/SSLConnectionFactory.java 31 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/LocalPurgeHistorical.java 17 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java 371 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/status/StatusCli.java 10 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/FileManager.java 21 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeCli.java 41 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeLog.java 10 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java 55 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java 61 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/AbstractOperation.java 19 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/AttributeBuilder.java 59 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/AttributeType.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/AttributeValues.java 31 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/BackupDirectory.java 28 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/BackupInfo.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/ByteString.java 10 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/ByteStringBuilder.java 15 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/DITContentRule.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/DITStructureRule.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/DN.java 31 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/Entry.java 89 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/FilePermission.java 51 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/HostPort.java 7 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/InvokableMethod.java 18 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/LDAPURL.java 33 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/LDIFExportConfig.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/LDIFImportConfig.java 23 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/LockManager.java 22 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/MatchingRuleUse.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/NameForm.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/ObjectClass.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/RDN.java 18 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/RawAttribute.java 28 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/RawFilter.java 100 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/RawModification.java 28 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/Schema.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java 197 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/SortKey.java 18 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/VirtualAttributeRule.java 18 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/util/EMailMessage.java 24 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java 115 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/util/MultiOutputStream.java 35 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java 38 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/util/TimeThread.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/util/cli/ConsoleApplication.java 32 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java 22 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java 50 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLWorkflowElement.java 11 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java 38 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java 33 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java 33 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java 47 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java 50 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java 60 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java 37 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java 17 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java 15 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java 2 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java 11 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java 25 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java 2 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java 2 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java 2 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java 11 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java 11 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java 11 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java 2 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java 11 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java 11 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java 11 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TopologyViewTest.java 11 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java 11 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java 9 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java 11 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java 9 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java 9 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ComputeBestServerTest.java 13 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/build.xml
@@ -785,7 +785,7 @@
          <include name="build-tools.jar" />
        </fileset>
        <fileset dir="${lib.dir}/compile">
          <include name="i18n-core.jar" />
          <include name="*.jar" />
        </fileset>
        <pathelement path="${classes.dir}"/>
      </classpath>
@@ -804,7 +804,7 @@
      <include name="**/org/opends/server/types/OpenDsException.java"/>
      <classpath>
        <fileset dir="${lib.dir}/compile">
            <include name="i18n-core.jar" />
            <include name="*.jar" />
        </fileset>
      </classpath>
    </javac>
@@ -814,7 +814,7 @@
          <include name="build-tools.jar" />
        </fileset>
        <fileset dir="${lib.dir}/compile">
            <include name="i18n-core.jar" />
            <include name="*.jar" />
        </fileset>
        <pathelement path="${classes.dir}"/>
      </classpath>
opendj3-server-dev/replace.rb
@@ -47,33 +47,6 @@
  SNMP_DIR = ["src/snmp/src"]
  DSML_DIR = ["src/dsml/org"]
  # Replacement for messages
  # Modify 1052 files, for a total of 2366 replacements - leaves 10274 compilation errors mostly due to generated messages
  MESSAGES = {
     :dirs => DSML_DIR,
     :extensions => ["java"],
     :stopwords => ['org/opends/messages'],
     :replacements =>
       [
        /import org.opends.messages.(\bMessage(Builder)?(Descriptor)?\b|\*)(\.Arg..?)?;/,
        'import org.forgerock.i18n.Localizable\1\4;',
        /\bMessage\b/,
        'LocalizableMessage',
        /\bMessageBuilder\b/,
        'LocalizableMessageBuilder',
        /\bMessageDescriptor\b/,
        'LocalizableMessageDescriptor',
        /LocalizableMessage.raw\((\n\s+)?Category.\w+,\s+(\n\s+)?Severity.\w+,\s?/,
        'LocalizableMessage.raw(',
        /msg.getDescriptor().equals\((\w)+\)/,
        "msg.resourceName().equals(\\1.resourceName())\n      && msg.ordinal().equals(\\1.ordinal())"
       ]
   }
  # Replacement for types
  TYPES = {
@@ -143,18 +116,18 @@
  # Modify 454 files, for a total of 2427 replacements - leaves 72 compilation errors
  # TODO: add I18N loggers
  LOGGERS = {
    :dirs => JAVA_DIRS,
    :dirs => SNMP_DIR,
    :stopwords => ['src/server/org/opends/server/loggers', 'DebugLogPublisher'],
    :extensions => ["java"],
    :replacements =>
      [
        /import org.opends.server.loggers.debug.DebugTracer;/,
        "import org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;",
        "import org.forgerock.i18n.LocalizableMessage;\nimport org.forgerock.i18n.slf4j.LocalizedLogger;",
        /import java.util.logging.Logger;/,
        "import org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;",
        "import org.forgerock.i18n.LocalizableMessage;\nimport org.forgerock.i18n.slf4j.LocalizedLogger;",
        /import java.util.logging.Level;\n/,
        /import java.util.logging.Level;/,
        '',
        /import org.opends.server.types.DebugLogLevel;\n/,
@@ -164,7 +137,7 @@
        #'',
        /DebugTracer TRACER = (DebugLogger.)?getTracer\(\)/,
        "Logger debugLogger = LoggerFactory.getLogger({CLASSNAME}.class)",
        "LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass()",
        /^\s*\/\*\*\n.*The tracer object for the debug logger.\n\s*\*\/$\n/,
        '',
@@ -173,40 +146,43 @@
        '',
        /if \(debugEnabled\(\)\)\s*{\s* TRACER.debugCaught\(DebugLogLevel.ERROR, (\b.*\b)\);\s*\n\s*}$/,
        'debugLogger.trace("Error", \1);',
        'logger.traceException(\1);',
        /TRACER\.debugCaught\(DebugLogLevel.ERROR, (\b.*\b)\);/,
        'debugLogger.trace("Error", \1);',
        'logger.traceException(\1);',
        /TRACER.debug[^(]+\(/,
        'debugLogger.trace(',
        'logger.trace(',
        /debugLogger.trace\(DebugLogLevel.\b\w+\b, ?/,
        'debugLogger.trace(',
        /logger.trace\(DebugLogLevel.\b\w+\b, ?/,
        'logger.trace(',
        /debugLogger.trace\(e\)/,
        'debugLogger.trace("Error", e)',
        /logger.trace\((e|de)\)/,
        'logger.traceException(\1)',
        /(DebugLogger\.|\b)debugEnabled\(\)/,
        'debugLogger.isTraceEnabled()',
        'logger.isTraceEnabled()',
        /(LOG|logger).log\((Level.)?WARNING, ?/,
        '\1.warn(',
        'logger.warn(',
        /(LOG|logger).log\((Level.)?CONFIG, ?/,
        '\1.info(',
        'logger.info(',
        /(LOG|logger).log\((Level.)?INFO, ?/,
        '\1.debug(',
        'logger.debug(',
        /(LOG|logger).log\((Level.)?SEVERE, ?/,
        '\1.error(',
        'logger.error(',
        /(LOG|logger).log\((Level.)?FINE, ?/,
        '\1.trace(',
        'logger.trace(',
        /Logger.getLogger\((\n\s+)?(\b\w+\b).class.getName\(\)\);/,
        'LoggerFactory.getLogger(\2.class);',
        /logger.(warn|info|error|debug)([^;]+);/,
        'logger.\1(LocalizableMessage.raw\2);',
        /(private static final|static private final) Logger LOG =[^;]+;/,
        'private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();',
      ]
  }
@@ -226,7 +202,7 @@
  }
  # List of replacements to run
  REPLACEMENTS = [ MESSAGES ]
  REPLACEMENTS = [ LOGGERS ]
  #REPLACEMENTS = [ MESSAGES, TYPES, DN_TYPES, EXCEPTIONS, LOGGERS, I18N_LOGGERS ]
@@ -294,16 +270,18 @@
    File.open(message_file).each { |line|
      line = line.chomp
      next if line.size==0 || line[0..0]=="#" || line[0..0]==" " || line[0..0]!=line[0..0].upcase || line[0..5]=="global"
      first, *rest = line.split "_"
      label = rest.join "_"
      token = line.split("=")
      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]
      puts "level #{level}, line #{line}"
      label = first + rest.join("_")
      label = label.gsub("MILD", "").gsub("SEVERE", "").gsub("FATAL", "")
      puts "level #{level}, label #{label}"
    }
  end
end
# Launch all replacements defined in the REPLACEMENTS constant
#Replace.new.messages("src/messages/messages/admin.properties")
Replace.new.run
Replace.new.messages("src/messages/messages/admin.properties")
#Replace.new.run
opendj3-server-dev/src/ads/org/opends/admin/ads/ADSContext.java
@@ -38,8 +38,9 @@
import java.util.HashMap;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.naming.CompositeName;
import javax.naming.InvalidNameException;
@@ -63,7 +64,6 @@
import javax.naming.ldap.LdapContext;
import org.opends.admin.ads.util.ConnectionUtils;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.quicksetup.Constants;
import org.opends.quicksetup.util.Utils;
import org.opends.server.schema.SchemaConstants;
@@ -74,8 +74,7 @@
 */
public class ADSContext
{
  private static final Logger LOG =
    Logger.getLogger(ADSContext.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Enumeration containing the different server properties syntaxes
@@ -876,13 +875,13 @@
            }
            if (!found)
            {
              LOG.log(Level.WARNING, "Could not find public key for "+
                  properties);
              logger.warn(LocalizableMessage.raw("Could not find public key for "+
                  properties));
            }
          }
          catch (NameNotFoundException x)
          {
            LOG.log(Level.WARNING, "Could not find public key for "+properties);
            logger.warn(LocalizableMessage.raw("Could not find public key for "+properties));
          }
          finally
          {
@@ -1272,9 +1271,9 @@
        }
        catch (Exception ex)
        {
          LOG.log(Level.WARNING,
          logger.warn(LocalizableMessage.raw(
              "Error while closing LDAP connection after removing admin data",
              ex);
              ex));
        }
      }
      // Recreate the container entries:
@@ -2223,7 +2222,7 @@
    }
    catch (InvalidNameException x)
    {
      LOG.log(Level.SEVERE, "Error parsing dn "+dn, x);
      logger.error(LocalizableMessage.raw("Error parsing dn "+dn, x));
      throw new ADSContextException(
          ADSContextException.ErrorType.ERROR_UNEXPECTED, x);
    }
@@ -2250,7 +2249,7 @@
    }
    catch (InvalidNameException x)
    {
      LOG.log(Level.SEVERE, "Error parsing rdn "+rdnName, x);
      logger.error(LocalizableMessage.raw("Error parsing rdn "+rdnName, x));
      throw new ADSContextException(
          ADSContextException.ErrorType.ERROR_UNEXPECTED, x);
    }
@@ -2577,8 +2576,8 @@
        }
        catch (Exception ex)
        {
          LOG.log(Level.WARNING,
              "Unexpected error closing enumeration on ADS key pairs", ex);
          logger.warn(LocalizableMessage.raw(
              "Unexpected error closing enumeration on ADS key pairs", ex));
        }
      }
    }
opendj3-server-dev/src/ads/org/opends/admin/ads/ServerDescriptor.java
@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2007-2010 Sun Microsystems, Inc.
 *      Portion Copyright 2013 ForgeRock AS.
 *      Portion Copyright 2013-2014 ForgeRock AS.
 */
package org.opends.admin.ads;
@@ -34,8 +34,9 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.naming.NameNotFoundException;
import javax.naming.NamingEnumeration;
@@ -66,8 +67,7 @@
  private static final String TRUSTSTORE_DN = "cn=ads-truststore";
  private static final Logger LOG =
    Logger.getLogger(ServerDescriptor.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Enumeration containing the different server properties that we can keep in
@@ -566,15 +566,15 @@
            }
            catch (Throwable t)
            {
              LOG.log(Level.WARNING, "Error calculating host port: "+t+" in "+
                  adsProperties, t);
              logger.warn(LocalizableMessage.raw("Error calculating host port: "+t+" in "+
                  adsProperties, t));
            }
            break;
          }
          else
          {
            LOG.log(Level.WARNING, "Value for "+portProp+" is null in "+
                adsProperties);
            logger.warn(LocalizableMessage.raw("Value for "+portProp+" is null in "+
                adsProperties));
          }
        }
      }
@@ -1450,7 +1450,7 @@
    catch (NameNotFoundException nnfe)
    {
      // Ignore
      LOG.log(Level.WARNING, "Error cleaning truststore: "+nnfe, nnfe);
      logger.warn(LocalizableMessage.raw("Error cleaning truststore: "+nnfe, nnfe));
    }
  }
opendj3-server-dev/src/ads/org/opends/admin/ads/TopologyCache.java
@@ -39,8 +39,9 @@
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.naming.NameNotFoundException;
import javax.naming.NamingEnumeration;
@@ -55,7 +56,6 @@
import org.opends.admin.ads.util.ConnectionUtils;
import org.opends.admin.ads.util.PreferredConnection;
import org.opends.admin.ads.util.ServerLoader;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.quicksetup.util.Utils;
/**
@@ -80,8 +80,7 @@
      new LinkedHashSet<PreferredConnection>();
  private final TopologyCacheFilter filter = new TopologyCacheFilter();
  private final static int MULTITHREAD_TIMEOUT = 90 * 1000;
  private static final Logger LOG =
      Logger.getLogger(TopologyCache.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Constructor of the TopologyCache.
@@ -138,8 +137,8 @@
        ServerDescriptor descriptor = loader.getServerDescriptor();
        for (ReplicaDescriptor replica : descriptor.getReplicas())
        {
          LOG.log(Level.INFO, "Handling replica with dn: "
              + replica.getSuffix().getDN());
          logger.debug(LocalizableMessage.raw("Handling replica with dn: "
              + replica.getSuffix().getDN()));
          boolean suffixFound = false;
          LdapName dn = new LdapName(replica.getSuffix().getDN());
@@ -363,7 +362,7 @@
      }
      catch (InterruptedException ie)
      {
        LOG.log(Level.INFO, ie + " caught and ignored", ie);
        logger.debug(LocalizableMessage.raw(ie + " caught and ignored", ie));
      }
      if (t.isAlive())
      {
@@ -372,7 +371,7 @@
    }
    Date endDate = new Date();
    long workingTime = endDate.getTime() - startDate.getTime();
    LOG.log(Level.INFO, "Loading ended at " + workingTime + " ms");
    logger.debug(LocalizableMessage.raw("Loading ended at " + workingTime + " ms"));
  }
  /**
@@ -503,8 +502,8 @@
        }
        catch (Throwable t)
        {
          LOG.log(Level.WARNING, "Unexpected error reading replica ID: " + t,
              t);
          logger.warn(LocalizableMessage.raw("Unexpected error reading replica ID: " + t,
              t));
        }
        for (ReplicaDescriptor replica : candidateReplicas)
@@ -524,8 +523,8 @@
              }
              catch (Throwable t)
              {
                LOG.log(Level.WARNING,
                    "Unexpected error reading age of oldest change: " + t, t);
                logger.warn(LocalizableMessage.raw(
                    "Unexpected error reading age of oldest change: " + t, t));
              }
            }
            s = ConnectionUtils.getFirstValue(sr, "missing-changes");
@@ -537,8 +536,8 @@
              }
              catch (Throwable t)
              {
                LOG.log(Level.WARNING,
                    "Unexpected error reading missing changes: " + t, t);
                logger.warn(LocalizableMessage.raw(
                    "Unexpected error reading missing changes: " + t, t));
              }
            }
            updatedReplicas.add(replica);
@@ -559,8 +558,8 @@
        }
        catch (Throwable t)
        {
          LOG.log(Level.WARNING,
              "Unexpected error closing enumeration on monitor entries" + t, t);
          logger.warn(LocalizableMessage.raw(
              "Unexpected error closing enumeration on monitor entries" + t, t));
        }
      }
      if (ctx != null)
opendj3-server-dev/src/ads/org/opends/admin/ads/util/ApplicationKeyManager.java
@@ -23,6 +23,7 @@
 *
 *      Copyright 2008-2009 Sun Microsystems, Inc.
 *      Portions Copyright 2009 Parametric Technology Corporation (PTC)
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.admin.ads.util;
@@ -36,8 +37,9 @@
import java.security.PrivateKey;
import java.security.UnrecoverableKeyException;
import java.security.cert.X509Certificate;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
@@ -61,8 +63,7 @@
 */
public class ApplicationKeyManager implements X509KeyManager
{
  static private final Logger LOG =
    Logger.getLogger(ApplicationKeyManager.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The default keyManager.
@@ -145,25 +146,25 @@
      {
        // Nothing to do. Maybe we should avoid this and be strict, but we are
        // in a best effor mode.
        LOG.log(Level.WARNING, "Error with the algorithm", e);
        logger.warn(LocalizableMessage.raw("Error with the algorithm", e));
      }
      catch (KeyStoreException e)
      {
        // Nothing to do. Maybe we should avoid this and be strict, but we are
        // in a best effor mode..
        LOG.log(Level.WARNING, "Error with the keystore", e);
        logger.warn(LocalizableMessage.raw("Error with the keystore", e));
      }
      catch (UnrecoverableKeyException e)
      {
        // Nothing to do. Maybe we should avoid this and be strict, but we are
        // in a best effor mode.
        LOG.log(Level.WARNING, "Error with the key", e);
        logger.warn(LocalizableMessage.raw("Error with the key", e));
      }
      catch (NoSuchProviderException e)
      {
        // Nothing to do. Maybe we should avoid this and be strict, but we are
        // in a best effor mode.
        LOG.log(Level.WARNING, "Error with the provider", e);
        logger.warn(LocalizableMessage.raw("Error with the provider", e));
      }
    }
  }
opendj3-server-dev/src/ads/org/opends/admin/ads/util/ApplicationTrustManager.java
@@ -23,7 +23,7 @@
 *
 *      Copyright 2008-2009 Sun Microsystems, Inc.
 *      Portions Copyright 2009 Parametric Technology Corporation (PTC)
 *      Portions Copyright 2011 ForgeRock AS
 *      Portions Copyright 2011-2014 ForgeRock AS
 */
package org.opends.admin.ads.util;
@@ -35,8 +35,9 @@
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.naming.ldap.LdapName;
import javax.naming.ldap.Rdn;
@@ -77,8 +78,7 @@
     */
    HOST_NAME_MISMATCH
  }
  static private final Logger LOG =
    Logger.getLogger(ApplicationTrustManager.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  private X509TrustManager trustManager;
  private String lastRefusedAuthType;
@@ -168,15 +168,15 @@
        }
        catch (NoSuchProviderException e)
        {
          LOG.log(Level.WARNING, "Error with the provider: "+provider, e);
          logger.warn(LocalizableMessage.raw("Error with the provider: "+provider, e));
        }
        catch (NoSuchAlgorithmException e)
        {
          LOG.log(Level.WARNING, "Error with the algorithm: "+algo, e);
          logger.warn(LocalizableMessage.raw("Error with the algorithm: "+algo, e));
        }
        catch (KeyStoreException e)
        {
          LOG.log(Level.WARNING, "Error with the keystore", e);
          logger.warn(LocalizableMessage.raw("Error with the keystore", e));
        }
      }
  }
@@ -422,8 +422,8 @@
        matches = hostMatch(value, host);
        if (!matches)
        {
          LOG.log(Level.WARNING, "Subject DN RDN value is: "+value+
              " and does not match host value: "+host);
          logger.warn(LocalizableMessage.raw("Subject DN RDN value is: "+value+
              " and does not match host value: "+host));
          // Try with the accepted hosts names
          for (int i =0; i<acceptedHosts.size() && !matches; i++)
          {
@@ -441,8 +441,8 @@
      }
      catch (Throwable t)
      {
        LOG.log(Level.WARNING, "Error parsing subject dn: "+
            chain[0].getSubjectX500Principal(), t);
        logger.warn(LocalizableMessage.raw("Error parsing subject dn: "+
            chain[0].getSubjectX500Principal(), t));
      }
      if (!matches)
opendj3-server-dev/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2008-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2012-2013 ForgeRock AS
 *      Portions Copyright 2012-2014 ForgeRock AS
 */
package org.opends.admin.ads.util;
@@ -34,8 +34,9 @@
import java.util.HashSet;
import java.util.Hashtable;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.naming.CommunicationException;
import javax.naming.Context;
@@ -68,8 +69,7 @@
  private static final String STARTTLS_PROPERTY =
    "org.opends.connectionutils.isstarttls";
  static private final Logger LOG =
    Logger.getLogger(ConnectionUtils.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Private constructor: this class cannot be instantiated.
@@ -425,8 +425,8 @@
    catch (NamingException ne)
    {
      // This is really strange.  Seems like a bug somewhere.
      LOG.log(Level.WARNING, "Naming exception getting environment of "+ctx,
          ne);
      logger.warn(LocalizableMessage.raw("Naming exception getting environment of "+ctx,
          ne));
    }
    return s;
  }
@@ -447,7 +447,7 @@
    catch (Throwable t)
    {
      // This is really strange.  Seems like a bug somewhere.
      LOG.log(Level.WARNING, "Error getting host: "+t, t);
      logger.warn(LocalizableMessage.raw("Error getting host: "+t, t));
    }
    return s;
  }
@@ -468,7 +468,7 @@
    catch (Throwable t)
    {
      // This is really strange.  Seems like a bug somewhere.
      LOG.log(Level.WARNING, "Error getting port: "+t, t);
      logger.warn(LocalizableMessage.raw("Error getting port: "+t, t));
    }
    return port;
  }
@@ -500,8 +500,8 @@
    catch (NamingException ne)
    {
      // This is really strange.  Seems like a bug somewhere.
      LOG.log(Level.WARNING, "Naming exception getting environment of "+ctx,
          ne);
      logger.warn(LocalizableMessage.raw("Naming exception getting environment of "+ctx,
          ne));
    }
    return bindDN;
  }
@@ -521,8 +521,8 @@
    catch (NamingException ne)
    {
      // This is really strange.  Seems like a bug somewhere.
      LOG.log(Level.WARNING, "Naming exception getting environment of "+ctx,
          ne);
      logger.warn(LocalizableMessage.raw("Naming exception getting environment of "+ctx,
          ne));
    }
    return bindPwd;
  }
@@ -543,7 +543,7 @@
    catch (Throwable t)
    {
      // This is really strange.  Seems like a bug somewhere.
      LOG.log(Level.WARNING, "Error getting if is SSL "+t, t);
      logger.warn(LocalizableMessage.raw("Error getting if is SSL "+t, t));
    }
    return isSSL;
  }
@@ -565,8 +565,8 @@
    catch (NamingException ne)
    {
      // This is really strange.  Seems like a bug somewhere.
      LOG.log(Level.WARNING, "Naming exception getting environment of "+ctx,
          ne);
      logger.warn(LocalizableMessage.raw("Naming exception getting environment of "+ctx,
          ne));
    }
    return isStartTLS;
  }
@@ -648,8 +648,8 @@
        }
        catch(Exception ex)
        {
          LOG.log(Level.WARNING,
              "Unexpected error closing enumeration on cn=Config entry", ex);
          logger.warn(LocalizableMessage.raw(
              "Unexpected error closing enumeration on cn=Config entry", ex));
        }
      }
      connectedAsAdministrativeUser = true;
opendj3-server-dev/src/ads/org/opends/admin/ads/util/ServerLoader.java
@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2008-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2013 ForgeRock AS.
 *      Portions Copyright 2013-2014 ForgeRock AS.
 */
package org.opends.admin.ads.util;
@@ -30,8 +30,9 @@
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.naming.AuthenticationException;
import javax.naming.NamingException;
@@ -69,8 +70,7 @@
  private final LinkedHashSet<PreferredConnection> preferredLDAPURLs;
  private TopologyCacheFilter filter;
  private static final Logger LOG =
    Logger.getLogger(ServerLoader.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Constructor.
@@ -150,7 +150,7 @@
          TopologyCacheException.Type.TIMEOUT,
          new TimeLimitExceededException("Timeout reading server: "+ldapUrl),
          trustManager, ldapUrl);
      LOG.log(Level.WARNING, "Timeout reading server: "+ldapUrl);
      logger.warn(LocalizableMessage.raw("Timeout reading server: "+ldapUrl));
    }
    super.interrupt();
  }
@@ -171,8 +171,8 @@
    }
    catch (NoPermissionException npe)
    {
      LOG.log(Level.WARNING,
          "Permissions error reading server: "+getLastLdapUrl(), npe);
      logger.warn(LocalizableMessage.raw(
          "Permissions error reading server: "+getLastLdapUrl(), npe));
      if (!isAdministratorDn())
      {
        lastException = new TopologyCacheException(
@@ -189,8 +189,8 @@
    }
    catch (AuthenticationException ae)
    {
      LOG.log(Level.WARNING,
          "Authentication exception: "+getLastLdapUrl(), ae);
      logger.warn(LocalizableMessage.raw(
          "Authentication exception: "+getLastLdapUrl(), ae));
      if (!isAdministratorDn())
      {
        lastException = new TopologyCacheException(
@@ -207,8 +207,8 @@
    }
    catch (NamingException ne)
    {
      LOG.log(Level.WARNING,
          "NamingException error reading server: "+getLastLdapUrl(), ne);
      logger.warn(LocalizableMessage.raw(
          "NamingException error reading server: "+getLastLdapUrl(), ne));
      if (ctx == null)
      {
        lastException =
@@ -228,9 +228,9 @@
    {
      if (!isInterrupted)
      {
        LOG.log(Level.WARNING,
            "Generic error reading server: "+getLastLdapUrl(), t);
        LOG.log(Level.WARNING, "server Properties: "+serverProperties);
        logger.warn(LocalizableMessage.raw(
            "Generic error reading server: "+getLastLdapUrl(), t));
        logger.warn(LocalizableMessage.raw("server Properties: "+serverProperties));
        lastException =
            new TopologyCacheException(TopologyCacheException.Type.BUG, t);
      }
@@ -432,7 +432,7 @@
    }
    catch (Throwable t)
    {
      LOG.log(Level.WARNING, "Error parsing authentication DNs.", t);
      logger.warn(LocalizableMessage.raw("Error parsing authentication DNs.", t));
    }
    return isAdministratorDn;
  }
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
@@ -34,14 +34,14 @@
import java.io.File;
import java.io.PrintStream;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.swing.SwingUtilities;
import org.opends.guitools.controlpanel.util.ControlPanelLog;
import org.opends.messages.AdminToolMessages;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.quicksetup.ui.UIFactory;
import org.opends.quicksetup.util.Utils;
import org.opends.server.types.InitializationException;
@@ -67,8 +67,7 @@
  /** Suffix for log files. */
  static public final String LOG_FILE_SUFFIX = ".log";
  static private final Logger LOG =
    Logger.getLogger(ControlPanelLauncher.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Main method invoked by the control-panel script.
@@ -182,7 +181,7 @@
          }
          catch (Throwable t)
          {
            LOG.log(Level.WARNING, "Error setting look and feel: "+t, t);
            logger.warn(LocalizableMessage.raw("Error setting look and feel: "+t, t));
          }
          ControlPanelSplashScreen.main(args);
@@ -192,7 +191,7 @@
        {
          if (ControlPanelLog.isInitialized())
          {
            LOG.log(Level.WARNING, "Error launching GUI: "+t);
            logger.warn(LocalizableMessage.raw("Error launching GUI: "+t));
            StringBuilder buf = new StringBuilder();
            while (t != null)
            {
@@ -207,7 +206,7 @@
                buf.append("Root cause:\n");
              }
            }
            LOG.log(Level.WARNING, buf.toString());
            logger.warn(LocalizableMessage.raw(buf.toString()));
          }
        }
      }
@@ -305,8 +304,7 @@
  private static ControlPanel controlPanel;
  private static final Logger LOG =
    Logger.getLogger(ControlPanelLauncher.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The main method for this class.
@@ -335,7 +333,7 @@
    {
      if (ControlPanelLog.isInitialized())
      {
        LOG.log(Level.SEVERE, "Error launching GUI: "+t, t);
        logger.error(LocalizableMessage.raw("Error launching GUI: "+t, t));
      }
      InternalError error =
        new InternalError("Failed to invoke initialize method");
@@ -357,12 +355,12 @@
      {
        try
        {
          LOG.log(Level.INFO, "going to call createAndDisplayGUI.");
          logger.debug(LocalizableMessage.raw("going to call createAndDisplayGUI."));
          controlPanel.createAndDisplayGUI();
          LOG.log(Level.INFO, "called createAndDisplayGUI.");
          logger.debug(LocalizableMessage.raw("called createAndDisplayGUI."));
        } catch (Throwable t)
        {
          LOG.log(Level.SEVERE, "Error displaying GUI: "+t, t);
          logger.error(LocalizableMessage.raw("Error displaying GUI: "+t, t));
          InternalError error =
            new InternalError("Failed to invoke display method");
          error.initCause(t);
@@ -382,8 +380,8 @@
      }
      catch (Throwable t)
      {
        LOG.log(Level.SEVERE, "Error calling SwingUtilities.invokeAndWait: "+t,
            t);
        logger.error(LocalizableMessage.raw("Error calling SwingUtilities.invokeAndWait: "+t,
            t));
        InternalError error =
          new InternalError(
              "Failed to invoke SwingUtilities.invokeAndWait method");
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/BrowserController.java
@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.guitools.controlpanel.browser;
@@ -36,8 +37,9 @@
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
@@ -137,8 +139,7 @@
  private String filter;
  private static final Logger LOG =
    Logger.getLogger(BrowserController.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Constructor of the BrowserController.
@@ -1585,7 +1586,7 @@
        }
        catch(Throwable t)
        {
          LOG.log(Level.SEVERE, "Error calling refreshTaskDidProgress: "+t, t);
          logger.error(LocalizableMessage.raw("Error calling refreshTaskDidProgress: "+t, t));
        }
      }
    };
@@ -1787,8 +1788,8 @@
    if (node.getError() != null) {
      if (node.getError().getException() != null)
      {
        LOG.log(Level.SEVERE, "node has error: "+node.getError().getException(),
            node.getError().getException());
        logger.error(LocalizableMessage.raw("node has error: "+node.getError().getException(),
            node.getError().getException()));
      }
      modifiers |= IconPool.MODIFIER_ERROR;
    }
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java
@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.guitools.controlpanel.datamodel;
@@ -34,8 +35,9 @@
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.SortedSet;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.naming.NamingException;
import javax.naming.ldap.InitialLdapContext;
@@ -114,8 +116,7 @@
  private LinkedHashSet<IndexModifiedListener> indexListeners =
    new LinkedHashSet<IndexModifiedListener>();
  private static final Logger LOG =
    Logger.getLogger(ControlPanelInfo.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  private static ControlPanelInfo instance;
@@ -143,7 +144,7 @@
      }
      catch (Throwable t)
      {
        LOG.log(Level.WARNING, "Error retrieving UI key store: "+t, t);
        logger.warn(LocalizableMessage.raw("Error retrieving UI key store: "+t, t));
        instance.setTrustManager(new ApplicationTrustManager(null));
      }
    }
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java
@@ -50,8 +50,9 @@
import java.util.LinkedHashSet;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.naming.NamingException;
import javax.naming.ldap.InitialLdapContext;
@@ -96,7 +97,6 @@
import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
import org.opends.guitools.controlpanel.ui.renderer.CustomListCellRenderer;
import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.quicksetup.UserDataCertificateException;
import org.opends.quicksetup.ui.CertificateDialog;
@@ -198,8 +198,7 @@
      "organizationalUnit"
  };
  private static final Logger LOG =
    Logger.getLogger(AbstractBrowseEntriesPanel.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Default constructor.
@@ -979,8 +978,8 @@
              {
                // The suffix node exists but is not a suffix node.
                // Simply log a message.
                LOG.log(Level.WARNING, "Suffix: "+dn+
                    " added as a non suffix node. Exception: "+iae, iae);
                logger.warn(LocalizableMessage.raw("Suffix: "+dn+
                    " added as a non suffix node. Exception: "+iae, iae));
              }
            }
          }
@@ -1518,8 +1517,8 @@
                  {
                    // The suffix node exists but is not a suffix node.
                    // Simply log a message.
                    LOG.log(Level.WARNING, "Suffix: "+dn+
                        " added as a non suffix node. Exception: "+iae, iae);
                    logger.warn(LocalizableMessage.raw("Suffix: "+dn+
                        " added as a non suffix node. Exception: "+iae, iae));
                  }
                }
              }
@@ -1609,7 +1608,7 @@
        ApplicationTrustManager.Cause cause =
          getInfo().getTrustManager().getLastRefusedCause();
        LOG.log(Level.INFO, "Certificate exception cause: "+cause);
        logger.debug(LocalizableMessage.raw("Certificate exception cause: "+cause));
        UserDataCertificateException.Type excType = null;
        if (cause == ApplicationTrustManager.Cause.NOT_TRUSTED)
        {
@@ -1633,8 +1632,8 @@
          }
          catch (Throwable t)
          {
            LOG.log(Level.WARNING,
                "Error parsing ldap url of ldap url.", t);
            logger.warn(LocalizableMessage.raw(
                "Error parsing ldap url of ldap url.", t));
            h = INFO_NOT_AVAILABLE_LABEL.get().toString();
            p = -1;
          }
@@ -1723,7 +1722,7 @@
      if ((chain != null) && (authType != null) && (host != null))
      {
        LOG.log(Level.INFO, "Accepting certificate presented by host "+host);
        logger.debug(LocalizableMessage.raw("Accepting certificate presented by host "+host));
        getInfo().getTrustManager().acceptCertificate(chain, authType, host);
        createdUserDataCtx = createUserDataDirContext(bindDN, bindPassword);
      }
@@ -1731,18 +1730,18 @@
      {
        if (chain == null)
        {
          LOG.log(Level.WARNING,
              "The chain is null for the UserDataCertificateException");
          logger.warn(LocalizableMessage.raw(
              "The chain is null for the UserDataCertificateException"));
        }
        if (authType == null)
        {
          LOG.log(Level.WARNING,
              "The auth type is null for the UserDataCertificateException");
          logger.warn(LocalizableMessage.raw(
              "The auth type is null for the UserDataCertificateException"));
        }
        if (host == null)
        {
          LOG.log(Level.WARNING,
              "The host is null for the UserDataCertificateException");
          logger.warn(LocalizableMessage.raw(
              "The host is null for the UserDataCertificateException"));
        }
      }
    }
@@ -1758,7 +1757,7 @@
        }
        catch (Throwable t)
        {
          LOG.log(Level.WARNING, "Error accepting certificate: "+t, t);
          logger.warn(LocalizableMessage.raw("Error accepting certificate: "+t, t));
        }
      }
    }
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BackupListPanel.java
@@ -42,8 +42,9 @@
import java.util.GregorianCalendar;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.swing.Box;
import javax.swing.JButton;
@@ -67,7 +68,6 @@
import org.opends.guitools.controlpanel.ui.renderer.BackupTableCellRenderer;
import org.opends.guitools.controlpanel.util.BackgroundTask;
import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.types.BackupDirectory;
import org.opends.server.types.BackupInfo;
import org.opends.server.types.OpenDsException;
@@ -144,8 +144,7 @@
  private BackupTableCellRenderer renderer;
  private static final Logger LOG =
    Logger.getLogger(BackupListPanel.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Default constructor.
@@ -404,7 +403,7 @@
                if (!children[i].getName().equals("tasks") &&
                    (firstThrowable != null))
                {
                  LOG.log(Level.WARNING, "Error searching backup: "+t2, t2);
                  logger.warn(LocalizableMessage.raw("Error searching backup: "+t2, t2));
                }
              }
            }
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BackupPanel.java
@@ -41,8 +41,9 @@
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.TreeSet;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.swing.ButtonGroup;
import javax.swing.DefaultComboBoxModel;
@@ -67,7 +68,6 @@
import org.opends.guitools.controlpanel.ui.components.ScheduleSummaryPanel;
import org.opends.guitools.controlpanel.util.BackgroundTask;
import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.tools.BackUpDB;
import org.opends.server.types.BackupDirectory;
import org.opends.server.types.BackupInfo;
@@ -104,8 +104,7 @@
  private ScheduleSummaryPanel schedulePanel;
  private static final Logger LOG =
    Logger.getLogger(BackupPanel.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Default constructor.
@@ -502,7 +501,7 @@
                {
                  if (!children[i].getName().equals("tasks"))
                  {
                    LOG.log(Level.WARNING, "Error searching backup: "+t2, t2);
                    logger.warn(LocalizableMessage.raw("Error searching backup: "+t2, t2));
                  }
                }
              }
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java
@@ -37,8 +37,9 @@
import java.io.File;
import java.io.FileInputStream;
import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.swing.Box;
import javax.swing.ButtonGroup;
@@ -54,7 +55,6 @@
import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
import org.opends.guitools.controlpanel.util.BackgroundTask;
import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.types.Schema;
/**
@@ -83,8 +83,7 @@
  private final static int MAX_IMAGE_HEIGHT = 300;
  private final static int MAX_BASE64_TO_DISPLAY = 3 * 1024;
  private static final Logger LOG =
    Logger.getLogger(BinaryAttributeEditorPanel.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Default constructor.
@@ -189,7 +188,7 @@
        packParentDialog();
        if (t != null)
        {
          LOG.log(Level.WARNING, "Error reading binary contents: "+t, t);
          logger.warn(LocalizableMessage.raw("Error reading binary contents: "+t, t));
        }
      }
    };
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java
@@ -31,8 +31,9 @@
import java.awt.Component;
import java.awt.GridBagConstraints;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.swing.Box;
import javax.swing.JLabel;
@@ -41,7 +42,6 @@
import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
import org.opends.guitools.controlpanel.util.BackgroundTask;
import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.types.Schema;
/**
@@ -58,8 +58,7 @@
  private JLabel lImage = Utilities.createDefaultLabel();
  private byte[] lastBytes;
  private static final Logger LOG =
    Logger.getLogger(BinaryValuePanel.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Default constructor.
@@ -124,7 +123,7 @@
        packParentDialog();
        if (t != null)
        {
          LOG.log(Level.WARNING, "Error reading binary contents: "+t, t);
          logger.warn(LocalizableMessage.raw("Error reading binary contents: "+t, t));
        }
      }
    };
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
@@ -41,8 +41,9 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
@@ -68,7 +69,6 @@
import org.opends.guitools.controlpanel.task.OnlineUpdateException;
import org.opends.guitools.controlpanel.util.BackgroundTask;
import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.quicksetup.Installation;
import org.opends.quicksetup.UserData;
import org.opends.quicksetup.UserDataCertificateException;
@@ -107,8 +107,7 @@
  private boolean callOKWhenVisible;
  private static final Logger LOG =
    Logger.getLogger(LocalOrRemotePanel.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Default constructor.
@@ -657,7 +656,7 @@
          if (throwable != null)
          {
            LOG.log(Level.INFO, "Error connecting: " + throwable, throwable);
            logger.debug(LocalizableMessage.raw("Error connecting: " + throwable, throwable));
            if (isVersionException(throwable))
            {
@@ -668,7 +667,7 @@
              ApplicationTrustManager.Cause cause =
                getInfo().getTrustManager().getLastRefusedCause();
              LOG.log(Level.INFO, "Certificate exception cause: "+cause);
              logger.debug(LocalizableMessage.raw("Certificate exception cause: "+cause));
              UserDataCertificateException.Type excType = null;
              if (cause == ApplicationTrustManager.Cause.NOT_TRUSTED)
              {
@@ -698,8 +697,8 @@
                }
                catch (Throwable t)
                {
                  LOG.log(Level.WARNING,
                      "Error parsing ldap url of ldap url.", t);
                  logger.warn(LocalizableMessage.raw(
                      "Error parsing ldap url of ldap url.", t));
                  h = INFO_NOT_AVAILABLE_LABEL.get().toString();
                  p = -1;
                }
@@ -752,15 +751,15 @@
            }
            else if (throwable instanceof ConfigReadException)
            {
              LOG.log(Level.WARNING,
                  "Error reading configuration: "+throwable, throwable);
              logger.warn(LocalizableMessage.raw(
                  "Error reading configuration: "+throwable, throwable));
              errors.add(((ConfigReadException)throwable).getMessageObject());
            }
            else
            {
              // This is a bug
              LOG.log(Level.SEVERE,
                  "Unexpected error: "+throwable, throwable);
              logger.error(LocalizableMessage.raw(
                  "Unexpected error: "+throwable, throwable));
              errors.add(Utils.getThrowableMsg(INFO_BUG_MSG.get(), throwable));
            }
          }
@@ -859,7 +858,7 @@
      if ((chain != null) && (authType != null) && (host != null))
      {
        LOG.log(Level.INFO, "Accepting certificate presented by host "+host);
        logger.debug(LocalizableMessage.raw("Accepting certificate presented by host "+host));
        getInfo().getTrustManager().acceptCertificate(chain, authType, host);
        /* Simulate a click on the OK by calling in the okClicked method. */
        SwingUtilities.invokeLater(new Runnable()
@@ -874,18 +873,18 @@
      {
        if (chain == null)
        {
          LOG.log(Level.WARNING,
              "The chain is null for the UserDataCertificateException");
          logger.warn(LocalizableMessage.raw(
              "The chain is null for the UserDataCertificateException"));
        }
        if (authType == null)
        {
          LOG.log(Level.WARNING,
              "The auth type is null for the UserDataCertificateException");
          logger.warn(LocalizableMessage.raw(
              "The auth type is null for the UserDataCertificateException"));
        }
        if (host == null)
        {
          LOG.log(Level.WARNING,
              "The host is null for the UserDataCertificateException");
          logger.warn(LocalizableMessage.raw(
              "The host is null for the UserDataCertificateException"));
        }
      }
    }
@@ -901,7 +900,7 @@
        }
        catch (Throwable t)
        {
          LOG.log(Level.WARNING, "Error accepting certificate: "+t, t);
          logger.warn(LocalizableMessage.raw("Error accepting certificate: "+t, t));
        }
      }
    }
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java
@@ -36,8 +36,9 @@
import java.security.cert.X509Certificate;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.naming.NamingException;
import javax.naming.ldap.InitialLdapContext;
@@ -51,7 +52,6 @@
import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
import org.opends.guitools.controlpanel.util.BackgroundTask;
import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.quicksetup.UserDataCertificateException;
import org.opends.quicksetup.ui.CertificateDialog;
import org.opends.quicksetup.util.UIKeyStore;
@@ -71,8 +71,7 @@
  private JLabel dnLabel;
  private String usedUrl;
  private static final Logger LOG =
    Logger.getLogger(LoginPanel.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Default constructor.
@@ -285,14 +284,14 @@
          boolean handleCertificateException = false;
          if (throwable != null)
          {
            LOG.log(Level.INFO, "Error connecting: " + throwable, throwable);
            logger.debug(LocalizableMessage.raw("Error connecting: " + throwable, throwable));
            if (Utils.isCertificateException(throwable))
            {
              ApplicationTrustManager.Cause cause =
                getInfo().getTrustManager().getLastRefusedCause();
              LOG.log(Level.INFO, "Certificate exception cause: "+cause);
              logger.debug(LocalizableMessage.raw("Certificate exception cause: "+cause));
              UserDataCertificateException.Type excType = null;
              if (cause == ApplicationTrustManager.Cause.NOT_TRUSTED)
              {
@@ -322,8 +321,8 @@
                }
                catch (Throwable t)
                {
                  LOG.log(Level.WARNING,
                      "Error parsing ldap url of ldap url.", t);
                  logger.warn(LocalizableMessage.raw(
                      "Error parsing ldap url of ldap url.", t));
                  h = INFO_NOT_AVAILABLE_LABEL.get().toString();
                  p = -1;
                }
@@ -443,7 +442,7 @@
      if ((chain != null) && (authType != null) && (host != null))
      {
        LOG.log(Level.INFO, "Accepting certificate presented by host "+host);
        logger.debug(LocalizableMessage.raw("Accepting certificate presented by host "+host));
        getInfo().getTrustManager().acceptCertificate(chain, authType, host);
        /* Simulate a click on the OK by calling in the okClicked method. */
        SwingUtilities.invokeLater(new Runnable()
@@ -458,18 +457,18 @@
      {
        if (chain == null)
        {
          LOG.log(Level.WARNING,
              "The chain is null for the UserDataCertificateException");
          logger.warn(LocalizableMessage.raw(
              "The chain is null for the UserDataCertificateException"));
        }
        if (authType == null)
        {
          LOG.log(Level.WARNING,
              "The auth type is null for the UserDataCertificateException");
          logger.warn(LocalizableMessage.raw(
              "The auth type is null for the UserDataCertificateException"));
        }
        if (host == null)
        {
          LOG.log(Level.WARNING,
              "The host is null for the UserDataCertificateException");
          logger.warn(LocalizableMessage.raw(
              "The host is null for the UserDataCertificateException"));
        }
      }
    }
@@ -485,7 +484,7 @@
        }
        catch (Throwable t)
        {
          LOG.log(Level.WARNING, "Error accepting certificate: "+t, t);
          logger.warn(LocalizableMessage.raw("Error accepting certificate: "+t, t));
        }
      }
    }
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
@@ -44,8 +44,9 @@
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.swing.Box;
import javax.swing.JButton;
@@ -72,7 +73,6 @@
import org.opends.guitools.controlpanel.ui.renderer.TaskCellRenderer;
import org.opends.guitools.controlpanel.util.ConfigFromFile;
import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.quicksetup.util.Utils;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tools.tasks.TaskEntry;
@@ -129,8 +129,7 @@
  private JTextArea logs;
  private JLabel noLogsLabel;
  private static final Logger LOG =
    Logger.getLogger(ManageTasksPanel.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Default constructor.
@@ -568,7 +567,7 @@
      }
      catch (Throwable t)
      {
        LOG.log(Level.SEVERE, "Error getting entry '"+csr.getDN()+"': "+t, t);
        logger.error(LocalizableMessage.raw("Error getting entry '"+csr.getDN()+"': "+t, t));
      }
    }
    return list;
@@ -635,7 +634,7 @@
      }
      catch (Throwable t)
      {
        LOG.log(Level.SEVERE, "Error getting entry '"+csr.getDN()+"': "+t, t);
        logger.error(LocalizableMessage.raw("Error getting entry '"+csr.getDN()+"': "+t, t));
      }
    }
    return list;
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
@@ -55,8 +55,9 @@
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.naming.NamingEnumeration;
import javax.naming.directory.SearchControls;
@@ -94,7 +95,6 @@
import org.opends.guitools.controlpanel.util.BackgroundTask;
import org.opends.guitools.controlpanel.util.LowerCaseComparator;
import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.LocalizableMessageDescriptor;
import org.opends.quicksetup.ui.CustomHTMLEditorKit;
@@ -147,8 +147,7 @@
  private static final String MAIN_PANEL = "mainPanel";
  private static final String MESSAGE_PANEL = "messagePanel";
  private static final Logger LOG =
    Logger.getLogger(StatusGenericPanel.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The error pane.
@@ -1786,7 +1785,7 @@
          if (t != null)
          {
            LOG.log(Level.WARNING, "Error occurred running task: "+t, t);
            logger.warn(LocalizableMessage.raw("Error occurred running task: "+t, t));
            if ((task.getReturnCode() != null) &&
                (errorDetailCode != null))
            {
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
@@ -219,7 +219,7 @@
    catch (Throwable t)
    {
      entry = null;
      LOG.log(Level.WARNING, "Unexpected error: "+t, t);
      logger.warn(LocalizableMessage.raw("Unexpected error: "+t, t));
    }
    */
    LDAPEntryChangedEvent ev = new LDAPEntryChangedEvent(this, entry);
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java
@@ -34,8 +34,9 @@
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.text.ParseException;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.swing.Box;
import javax.swing.Icon;
@@ -49,7 +50,6 @@
import org.opends.guitools.controlpanel.datamodel.BinaryValue;
import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.i18n.LocalizableMessage;
/**
 * A simple panel used in the LDAP entry viewers to display a binary value.
@@ -74,8 +74,7 @@
  private final static int THUMBNAIL_HEIGHT = 50;
  private static final Logger LOG =
    Logger.getLogger(BinaryCellPanel.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Default constructor.
@@ -246,7 +245,7 @@
      }
      catch (ParseException pe)
      {
        LOG.log(Level.WARNING, "Error decoding base 64 value: "+pe, pe);
        logger.warn(LocalizableMessage.raw("Error decoding base 64 value: "+pe, pe));
        Utilities.setWarningLabel(label, ERR_LOADING_IMAGE.get());
      }
    }
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ApplicationPrintStream.java
@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.guitools.controlpanel.util;
@@ -29,8 +30,9 @@
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.guitools.controlpanel.event.PrintStreamListener;
@@ -42,8 +44,7 @@
{
  private ArrayList<PrintStreamListener> listeners =
    new ArrayList<PrintStreamListener>();
  private static final Logger LOG =
    Logger.getLogger(ApplicationPrintStream.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  private boolean notifyListeners = true;
@@ -63,7 +64,7 @@
  public void println(String msg)
  {
    notifyListenersNewLine(msg);
    LOG.log(Level.INFO, msg);
    logger.debug(LocalizableMessage.raw(msg));
  }
  /**
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
@@ -43,8 +43,9 @@
import java.util.SortedSet;
import java.util.TimeZone;
import java.util.TreeSet;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
@@ -84,8 +85,7 @@
{
  private static final String DATABASE_ENVIRONMENT_SUFFIX =
    " Database Environment";
  private static final Logger LOG =
    Logger.getLogger(ConfigFromDirContext.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  private CustomSearchResult rootMonitor;
  private CustomSearchResult jvmMemoryUsage;
@@ -515,7 +515,7 @@
    }
    for (OpenDsException oe : ex)
    {
      LOG.log(Level.WARNING, "Error reading configuration: "+oe, oe);
      logger.warn(LocalizableMessage.raw("Error reading configuration: "+oe, oe));
    }
    administrativeUsers = Collections.unmodifiableSet(as);
    listeners = Collections.unmodifiableSet(ls);
@@ -526,7 +526,7 @@
    }
    catch (Throwable t)
    {
      LOG.log(Level.WARNING, "Error reading monitoring: "+t, t);
      logger.warn(LocalizableMessage.raw("Error reading monitoring: "+t, t));
      OnlineUpdateException oupe = new OnlineUpdateException(
          ERR_READING_CONFIG_LDAP.get(t.toString()), t);
      ex.add(oupe);
@@ -537,7 +537,7 @@
    }
    catch (Throwable t)
    {
      LOG.log(Level.WARNING, "Error reading task information: "+t, t);
      logger.warn(LocalizableMessage.raw("Error reading task information: "+t, t));
      OnlineUpdateException oupe = new OnlineUpdateException(
          ERR_READING_CONFIG_LDAP.get(t.toString()), t);
      ex.add(oupe);
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java
@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2008-2011 Sun Microsystems, Inc.
 *      Portions copyright 2013 ForgeRock, AS.
 *      Portions Copyright 2013-2014 ForgeRock AS.
 */
package org.opends.guitools.controlpanel.util;
@@ -38,8 +38,9 @@
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.guitools.controlpanel.datamodel.AbstractIndexDescriptor;
import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
@@ -86,8 +87,7 @@
 */
public class ConfigFromFile extends ConfigReader
{
  private static final Logger LOG =
    Logger.getLogger(ConfigFromFile.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Creates a new instance of this config file handler.  No initialization
@@ -369,7 +369,7 @@
    }
    catch (final Throwable t)
    {
      LOG.log(Level.WARNING, "Error reading configuration: "+t, t);
      logger.warn(LocalizableMessage.raw("Error reading configuration: "+t, t));
      OfflineUpdateException oue = new OfflineUpdateException(
          ERR_READING_CONFIG_LDAP.get(t.getMessage().toString()), t);
      ex.add(oue);
@@ -385,7 +385,7 @@
    for (OpenDsException oe : ex)
    {
      LOG.log(Level.WARNING, "Error reading configuration: "+oe, oe);
      logger.warn(LocalizableMessage.raw("Error reading configuration: "+oe, oe));
    }
    exceptions = Collections.unmodifiableList(ex);
    administrativeUsers = Collections.unmodifiableSet(as);
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigReader.java
@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008-2009 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.guitools.controlpanel.util;
@@ -35,8 +36,9 @@
import java.util.Comparator;
import java.util.List;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
import org.opends.guitools.controlpanel.datamodel.ConnectionHandlerDescriptor;
@@ -60,8 +62,7 @@
 */
public abstract class ConfigReader
{
  private static final Logger LOG =
    Logger.getLogger(ConfigReader.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The class used to read the configuration from a file.
   */
@@ -106,7 +107,7 @@
      environmentSettingException = new OfflineUpdateException(
          ERR_CTRL_PANEL_SETTING_ENVIRONMENT.get(t.getMessage().toString()), t);
    }
    LOG.log(Level.INFO, "Environment initialized.");
    logger.debug(LocalizableMessage.raw("Environment initialized."));
  }
  /**
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ControlPanelLog.java
@@ -22,16 +22,16 @@
 *
 *
 *      Copyright 2008-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2011 ForgeRock AS
 *      Portions Copyright 2011-2014 ForgeRock AS
 */
package org.opends.guitools.controlpanel.util;
import java.io.File;
import java.io.IOException;
import java.util.logging.FileHandler;
import java.util.logging.SimpleFormatter;
import java.util.logging.Logger;
import java.util.logging.Level;
import java.util.logging.SimpleFormatter;
import java.util.Date;
import java.text.DateFormat;
@@ -68,7 +68,7 @@
        logger.addHandler(fileHandler);
      }
      Logger logger = Logger.getLogger(packages[0]);
      logger.log(Level.INFO, getInitialLogRecord());
      logger.info(getInitialLogRecord());
    }
  }
@@ -86,7 +86,7 @@
      logger.setUseParentHandlers(false); // disable logging to console
    }
    logger.addHandler(fileHandler);
    logger.log(Level.INFO, getInitialLogRecord());
    logger.info(getInitialLogRecord());
  }
  /**
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
@@ -65,8 +65,8 @@
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.Collections;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
@@ -89,8 +89,7 @@
 */
public class UninstallCliHelper extends ConsoleApplication {
  static private final Logger LOG =
          Logger.getLogger(UninstallCliHelper.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  private UninstallerArgumentParser parser;
@@ -180,14 +179,14 @@
        outsideDbs = config.getOutsideDbs();
      } catch (IOException ioe) {
        outsideDbs = Collections.emptySet();
        LOG.log(Level.INFO, "error determining outside databases", ioe);
        logger.debug(LocalizableMessage.raw("error determining outside databases", ioe));
      }
      try {
        outsideLogs = config.getOutsideLogs();
      } catch (IOException ioe) {
        outsideLogs = Collections.emptySet();
        LOG.log(Level.INFO, "error determining outside logs", ioe);
        logger.debug(LocalizableMessage.raw("error determining outside logs", ioe));
      }
      boolean somethingSpecifiedToDelete =
@@ -245,7 +244,7 @@
      }
      catch (Throwable t)
      {
        LOG.log(Level.SEVERE, "Could not create UninstallData: "+t, t);
        logger.error(LocalizableMessage.raw("Could not create UninstallData: "+t, t));
        userData.setReplicationServer(
            referencedHostName+":8989");
      }
@@ -259,8 +258,8 @@
      if (adminConnectorUrl == null)
      {
        LOG.log(Level.WARNING,
        "Error retrieving a valid LDAP URL in conf file.");
        logger.warn(LocalizableMessage.raw(
        "Error retrieving a valid LDAP URL in conf file."));
        if (!parser.isInteractive())
        {
          LocalizableMessage msg = ERR_COULD_NOT_FIND_VALID_LDAPURL.get();
@@ -282,7 +281,7 @@
      if (isCanceled && !userData.isForceOnError())
      {
        LOG.log(Level.INFO, "User cancelled uninstall.");
        logger.debug(LocalizableMessage.raw("User cancelled uninstall."));
        userData = null;
      }
@@ -293,7 +292,7 @@
    }
    catch (Throwable t)
    {
      LOG.log(Level.WARNING, "Exception: "+t, t);
      logger.warn(LocalizableMessage.raw("Exception: "+t, t));
      if (t instanceof UserDataException)
      {
        throw (UserDataException)t;
@@ -307,7 +306,7 @@
        throw new IllegalStateException("Unexpected error: "+t, t);
      }
    }
    LOG.log(Level.INFO, "Successfully created user data");
    logger.debug(LocalizableMessage.raw("Successfully created user data"));
    return userData;
  }
@@ -373,7 +372,7 @@
    }
    catch (CLIException ce)
    {
      LOG.log(Level.WARNING, "Error reading input: "+ce, ce);
      logger.warn(LocalizableMessage.raw("Error reading input: "+ce, ce));
      throw new UserDataException(null, ce.getMessageObject(), ce);
    }
@@ -425,7 +424,7 @@
            ((i == 7) && (outsideLogs.size() == 0));
            if (!ignore)
            {
              answers[i] = askConfirmation(msgs[i], true, LOG);
              answers[i] = askConfirmation(msgs[i], true, logger);
            }
            else
            {
@@ -535,16 +534,16 @@
    }
    catch (Throwable t)
    {
      LOG.log(Level.WARNING, "Error processing task: "+t, t);
      logger.warn(LocalizableMessage.raw("Error processing task: "+t, t));
      throw new UserDataException(Step.CONFIRM_UNINSTALL,
          Utils.getThrowableMsg(INFO_BUG_MSG.get(), t));
    }
    LOG.log(Level.INFO, "interactive: "+interactive);
    LOG.log(Level.INFO, "forceOnError: "+forceOnError);
    LOG.log(Level.INFO, "conf.isADS(): "+conf.isADS());
    LOG.log(Level.INFO, "conf.isReplicationServer(): "+
        conf.isReplicationServer());
    LOG.log(Level.INFO, "conf.isServerRunning(): "+conf.isServerRunning());
    logger.debug(LocalizableMessage.raw("interactive: "+interactive));
    logger.debug(LocalizableMessage.raw("forceOnError: "+forceOnError));
    logger.debug(LocalizableMessage.raw("conf.isADS(): "+conf.isADS()));
    logger.debug(LocalizableMessage.raw("conf.isReplicationServer(): "+
        conf.isReplicationServer()));
    logger.debug(LocalizableMessage.raw("conf.isServerRunning(): "+conf.isServerRunning()));
    if (conf.isADS() && conf.isReplicationServer())
    {
      if (conf.isServerRunning())
@@ -591,8 +590,8 @@
          boolean errorWithRemote =
            !updateUserUninstallDataWithRemoteServers(userData);
          cancelled = errorWithRemote && !parser.isForceOnError();
          LOG.log(Level.INFO, "Non interactive mode.  errorWithRemote: "+
              errorWithRemote);
          logger.debug(LocalizableMessage.raw("Non interactive mode.  errorWithRemote: "+
              errorWithRemote));
        }
      }
      else
@@ -671,8 +670,8 @@
        /* During all the confirmations, the server might be stopped. */
        userData.setStopServer(
            Installation.getLocal().getStatus().isServerRunning());
        LOG.log(Level.INFO, "Must stop the server after confirmations? "+
            userData.getStopServer());
        logger.debug(LocalizableMessage.raw("Must stop the server after confirmations? "+
            userData.getStopServer()));
      }
    }
    else
@@ -693,8 +692,8 @@
            /* During all the confirmations, the server might be stopped. */
            userData.setStopServer(
                Installation.getLocal().getStatus().isServerRunning());
            LOG.log(Level.INFO, "Must stop the server after confirmations? "+
                userData.getStopServer());
            logger.debug(LocalizableMessage.raw("Must stop the server after confirmations? "+
                userData.getStopServer()));
          }
        }
        catch (CLIException ce)
@@ -720,7 +719,7 @@
        }
      }
    }
    LOG.log(Level.INFO, "cancelled: "+cancelled);
    logger.debug(LocalizableMessage.raw("cancelled: "+cancelled));
    return cancelled;
  }
@@ -732,7 +731,7 @@
   */
  private boolean confirmToStopServer() throws CLIException
  {
    return askConfirmation(INFO_CLI_UNINSTALL_CONFIRM_STOP.get(), true, LOG);
    return askConfirmation(INFO_CLI_UNINSTALL_CONFIRM_STOP.get(), true, logger);
  }
  /**
@@ -744,7 +743,7 @@
  private boolean confirmDeleteFiles() throws CLIException
  {
    return askConfirmation(INFO_CLI_UNINSTALL_CONFIRM_DELETE_FILES.get(), true,
        LOG);
        logger);
  }
  /**
@@ -756,7 +755,7 @@
  private boolean confirmToUpdateRemote() throws CLIException
  {
    return askConfirmation(INFO_CLI_UNINSTALL_CONFIRM_UPDATE_REMOTE.get(), true,
        LOG);
        logger);
  }
  /**
@@ -768,7 +767,7 @@
  private boolean confirmToUpdateRemoteAndStart() throws CLIException
  {
    return askConfirmation(
        INFO_CLI_UNINSTALL_CONFIRM_UPDATE_REMOTE_AND_START.get(), true, LOG);
        INFO_CLI_UNINSTALL_CONFIRM_UPDATE_REMOTE_AND_START.get(), true, logger);
  }
  /**
@@ -780,7 +779,7 @@
  private boolean promptToProvideAuthenticationAgain() throws CLIException
  {
    return askConfirmation(
        INFO_UNINSTALL_CONFIRM_PROVIDE_AUTHENTICATION_AGAIN.get(), true, LOG);
        INFO_UNINSTALL_CONFIRM_PROVIDE_AUTHENTICATION_AGAIN.get(), true, logger);
  }
  /**
@@ -859,8 +858,8 @@
        String adminConnectorUrl = info.getAdminConnectorURL();
        if (adminConnectorUrl == null)
        {
          LOG.log(Level.WARNING,
         "Error retrieving a valid Administration Connector URL in conf file.");
          logger.warn(LocalizableMessage.raw(
         "Error retrieving a valid Administration Connector URL in conf file."));
          LocalizableMessage msg = ERR_COULD_NOT_FIND_VALID_LDAPURL.get();
            throw new ApplicationException(ReturnCode.APPLICATION_ERROR, msg,
                null);
@@ -875,7 +874,7 @@
        }
        catch (Throwable t)
        {
          LOG.log(Level.SEVERE, "Error parsing url: "+adminConnectorUrl);
          logger.error(LocalizableMessage.raw("Error parsing url: "+adminConnectorUrl));
        }
        LDAPManagementContextFactory factory =
          new LDAPManagementContextFactory(alwaysSSL);
@@ -888,8 +887,8 @@
        if (adminConnectorUrl == null)
        {
          LOG.log(Level.WARNING,
         "Error retrieving a valid Administration Connector URL in conf file.");
          logger.warn(LocalizableMessage.raw(
         "Error retrieving a valid Administration Connector URL in conf file."));
          LocalizableMessage msg = ERR_COULD_NOT_FIND_VALID_LDAPURL.get();
          throw new ApplicationException(ReturnCode.APPLICATION_ERROR, msg,
              null);
@@ -916,7 +915,7 @@
          }
          catch (Throwable t)
          {
            LOG.log(Level.INFO, "Error closing connection: "+t, t);
            logger.debug(LocalizableMessage.raw("Error closing connection: "+t, t));
          }
        }
      }
@@ -956,7 +955,7 @@
      }
      catch (Throwable t)
      {
        LOG.log(Level.SEVERE, "Could not create UninstallData: "+t, t);
        logger.error(LocalizableMessage.raw("Could not create UninstallData: "+t, t));
      }
    }
    userData.setUpdateRemoteReplication(accepted);
@@ -973,14 +972,14 @@
    }
    catch (CLIException ce)
    {
      LOG.log(Level.WARNING, "Error reading input: "+ce, ce);
      logger.warn(LocalizableMessage.raw("Error reading input: %s", ce), ce);
    }
    return s;
  }
  private boolean startServer(boolean supressOutput)
  {
    LOG.log(Level.INFO, "startServer, supressOutput: "+supressOutput);
    logger.debug(LocalizableMessage.raw("startServer, supressOutput: "+supressOutput));
    boolean serverStarted = false;
    Application application = new Application()
    {
@@ -1112,12 +1111,12 @@
        printlnProgress();
      }
      serverStarted = Installation.getLocal().getStatus().isServerRunning();
      LOG.log(Level.INFO, "server started successfully. serverStarted: "+
          serverStarted);
      logger.debug(LocalizableMessage.raw("server started successfully. serverStarted: "+
          serverStarted));
    }
    catch (ApplicationException ae)
    {
      LOG.log(Level.WARNING, "ApplicationException: "+ae, ae);
      logger.warn(LocalizableMessage.raw("ApplicationException: "+ae, ae));
      if (!supressOutput)
      {
        printErrorMessage(ae.getMessageObject());
@@ -1125,7 +1124,7 @@
    }
    catch (Throwable t)
    {
      LOG.log(Level.SEVERE, "Unexpected error: "+t, t);
      logger.error(LocalizableMessage.raw("Unexpected error: "+t, t));
      throw new IllegalStateException("Unexpected error: "+t, t);
    }
    return serverStarted;
@@ -1158,7 +1157,7 @@
    LocalizableMessage exceptionMsg = null;
    LOG.log(Level.INFO, "Updating user data with remote servers.");
    logger.debug(LocalizableMessage.raw("Updating user data with remote servers."));
    InitialLdapContext ctx = null;
    try
@@ -1181,7 +1180,7 @@
      }
      catch (Throwable t)
      {
        LOG.log(Level.SEVERE, "Error parsing url: "+adminConnectorUrl);
        logger.error(LocalizableMessage.raw("Error parsing url: "+adminConnectorUrl));
      }
      ctx = createAdministrativeContext(host, port, useSSL, useStartTLS, dn,
          pwd, getConnectTimeout(),
@@ -1197,7 +1196,7 @@
        forceTrustManagerInitialization();
        updateTrustManager(userData, ci);
      }
      LOG.log(Level.INFO, "Reloading topology");
      logger.debug(LocalizableMessage.raw("Reloading topology"));
      TopologyCache cache = new TopologyCache(adsContext,
          userData.getTrustManager(), getConnectTimeout());
      cache.getFilter().setSearchMonitoringInformation(false);
@@ -1209,7 +1208,7 @@
    }
    catch (NamingException ne)
    {
      LOG.log(Level.WARNING, "Error connecting to server: "+ne, ne);
      logger.warn(LocalizableMessage.raw("Error connecting to server: "+ne, ne));
      if (Utils.isCertificateException(ne))
      {
        String details = ne.getMessage() != null ?
@@ -1224,7 +1223,7 @@
      }
    } catch (TopologyCacheException te)
    {
      LOG.log(Level.WARNING, "Error connecting to server: "+te, te);
      logger.warn(LocalizableMessage.raw("Error connecting to server: "+te, te));
      exceptionMsg = Utils.getMessage(te);
    } catch (ApplicationException ae)
@@ -1233,7 +1232,7 @@
    } catch (Throwable t)
    {
      LOG.log(Level.WARNING, "Error connecting to server: "+t, t);
      logger.warn(LocalizableMessage.raw("Error connecting to server: "+t, t));
      exceptionMsg = Utils.getThrowableMsg(INFO_BUG_MSG.get(), t);
    }
    finally
@@ -1246,7 +1245,7 @@
        }
        catch (Throwable t)
        {
          LOG.log(Level.INFO, "Error closing connection: "+t, t);
          logger.debug(LocalizableMessage.raw("Error closing connection: "+t, t));
        }
      }
    }
@@ -1282,7 +1281,7 @@
        {
          accepted = askConfirmation(
              ERR_UNINSTALL_NOT_UPDATE_REMOTE_PROMPT.get(),
              false, LOG);
              false, logger);
        }
        catch (CLIException ce)
        {
@@ -1291,7 +1290,7 @@
      }
    }
    userData.setUpdateRemoteReplication(accepted);
    LOG.log(Level.INFO, "accepted: "+accepted);
    logger.debug(LocalizableMessage.raw("accepted: "+accepted));
    return accepted;
  }
@@ -1316,7 +1315,7 @@
    boolean reloadTopologyCache = false;
    boolean interactive = parser.isInteractive();
    LOG.log(Level.INFO, "Handle topology cache.");
    logger.debug(LocalizableMessage.raw("Handle topology cache."));
    Set<TopologyCacheException> exceptions =
      new HashSet<TopologyCacheException>();
@@ -1339,7 +1338,7 @@
    /* Check the exceptions and see if we throw them or not. */
    for (TopologyCacheException e : exceptions)
    {
      LOG.log(Level.INFO, "Analyzing exception: "+e, e);
      logger.debug(LocalizableMessage.raw("Analyzing exception: "+e, e));
      if (stopProcessing)
      {
        break;
@@ -1359,7 +1358,7 @@
          {
            println();
            if (ci.promptForCertificateConfirmation(e.getCause(),
                e.getTrustManager(), e.getLdapUrl(), true, LOG))
                e.getTrustManager(), e.getLdapUrl(), true, logger))
            {
              stopProcessing = true;
              reloadTopologyCache = true;
@@ -1396,7 +1395,7 @@
          returnValue = askConfirmation(
            ERR_UNINSTALL_READING_REGISTERED_SERVERS_CONFIRM_UPDATE_REMOTE.get(
                Utils.getMessageFromCollection(exceptionMsgs,
                  Constants.LINE_SEPARATOR).toString()), true, LOG);
                  Constants.LINE_SEPARATOR).toString()), true, logger);
        }
        catch (CLIException ce)
        {
@@ -1414,7 +1413,7 @@
    }
    else
    {
      LOG.log(Level.INFO, "exceptionMsgs: "+exceptionMsgs);
      logger.debug(LocalizableMessage.raw("exceptionMsgs: "+exceptionMsgs));
      if (exceptionMsgs.size() > 0)
      {
        if (parser.isForceOnError())
@@ -1445,7 +1444,7 @@
        returnValue = true;
      }
    }
    LOG.log(Level.INFO, "Return value: "+returnValue);
    logger.debug(LocalizableMessage.raw("Return value: "+returnValue));
    return returnValue;
  }
@@ -1550,7 +1549,7 @@
     }
     catch (ArgumentException ae)
     {
       LOG.log(Level.WARNING, "Error initializing trust store: "+ae, ae);
       logger.warn(LocalizableMessage.raw("Error initializing trust store: "+ae, ae));
     }
     forceNonInteractive = false;
   }
@@ -1558,7 +1557,7 @@
   private void printErrorMessage(LocalizableMessage msg)
   {
     super.println(msg);
     LOG.log(Level.WARNING, msg.toString());
     logger.warn(LocalizableMessage.raw(msg.toString()));
   }
   /**
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
@@ -76,8 +76,8 @@
import java.net.URI;
import java.security.cert.X509Certificate;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.awt.event.WindowEvent;
import javax.naming.Context;
@@ -111,8 +111,7 @@
  private UninstallCliHelper cliHelper = new UninstallCliHelper();
  private static final Logger LOG =
    Logger.getLogger(Uninstaller.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  private LoginDialog loginDialog;
  private ProgressDialog startProgressDlg;
@@ -141,8 +140,8 @@
    }
    catch (Throwable t)
    {
      LOG.log(Level.WARNING, "Error enabling admin framework class loader: "+t,
          t);
      logger.warn(LocalizableMessage.raw("Error enabling admin framework class loader: "+t,
          t));
    }
    // Switch off class name validation in client.
@@ -151,7 +150,7 @@
    // Switch off attribute type name validation in client.
    AttributeTypePropertyDefinition.setCheckSchema(false);
    LOG.log(Level.INFO, "Uninstaller is created.");
    logger.debug(LocalizableMessage.raw("Uninstaller is created."));
  }
  /**
   * {@inheritDoc}
@@ -434,7 +433,7 @@
          catch (UserDataException uude) {
            throw uude;
          } catch (Throwable t) {
            LOG.log(Level.WARNING, "Error processing task: "+t, t);
            logger.warn(LocalizableMessage.raw("Error processing task: "+t, t));
            throw new UserDataException(Step.CONFIRM_UNINSTALL,
                    getThrowableMsg(INFO_BUG_MSG.get(), t));
          }
@@ -451,8 +450,8 @@
            }
            else
            {
              LOG.log(Level.WARNING, "Error processing task: "+throwable,
                  throwable);
              logger.warn(LocalizableMessage.raw("Error processing task: "+throwable,
                  throwable));
              qs.displayError(LocalizableMessage.raw(throwable.toString()),
                      INFO_ERROR_TITLE.get());
            }
@@ -793,7 +792,7 @@
   */
  public void run() {
    runStarted = true;
    LOG.log(Level.INFO, "run of the Uninstaller started");
    logger.debug(LocalizableMessage.raw("run of the Uninstaller started"));
    initMaps();
    PrintStream origErr = System.err;
@@ -808,8 +807,8 @@
      boolean displaySeparator = false;
      LOG.log(Level.INFO, "Update remote replication? "+
          getUninstallUserData().getUpdateRemoteReplication());
      logger.debug(LocalizableMessage.raw("Update remote replication? "+
          getUninstallUserData().getUpdateRemoteReplication()));
      if (getUninstallUserData().getUpdateRemoteReplication())
      {
        status = UninstallProgressStep.UNCONFIGURING_REPLICATION;
@@ -817,7 +816,7 @@
        displaySeparator = true;
      }
      LOG.log(Level.INFO, "Stop server? "+getUserData().getStopServer());
      logger.debug(LocalizableMessage.raw("Stop server? "+getUserData().getStopServer()));
      if (getUserData().getStopServer()) {
        status = UninstallProgressStep.STOPPING_SERVER;
        if (displaySeparator && isVerbose()) {
@@ -841,8 +840,8 @@
        }
        displaySeparator = true;
      }
      LOG.log(Level.INFO, "Is Windows Service Enabled? "+
          isWindowsServiceEnabled());
      logger.debug(LocalizableMessage.raw("Is Windows Service Enabled? "+
          isWindowsServiceEnabled()));
      if (isWindowsServiceEnabled()) {
        status = UninstallProgressStep.DISABLING_WINDOWS_SERVICE;
        if (displaySeparator && isVerbose()) {
@@ -961,14 +960,14 @@
      }
    } catch (ApplicationException ex) {
      LOG.log(Level.SEVERE, "Error: "+ex, ex);
      logger.error(LocalizableMessage.raw("Error: "+ex, ex));
      ue = ex;
      status = UninstallProgressStep.FINISHED_WITH_ERROR;
      LocalizableMessage msg = getFormattedError(ex, true);
      notifyListeners(msg);
    }
    catch (Throwable t) {
      LOG.log(Level.SEVERE, "Error: "+t, t);
      logger.error(LocalizableMessage.raw("Error: "+t, t));
      ue = new ApplicationException(
              ReturnCode.BUG,
              getThrowableMsg(INFO_BUG_MSG.get(), t), t);
@@ -1472,7 +1471,7 @@
                !equalsOrDescendant(file, parent);
      }
      LOG.log(Level.INFO, "accept for :"+file+" is: "+accept);
      logger.debug(LocalizableMessage.raw("accept for :"+file+" is: "+accept));
      return accept;
    }
  }
@@ -1617,7 +1616,7 @@
      }
      catch (NamingException ne)
      {
        LOG.log(Level.WARNING, "Could not find local server: "+ne, ne);
        logger.warn(LocalizableMessage.raw("Could not find local server: "+ne, ne));
        getUninstallUserData().setLocalServerUrl("ldap://localhost:389");
      }
      getUninstallUserData().setReplicationServer(
@@ -1629,7 +1628,7 @@
      {
        public TopologyCache processBackgroundTask() throws Throwable
        {
          LOG.log(Level.INFO, "Loading Topology Cache in askForAuthentication");
          logger.debug(LocalizableMessage.raw("Loading Topology Cache in askForAuthentication"));
          ADSContext adsContext = new ADSContext(ctx);
          TopologyCache cache = new TopologyCache(adsContext,
              getTrustManager(), getConnectTimeout());
@@ -1642,7 +1641,7 @@
          qs.getDialog().workerFinished();
          if (throwable != null)
          {
            LOG.log(Level.WARNING, "Throwable: "+throwable, throwable);
            logger.warn(LocalizableMessage.raw("Throwable: "+throwable, throwable));
            if (throwable instanceof TopologyCacheException)
            {
              qs.displayError(
@@ -1656,7 +1655,7 @@
                  getThrowableMsg(INFO_BUG_MSG.get(), throwable),
                  INFO_ERROR_TITLE.get());
            }
            LOG.log(Level.INFO, "Error was displayed");
            logger.debug(LocalizableMessage.raw("Error was displayed"));
          }
          else
          {
@@ -1694,7 +1693,7 @@
   */
  private void handleTopologyCache(QuickSetup qs, TopologyCache cache)
  {
    LOG.log(Level.INFO, "Handling TopologyCache");
    logger.debug(LocalizableMessage.raw("Handling TopologyCache"));
    boolean stopProcessing = false;
    Set<TopologyCacheException> exceptions =
      new HashSet<TopologyCacheException>();
@@ -1716,7 +1715,7 @@
    /* Check the exceptions and see if we throw them or not. */
    for (TopologyCacheException e : exceptions)
    {
      LOG.log(Level.INFO, "Analyzing exception: "+e, e);
      logger.debug(LocalizableMessage.raw("Analyzing exception: "+e, e));
      if (stopProcessing)
      {
        break;
@@ -1738,7 +1737,7 @@
          {
            cause = e.getTrustManager().getLastRefusedCause();
          }
          LOG.log(Level.INFO, "Certificate exception cause: "+cause);
          logger.debug(LocalizableMessage.raw("Certificate exception cause: "+cause));
          if (cause == ApplicationTrustManager.Cause.NOT_TRUSTED)
          {
            excType = UserDataCertificateException.Type.NOT_TRUSTED;
@@ -1763,8 +1762,8 @@
            }
            catch (Throwable t)
            {
              LOG.log(Level.WARNING,
                  "Error parsing ldap url of TopologyCacheException.", t);
              logger.warn(LocalizableMessage.raw(
                  "Error parsing ldap url of TopologyCacheException.", t));
              h = INFO_NOT_AVAILABLE_LABEL.get().toString();
              p = -1;
            }
@@ -1827,14 +1826,14 @@
      if ((chain != null) && (authType != null) && (host != null))
      {
        LOG.log(Level.INFO, "Accepting certificate presented by host "+host);
        logger.debug(LocalizableMessage.raw("Accepting certificate presented by host "+host));
        getTrustManager().acceptCertificate(chain, authType, host);
        BackgroundTask<TopologyCache> worker =
          new BackgroundTask<TopologyCache>()
        {
          public TopologyCache processBackgroundTask() throws Throwable
          {
            LOG.log(Level.INFO, "Reloading topology");
            logger.debug(LocalizableMessage.raw("Reloading topology"));
            cache.getFilter().setSearchMonitoringInformation(false);
            cache.reloadTopology();
            return cache;
@@ -1870,18 +1869,18 @@
      {
        if (chain == null)
        {
          LOG.log(Level.WARNING,
              "The chain is null for the UserDataCertificateException");
          logger.warn(LocalizableMessage.raw(
              "The chain is null for the UserDataCertificateException"));
        }
        if (authType == null)
        {
          LOG.log(Level.WARNING,
              "The auth type is null for the UserDataCertificateException");
          logger.warn(LocalizableMessage.raw(
              "The auth type is null for the UserDataCertificateException"));
        }
        if (host == null)
        {
          LOG.log(Level.WARNING,
              "The host is null for the UserDataCertificateException");
          logger.warn(LocalizableMessage.raw(
              "The host is null for the UserDataCertificateException"));
        }
      }
    }
@@ -1897,7 +1896,7 @@
        }
        catch (Throwable t)
        {
          LOG.log(Level.WARNING, "Error accepting certificate: "+t, t);
          logger.warn(LocalizableMessage.raw("Error accepting certificate: "+t, t));
        }
      }
    }
@@ -1925,8 +1924,8 @@
    }
    if (serverADSProperties == null)
    {
      LOG.log(Level.WARNING, "The server ADS properties for the server to "+
          "uninstall could not be found.");
      logger.warn(LocalizableMessage.raw("The server ADS properties for the server to "+
          "uninstall could not be found."));
    }
    for (ServerDescriptor server : servers)
@@ -2003,11 +2002,11 @@
    if (!hasReferences)
    {
      LOG.log(Level.INFO, "No references in: "+ server.getHostPort(true));
      logger.debug(LocalizableMessage.raw("No references in: "+ server.getHostPort(true)));
    }
    if (hasReferences)
    {
      LOG.log(Level.INFO, "Updating references in: "+ server.getHostPort(true));
      logger.debug(LocalizableMessage.raw("Updating references in: "+ server.getHostPort(true)));
      notifyListeners(getFormattedWithPoints(
          INFO_PROGRESS_REMOVING_REFERENCES.get(server.getHostPort(true))));
      InitialLdapContext ctx = null;
@@ -2029,8 +2028,8 @@
      catch (ApplicationException ae)
      {
        errorOnRemoteOccurred = true;
        LOG.log(Level.INFO, "Error updating replication references in: "+
            server.getHostPort(true), ae);
        logger.debug(LocalizableMessage.raw("Error updating replication references in: "+
            server.getHostPort(true), ae));
        if (!getUninstallUserData().isForceOnError())
        {
@@ -2111,8 +2110,8 @@
          }
          if (replServer != null)
          {
            LOG.log(Level.INFO, "Updating references in replication server on "+
                serverDisplay+".");
            logger.debug(LocalizableMessage.raw("Updating references in replication server on "+
                serverDisplay+"."));
            replServers.remove(replServer);
            if (replServers.size() > 0)
            {
@@ -2149,8 +2148,8 @@
            }
            if (replServer != null)
            {
              LOG.log(Level.INFO, "Updating references in domain " +
                  domain.getBaseDN()+" on " + serverDisplay + ".");
              logger.debug(LocalizableMessage.raw("Updating references in domain " +
                  domain.getBaseDN()+" on " + serverDisplay + "."));
              replServers.remove(replServer);
              if (replServers.size() > 0)
              {
@@ -2170,14 +2169,14 @@
    catch (ManagedObjectNotFoundException monfe)
    {
      // It does not exist.
      LOG.log(Level.INFO, "No synchronization found on "+ serverDisplay+".",
          monfe);
      logger.debug(LocalizableMessage.raw("No synchronization found on "+ serverDisplay+".",
          monfe));
    }
    catch (Throwable t)
    {
      LOG.log(Level.WARNING,
      logger.warn(LocalizableMessage.raw(
          "Error removing references in replication server on "+
          serverDisplay+": "+t, t);
          serverDisplay+": "+t, t));
      LocalizableMessage errorMessage = INFO_ERROR_CONFIGURING_REMOTE_GENERIC.get(
              serverDisplay, t.toString());
      throw new ApplicationException(
@@ -2190,9 +2189,9 @@
    {
      if (adsContext.hasAdminData() && (serverADSProperties != null))
      {
        LOG.log(Level.INFO, "Unregistering server on ADS of server "+
        logger.debug(LocalizableMessage.raw("Unregistering server on ADS of server "+
            ConnectionUtils.getHostPort(ctx)+".  Properties: "+
            serverADSProperties);
            serverADSProperties));
        adsContext.unregisterServer(serverADSProperties);
      }
    }
@@ -2272,7 +2271,7 @@
      }
      catch (Throwable t)
      {
        LOG.log(Level.WARNING, "Failing checking the port: "+t, t);
        logger.warn(LocalizableMessage.raw("Failing checking the port: "+t, t));
      }
    }
    else
@@ -2306,7 +2305,7 @@
      }
      catch (Throwable t)
      {
        LOG.log(Level.WARNING, "Failing checking host names: "+t, t);
        logger.warn(LocalizableMessage.raw("Failing checking host names: "+t, t));
      }
      isServerToUninstall = hostNameEquals;
    }
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java
@@ -42,11 +42,11 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.io.IOException;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.io.IOException;
import static org.opends.messages.AdminToolMessages.*;
/**
@@ -57,8 +57,7 @@
 */
public class ConfirmUninstallPanel extends QuickSetupStepPanel
{
  private static final Logger LOG =
          Logger.getLogger(ConfirmUninstallPanel.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  private static final long serialVersionUID = 81730510134697056L;
@@ -224,13 +223,13 @@
    try {
      outsideDbs = config.getOutsideDbs();
    } catch (IOException ioe) {
      LOG.log(Level.INFO, "Unable to determin outside databases", ioe);
      logger.debug(LocalizableMessage.raw("Unable to determin outside databases", ioe));
    }
    try {
      outsideLogs = config.getOutsideLogs();
    } catch (IOException ioe) {
      LOG.log(Level.INFO, "Unable to determin outside logs", ioe);
      logger.debug(LocalizableMessage.raw("Unable to determin outside logs", ioe));
    }
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java
@@ -35,8 +35,9 @@
import java.net.URI;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.naming.NamingException;
import javax.naming.ldap.InitialLdapContext;
@@ -70,7 +71,6 @@
import org.opends.quicksetup.util.UIKeyStore;
import org.opends.quicksetup.util.Utils;
import org.forgerock.i18n.LocalizableMessage;
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.QuickSetupMessages.*;
@@ -105,8 +105,7 @@
  private String usedUrl;
  private static final Logger LOG =
    Logger.getLogger(LoginDialog.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Constructor of the LoginDialog.
@@ -437,13 +436,13 @@
      {
        if (throwable != null)
        {
          LOG.log(Level.INFO, "Error connecting: " + throwable, throwable);
          logger.debug(LocalizableMessage.raw("Error connecting: " + throwable, throwable));
          if (Utils.isCertificateException(throwable))
          {
            ApplicationTrustManager.Cause cause =
              trustManager.getLastRefusedCause();
            LOG.log(Level.INFO, "Certificate exception cause: "+cause);
            logger.debug(LocalizableMessage.raw("Certificate exception cause: "+cause));
            UserDataCertificateException.Type excType = null;
            if (cause == ApplicationTrustManager.Cause.NOT_TRUSTED)
            {
@@ -473,8 +472,8 @@
              }
              catch (Throwable t)
              {
                LOG.log(Level.WARNING,
                    "Error parsing ldap url of ldap url.", t);
                logger.warn(LocalizableMessage.raw(
                    "Error parsing ldap url of ldap url.", t));
                h = INFO_NOT_AVAILABLE_LABEL.get().toString();
                p = -1;
              }
@@ -551,8 +550,8 @@
          else
          {
            // This is a bug
            LOG.log(Level.SEVERE, "Unexpected throwable: "+throwable,
                throwable);
            logger.error(LocalizableMessage.raw("Unexpected throwable: "+throwable,
                throwable));
            displayError(
                Utils.getThrowableMsg(INFO_BUG_MSG.get(), throwable),
                INFO_ERROR_TITLE.get());
@@ -667,7 +666,7 @@
      if ((chain != null) && (authType != null) && (host != null))
      {
        LOG.log(Level.INFO, "Accepting certificate presented by host "+host);
        logger.debug(LocalizableMessage.raw("Accepting certificate presented by host "+host));
        getTrustManager().acceptCertificate(chain, authType, host);
        /* Simulate a click on the OK by calling in the okClicked method. */
        SwingUtilities.invokeLater(new Runnable()
@@ -682,18 +681,18 @@
      {
        if (chain == null)
        {
          LOG.log(Level.WARNING,
              "The chain is null for the UserDataCertificateException");
          logger.warn(LocalizableMessage.raw(
              "The chain is null for the UserDataCertificateException"));
        }
        if (authType == null)
        {
          LOG.log(Level.WARNING,
              "The auth type is null for the UserDataCertificateException");
          logger.warn(LocalizableMessage.raw(
              "The auth type is null for the UserDataCertificateException"));
        }
        if (host == null)
        {
          LOG.log(Level.WARNING,
              "The host is null for the UserDataCertificateException");
          logger.warn(LocalizableMessage.raw(
              "The host is null for the UserDataCertificateException"));
        }
      }
    }
@@ -709,7 +708,7 @@
        }
        catch (Throwable t)
        {
          LOG.log(Level.WARNING, "Error accepting certificate: "+t, t);
          logger.warn(LocalizableMessage.raw("Error accepting certificate: "+t, t));
        }
      }
    }
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Application.java
@@ -52,8 +52,8 @@
import java.io.File;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.naming.NamingException;
import javax.naming.ldap.InitialLdapContext;
@@ -64,8 +64,7 @@
 */
public abstract class Application implements ProgressNotifier, Runnable {
  static private final Logger LOG =
          Logger.getLogger(Application.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /** Represents current install state. */
  protected CurrentInstallStatus installStatus;
@@ -106,15 +105,15 @@
        appClass = Class.forName(appClassName);
        app = (GuiApplication) appClass.newInstance();
      } catch (ClassNotFoundException e) {
        LOG.log(Level.INFO, "error creating quicksetup application", e);
        logger.debug(LocalizableMessage.raw("error creating quicksetup application", e));
        String msg = "Application class " + appClass + " not found";
        throw new RuntimeException(msg, e);
      } catch (IllegalAccessException e) {
        LOG.log(Level.INFO, "error creating quicksetup application", e);
        logger.debug(LocalizableMessage.raw("error creating quicksetup application", e));
        String msg = "Could not access class " + appClass;
        throw new RuntimeException(msg, e);
      } catch (InstantiationException e) {
        LOG.log(Level.INFO, "error creating quicksetup application", e);
        logger.debug(LocalizableMessage.raw("error creating quicksetup application", e));
        String msg = "Error instantiating class " + appClass;
        throw new RuntimeException(msg, e);
      } catch (ClassCastException e) {
@@ -533,7 +532,7 @@
        }
        catch (Throwable t)
        {
          LOG.log(Level.WARNING, "Error retrieving UI key store: "+t, t);
          logger.warn(LocalizableMessage.raw("Error retrieving UI key store: "+t, t));
          trustManager = new ApplicationTrustManager(null);
        }
      }
@@ -837,7 +836,7 @@
      notifyListeners(mb.toMessage());
      applicationPrintStreamReceived(msg);
      LOG.log(Level.INFO, msg);
      logger.debug(LocalizableMessage.raw(msg));
      isFirstLine = false;
    }
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/BuildInformation.java
@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2006-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2011-2013 ForgeRock AS
 *      Portions Copyright 2011-2014 ForgeRock AS
 */
package org.opends.quicksetup;
@@ -38,8 +38,9 @@
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
import java.util.logging.Logger;
import java.util.logging.Level;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
import java.io.InputStream;
@@ -54,8 +55,7 @@
 */
public class BuildInformation implements Comparable<BuildInformation> {
  static private final Logger LOG =
          Logger.getLogger(BuildInformation.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Reads build information for a particular installation by reading the
@@ -107,7 +107,7 @@
              }
              catch (Throwable t)
              {
                LOG.log(Level.WARNING, "Error writing to process: "+t, t);
                logger.warn(LocalizableMessage.raw("Error writing to process: "+t, t));
              }
            }
          }
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/CliUserInteraction.java
@@ -41,16 +41,15 @@
import org.opends.server.util.cli.MenuResult;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
/**
 * Supports user interactions for a command line driven application.
 */
public class CliUserInteraction extends ConsoleApplication
        implements UserInteraction {
  static private final Logger LOG =
    Logger.getLogger(CliUserInteraction.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  private final boolean isInteractive;
  private final boolean isForceOnError;
@@ -142,7 +141,7 @@
      catch (CLIException ce)
      {
        respInt = defInt;
        LOG.log(Level.WARNING, "Error reading input: "+ce, ce);
        logger.warn(LocalizableMessage.raw("Error reading input: "+ce, ce));
      }
      if (fineDetails != null && respInt == options.length + 1) {
        println();
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/CurrentInstallStatus.java
@@ -34,8 +34,8 @@
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.quicksetup.util.Utils;
@@ -51,8 +51,7 @@
public class CurrentInstallStatus
{
  static private final Logger LOG =
          Logger.getLogger(CurrentInstallStatus.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  private boolean isInstalled;
@@ -177,7 +176,7 @@
      port = Installation.getLocal().getCurrentConfiguration().
              getPort();
    } catch (IOException ioe) {
      LOG.log(Level.INFO, "Failed to get port", ioe);
      logger.debug(LocalizableMessage.raw("Failed to get port", ioe));
    }
    return port;
  }
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Installation.java
@@ -33,10 +33,10 @@
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.FutureTask;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.quicksetup.util.Utils;
import org.opends.server.util.SetupUtils;
@@ -395,8 +395,7 @@
  static private final Logger LOG = Logger.getLogger(Installation.class
      .getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  private File rootDirectory;
@@ -491,12 +490,12 @@
      try
      {
        BuildInformation bi = getBuildInformation();
        LOG.log(Level.INFO, "build info for " + rootDirectory.getName() + ": "
            + bi);
        logger.debug(LocalizableMessage.raw("build info for " + rootDirectory.getName() + ": "
            + bi));
      }
      catch (ApplicationException e)
      {
        LOG.log(Level.INFO, "error determining build information", e);
        logger.debug(LocalizableMessage.raw("error determining build information", e));
      }
    }
  }
@@ -524,12 +523,12 @@
      try
      {
        BuildInformation bi = getBuildInformation();
        LOG.log(Level.INFO, "build info for " + instanceDirectory.getName()
            + ": " + bi);
        logger.debug(LocalizableMessage.raw("build info for " + instanceDirectory.getName()
            + ": " + bi));
      }
      catch (ApplicationException e)
      {
        LOG.log(Level.INFO, "error determining build information", e);
        logger.debug(LocalizableMessage.raw("error determining build information", e));
      }
    }
  }
@@ -1142,7 +1141,7 @@
      }
      catch (InterruptedException e)
      {
        LOG.log(Level.INFO, "interrupted trying to get build information", e);
        logger.debug(LocalizableMessage.raw("interrupted trying to get build information", e));
      }
      catch (ExecutionException e)
      {
@@ -1215,8 +1214,8 @@
      }
      catch (Exception e)
      {
        LOG.log(Level.SEVERE, "error getting build information for "
            + "current instance", e);
        logger.error(LocalizableMessage.raw("error getting build information for "
            + "current instance", e));
      }
    }
    return instanceInformation;
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Launcher.java
@@ -38,8 +38,8 @@
import java.io.PrintStream;
import java.io.File;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
/**
 * Responsible for providing initial evaluation of command line arguments
@@ -47,7 +47,7 @@
 */
public abstract class Launcher {
  static private final Logger LOG = Logger.getLogger(Launcher.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /** Arguments with which this launcher was invoked. */
  protected String[] args;
@@ -212,7 +212,7 @@
        {
          if (QuickSetupLog.isInitialized())
          {
            LOG.log(Level.WARNING, "Error launching GUI: "+t);
            logger.warn(LocalizableMessage.raw("Error launching GUI: "+t));
            StringBuilder buf = new StringBuilder();
            while (t != null)
            {
@@ -227,7 +227,7 @@
                buf.append("Root cause:\n");
              }
            }
            LOG.log(Level.WARNING, buf.toString());
            logger.warn(LocalizableMessage.raw(buf.toString()));
          }
        }
      }
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/QuickSetupCli.java
@@ -27,8 +27,9 @@
package org.opends.quicksetup;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.quicksetup.util.ProgressMessageFormatter;
import org.opends.quicksetup.util.PlainTextProgressMessageFormatter;
@@ -37,7 +38,6 @@
import org.opends.quicksetup.event.ProgressUpdateEvent;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.cli.CLIException;
import org.forgerock.i18n.LocalizableMessage;
/**
 * Class used by Launcher to start a CLI application.
@@ -52,8 +52,7 @@
  private UserData userData;
  static private final Logger LOG =
    Logger.getLogger(QuickSetupCli.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Creates a QuickSetupCli instance.
@@ -108,7 +107,7 @@
                  });
        }
        Thread appThread = new Thread(cliApp, "CLI Application");
        LOG.log(Level.INFO, "Launching application");
        logger.debug(LocalizableMessage.raw("Launching application"));
        appThread.start();
        while (!Thread.State.TERMINATED.equals(appThread.getState())) {
          try {
@@ -118,12 +117,12 @@
          }
        }
        returnValue = cliApp.getReturnCode();
        LOG.log(Level.INFO, "Application returnValue: "+returnValue);
        logger.debug(LocalizableMessage.raw("Application returnValue: "+returnValue));
        if (returnValue == null) {
          ApplicationException ue = cliApp.getRunError();
          if (ue != null)
          {
            LOG.log(Level.INFO, "Application run error: "+ue, ue);
            logger.debug(LocalizableMessage.raw("Application run error: "+ue, ue));
            returnValue = ue.getType();
          }
          else
@@ -140,7 +139,7 @@
    }
    catch (UserDataException uude)
    {
      LOG.log(Level.SEVERE, "UserDataException: "+uude, uude);
      logger.error(LocalizableMessage.raw("UserDataException: "+uude, uude));
      System.err.println();
      System.err.println(StaticUtils.wrapText(uude.getLocalizedMessage(),
              Utils.getCommandLineMaxLineWidth()));
@@ -156,7 +155,7 @@
    }
    catch (ApplicationException ae)
    {
      LOG.log(Level.SEVERE, "ApplicationException: "+ae, ae);
      logger.error(LocalizableMessage.raw("ApplicationException: "+ae, ae));
      System.err.println();
      System.err.println(ae.getLocalizedMessage());
      System.err.println();
@@ -164,10 +163,10 @@
    }
    catch (Throwable t)
    {
      LOG.log(Level.SEVERE, "Unexpected error: "+t, t);
      logger.error(LocalizableMessage.raw("Unexpected error: "+t, t));
      returnValue = ReturnCode.UNKNOWN;
    }
    LOG.log(Level.INFO, "returnValue: "+returnValue.getReturnCode());
    logger.debug(LocalizableMessage.raw("returnValue: "+returnValue.getReturnCode()));
    return returnValue;
  }
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/QuickSetupLog.java
@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2008-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2011-2013 ForgeRock AS
 *      Portions Copyright 2011-2014 ForgeRock AS
 */
package org.opends.quicksetup;
@@ -30,9 +30,9 @@
import java.io.File;
import java.io.IOException;
import java.util.logging.FileHandler;
import java.util.logging.SimpleFormatter;
import java.util.logging.Logger;
import java.util.logging.Level;
import java.util.logging.SimpleFormatter;
import java.util.Date;
import java.text.DateFormat;
@@ -59,7 +59,7 @@
      logger.addHandler(fileHandler);
      disableConsoleLogging();
      logger = Logger.getLogger("org.opends.quicksetup");
      logger.log(Level.INFO, getInitialLogRecord());
      logger.info(getInitialLogRecord());
    }
  }
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -33,8 +33,9 @@
import java.io.IOException;
import java.net.URI;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.naming.*;
import javax.naming.directory.*;
@@ -46,7 +47,6 @@
import org.opends.admin.ads.util.ApplicationTrustManager;
import org.opends.admin.ads.util.ConnectionUtils;
import org.opends.admin.ads.util.PreferredConnection;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.quicksetup.*;
import org.opends.quicksetup.event.ButtonActionListener;
@@ -101,7 +101,7 @@
  // Constants used to do checks
  private static final int MIN_DIRECTORY_MANAGER_PWD = 1;
  private static final Logger LOG = Logger.getLogger(Installer.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The minimum integer value that can be used for a port.
@@ -232,7 +232,7 @@
          }
          catch (Throwable t)
          {
            LOG.log(Level.WARNING, "Error getting connect timeout: "+t, t);
            logger.warn(LocalizableMessage.raw("Error getting connect timeout: "+t, t));
          }
        }
        break;
@@ -789,7 +789,7 @@
      try {
        new InstallerHelper().disableWindowsService();
      } catch (ApplicationException ae) {
        LOG.log(Level.INFO, "Error disabling Windows service", ae);
        logger.debug(LocalizableMessage.raw("Error disabling Windows service", ae));
      }
    }
@@ -1000,7 +1000,7 @@
      }
      nextPassword = "-w".equals(s);
    }
    LOG.log(Level.INFO, "configure DS cmd: "+cmd);
    logger.debug(LocalizableMessage.raw("configure DS cmd: "+cmd));
    final InstallerHelper helper = new InstallerHelper();
    setNotifyListeners(false);
    InvokeThread thread = new InvokeThread()
@@ -1199,7 +1199,7 @@
    }
    catch (Throwable t)
    {
      LOG.log(Level.SEVERE, "Error configuring certificate: "+t, t);
      logger.error(LocalizableMessage.raw("Error configuring certificate: "+t, t));
      throw new ApplicationException(
          ReturnCode.CONFIGURATION_ERROR,
          getThrowableMsg(INFO_ERROR_CONFIGURING_CERTIFICATE.get(),
@@ -1959,8 +1959,8 @@
          {
            replicationPort = Constants.DEFAULT_REPLICATION_PORT;
            enableSecureReplication = false;
            LOG.log(Level.WARNING, "Could not find replication port for: "+
                getHostPort(server));
            logger.warn(LocalizableMessage.raw("Could not find replication port for: "+
                getHostPort(server)));
          }
        }
        Set<String> dns = new HashSet<String>();
@@ -1994,8 +1994,8 @@
          }
          else
          {
            LOG.log(Level.WARNING, "Could not find replication server for: "+
                dn);
            logger.warn(LocalizableMessage.raw("Could not find replication server for: "+
                dn));
          }
        }
@@ -2198,7 +2198,7 @@
    }
    catch (IOException ioe)
    {
      LOG.log(Level.WARNING, "Error writing host name file: "+ioe, ioe);
      logger.warn(LocalizableMessage.raw("Error writing host name file: "+ioe, ioe));
    }
    finally
    {
@@ -2232,7 +2232,7 @@
      InstallerHelper helper = new InstallerHelper();
      helper.writeSetOpenDSJavaHome(getUserData(), getInstallationPath());
    } catch (Exception e) {
      LOG.log(Level.WARNING, "Error writing OpenDJ Java Home file: "+e, e);
      logger.warn(LocalizableMessage.raw("Error writing OpenDJ Java Home file: "+e, e));
    }
  }
@@ -2512,17 +2512,17 @@
        {
          try
          {
            LOG.log(Level.INFO, "Calling initializeSuffix with base DN: "+dn);
            LOG.log(Level.INFO, "Try number: "+(6 - nTries));
            LOG.log(Level.INFO, "replicationId of source replica: "+
                replicationId);
            logger.debug(LocalizableMessage.raw("Calling initializeSuffix with base DN: "+dn));
            logger.debug(LocalizableMessage.raw("Try number: "+(6 - nTries)));
            logger.debug(LocalizableMessage.raw("replicationId of source replica: "+
                replicationId));
            initializeSuffix(ctx, replicationId, dn, !isADS && !isSchema,
                hostPort);
            initDone = true;
          }
          catch (PeerNotFoundException pnfe)
          {
            LOG.log(Level.INFO, "Peer could not be found");
            logger.debug(LocalizableMessage.raw("Peer could not be found"));
            if (nTries == 1)
            {
              throw new ApplicationException(
@@ -2650,8 +2650,8 @@
      if (0 == adsContext.registerOrUpdateServer(server.getAdsProperties())) {
        if (isRemoteServer) registeredNewServerOnRemote = true;
      } else {
        LOG.log(Level.WARNING, "Server was already registered. Updating " +
                "server registration.");
        logger.warn(LocalizableMessage.raw("Server was already registered. Updating " +
                "server registration."));
      }
      if (isRemoteServer)
      {
@@ -3582,7 +3582,7 @@
              {
                cause = e.getTrustManager().getLastRefusedCause();
              }
              LOG.log(Level.INFO, "Certificate exception cause: "+cause);
              logger.debug(LocalizableMessage.raw("Certificate exception cause: "+cause));
              if (cause == ApplicationTrustManager.Cause.NOT_TRUSTED)
              {
                excType = UserDataCertificateException.Type.NOT_TRUSTED;
@@ -3608,8 +3608,8 @@
                }
                catch (Throwable t)
                {
                  LOG.log(Level.WARNING,
                      "Error parsing ldap url of TopologyCacheException.", t);
                  logger.warn(LocalizableMessage.raw(
                      "Error parsing ldap url of TopologyCacheException.", t));
                  h = INFO_NOT_AVAILABLE_LABEL.get().toString();
                  p = -1;
                }
@@ -3645,13 +3645,13 @@
    }
    catch (Throwable t)
    {
      LOG.log(Level.INFO, "Error connecting to remote server.", t);
      logger.debug(LocalizableMessage.raw("Error connecting to remote server.", t));
      if (isCertificateException(t))
      {
        UserDataCertificateException.Type excType;
        ApplicationTrustManager.Cause cause =
          trustManager.getLastRefusedCause();
        LOG.log(Level.INFO, "Certificate exception cause: "+cause);
        logger.debug(LocalizableMessage.raw("Certificate exception cause: "+cause));
        if (cause == ApplicationTrustManager.Cause.NOT_TRUSTED)
        {
          excType = UserDataCertificateException.Type.NOT_TRUSTED;
@@ -4418,16 +4418,16 @@
      {
        DirContext dirCtx = ctx.createSubcontext(dn, attrs);
        taskCreated = true;
        LOG.log(Level.INFO, "created task entry: "+attrs);
        logger.debug(LocalizableMessage.raw("created task entry: "+attrs));
        dirCtx.close();
      }
      catch (NameAlreadyBoundException x)
      {
        LOG.log(Level.WARNING, "A task with dn: "+dn+" already existed.");
        logger.warn(LocalizableMessage.raw("A task with dn: "+dn+" already existed."));
      }
      catch (NamingException ne)
      {
        LOG.log(Level.SEVERE, "Error creating task "+attrs, ne);
        logger.error(LocalizableMessage.raw("Error creating task "+attrs, ne));
        throw new ApplicationException(
            ReturnCode.APPLICATION_ERROR,
                getThrowableMsg(INFO_ERROR_LAUNCHING_INITIALIZATION.get(
@@ -4556,7 +4556,7 @@
          if (((currentTime - minRefreshPeriod) > lastTimeMsgLogged))
          {
            lastTimeMsgLogged = currentTime;
            LOG.log(Level.INFO, "Progress msg: "+msg);
            logger.debug(LocalizableMessage.raw("Progress msg: "+msg));
          }
          if (displayProgress)
          {
@@ -4576,7 +4576,7 @@
        {
          if (!logMsg.equals(lastLogMsg))
          {
            LOG.log(Level.INFO, logMsg);
            logger.debug(LocalizableMessage.raw(logMsg));
            lastLogMsg = logMsg;
          }
        }
@@ -4587,7 +4587,7 @@
        {
          isOver = true;
          LocalizableMessage errorMsg;
          LOG.log(Level.INFO, "Last task entry: "+sr);
          logger.debug(LocalizableMessage.raw("Last task entry: "+sr));
          if (displayProgress && (msg != null) && !msg.equals(lastDisplayedMsg))
          {
            notifyListeners(getFormattedProgress(msg));
@@ -4607,7 +4607,7 @@
                    sourceServerDisplay);
          }
          LOG.log(Level.WARNING, "Processed errorMsg: "+errorMsg);
          logger.warn(LocalizableMessage.raw("Processed errorMsg: "+errorMsg));
          if (helper.isCompletedWithErrors(state))
          {
            if (displayProgress)
@@ -4624,20 +4624,20 @@
            if ((lastLogMsg == null) ||
                helper.isPeersNotFoundError(lastLogMsg))
            {
              LOG.log(Level.WARNING, "Throwing peer not found error.  "+
                  "Last Log Msg: "+lastLogMsg);
              logger.warn(LocalizableMessage.raw("Throwing peer not found error.  "+
                  "Last Log Msg: "+lastLogMsg));
              // Assume that this is a peer not found error.
              throw new PeerNotFoundException(errorMsg);
            }
            else
            {
              LOG.log(Level.SEVERE, "Throwing ApplicationException.");
              logger.error(LocalizableMessage.raw("Throwing ApplicationException."));
              throw ae;
            }
          }
          else if (displayProgress)
          {
            LOG.log(Level.INFO, "Initialization completed successfully.");
            logger.debug(LocalizableMessage.raw("Initialization completed successfully."));
            notifyListeners(getFormattedProgress(
                INFO_SUFFIX_INITIALIZED_SUCCESSFULLY.get()));
            notifyListeners(getLineBreak());
@@ -4647,7 +4647,7 @@
      catch (NameNotFoundException x)
      {
        isOver = true;
        LOG.log(Level.INFO, "Initialization entry not found.");
        logger.debug(LocalizableMessage.raw("Initialization entry not found."));
        if (displayProgress)
        {
          notifyListeners(getFormattedProgress(
@@ -4727,7 +4727,7 @@
      {
        DirContext dirCtx = ctx.createSubcontext(dn, attrs);
        taskCreated = true;
        LOG.log(Level.INFO, "created task entry: "+attrs);
        logger.debug(LocalizableMessage.raw("created task entry: "+attrs));
        dirCtx.close();
      }
      catch (NameAlreadyBoundException x)
@@ -4735,7 +4735,7 @@
      }
      catch (NamingException ne)
      {
        LOG.log(Level.SEVERE, "Error creating task "+attrs, ne);
        logger.error(LocalizableMessage.raw("Error creating task "+attrs, ne));
        throw new ApplicationException(
            ReturnCode.APPLICATION_ERROR,
                getThrowableMsg(INFO_ERROR_LAUNCHING_INITIALIZATION.get(
@@ -4779,7 +4779,7 @@
        {
          if (!logMsg.equals(lastLogMsg))
          {
            LOG.log(Level.INFO, logMsg);
            logger.debug(LocalizableMessage.raw(logMsg));
            lastLogMsg = logMsg;
          }
        }
@@ -4804,13 +4804,13 @@
          if (helper.isCompletedWithErrors(state))
          {
            LOG.log(Level.WARNING, "Completed with error: "+errorMsg);
            logger.warn(LocalizableMessage.raw("Completed with error: "+errorMsg));
            notifyListeners(getFormattedWarning(errorMsg));
          }
          else if (!helper.isSuccessful(state) ||
              helper.isStoppedByError(state))
          {
            LOG.log(Level.WARNING, "Error: "+errorMsg);
            logger.warn(LocalizableMessage.raw("Error: "+errorMsg));
            throw new ApplicationException(
                ReturnCode.APPLICATION_ERROR, errorMsg,
                null);
@@ -4856,7 +4856,7 @@
          }
          catch (Throwable t)
          {
            LOG.log(Level.WARNING, "Error cancelling thread: "+t, t);
            logger.warn(LocalizableMessage.raw("Error cancelling thread: "+t, t));
          }
        }
        else if (thread.getException() != null)
@@ -4879,12 +4879,12 @@
    }
    catch (ApplicationException e)
    {
      LOG.log(Level.SEVERE, "Error: "+e, e);
      logger.error(LocalizableMessage.raw("Error: "+e, e));
      throw e;
    }
    catch (Throwable t)
    {
      LOG.log(Level.SEVERE, "Error: "+t, t);
      logger.error(LocalizableMessage.raw("Error: "+t, t));
      throw new ApplicationException(ReturnCode.BUG,
          Utils.getThrowableMsg(INFO_BUG_MSG.get(), t), t);
    }
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
@@ -36,8 +36,9 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.naming.ldap.InitialLdapContext;
@@ -65,7 +66,6 @@
import org.opends.messages.CoreMessages;
import org.opends.messages.JebMessages;
import org.opends.messages.ReplicationMessages;
import org.forgerock.i18n.LocalizableMessage;
import static org.opends.messages.QuickSetupMessages.*;
import org.opends.server.tools.ConfigureDS;
@@ -94,8 +94,7 @@
 * are not necessarily loaded when we create this class.
 */
public class InstallerHelper {
  private static final Logger LOG = Logger.getLogger(
      InstallerHelper.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  private static final int MAX_ID_VALUE = Short.MAX_VALUE;
@@ -147,7 +146,7 @@
    String[] allArgs = new String[argList.size()];
    argList.toArray(allArgs);
    LOG.log(Level.INFO, "import-ldif arg list: "+argList);
    logger.debug(LocalizableMessage.raw("import-ldif arg list: "+argList));
    ProcessBuilder pb = new ProcessBuilder(allArgs);
    Map<String, String> env = pb.environment();
    env.remove(SetupUtils.OPENDJ_JAVA_HOME);
@@ -165,7 +164,7 @@
        @Override
        public void processLine(String line)
        {
          LOG.log(Level.WARNING, "import-ldif error log: "+line);
          logger.warn(LocalizableMessage.raw("import-ldif error log: "+line));
          application.notifyListeners(LocalizableMessage.raw(line));
          application.notifyListeners(application.getLineBreak());
        }
@@ -177,7 +176,7 @@
        @Override
        public void processLine(String line)
        {
          LOG.log(Level.INFO, "import-ldif out log: "+line);
          logger.debug(LocalizableMessage.raw("import-ldif out log: "+line));
          application.notifyListeners(LocalizableMessage.raw(line));
          application.notifyListeners(application.getLineBreak());
        }
@@ -194,7 +193,7 @@
        }
        catch (Throwable t)
        {
          LOG.log(Level.WARNING, "Error closing error stream: "+t, t);
          logger.warn(LocalizableMessage.raw("Error closing error stream: "+t, t));
        }
        try
        {
@@ -202,7 +201,7 @@
        }
        catch (Throwable t)
        {
          LOG.log(Level.WARNING, "Error closing output stream: "+t, t);
          logger.warn(LocalizableMessage.raw("Error closing output stream: "+t, t));
        }
      }
    }
@@ -1185,8 +1184,8 @@
      returnValue !=
        JavaPropertiesTool.ErrorReturnCode.SUCCESSFUL_NOP.getReturnCode())
    {
      LOG.log(Level.WARNING, "Error creating java home scripts, error code: "+
          returnValue);
      logger.warn(LocalizableMessage.raw("Error creating java home scripts, error code: "+
          returnValue));
      throw new IOException(
          ERR_ERROR_CREATING_JAVA_HOME_SCRIPTS.get(returnValue).toString());
    }
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java
@@ -37,8 +37,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.security.KeyStoreException;
import org.opends.quicksetup.ApplicationException;
@@ -80,8 +80,7 @@
  private ApplicationException runError;
  private static final Logger LOG =
    Logger.getLogger(OfflineInstaller.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Actually performs the install in this thread.  The thread is blocked.
@@ -228,7 +227,7 @@
    } catch (ApplicationException ex)
    {
      LOG.log(Level.SEVERE, "Caught exception: "+ex, ex);
      logger.error(LocalizableMessage.raw("Caught exception: "+ex, ex));
      if (ReturnCode.CANCELED.equals(ex.getType())) {
        uninstall();
        setCurrentProgressStep(InstallProgressStep.FINISHED_CANCELED);
@@ -249,7 +248,7 @@
              notifyListeners(getFormattedDoneWithLineBreak());
            }
          } catch (Throwable t) {
            LOG.log(Level.INFO, "error stopping server", t);
            logger.debug(LocalizableMessage.raw("error stopping server", t));
          }
        }
        notifyListeners(getLineBreak());
@@ -257,7 +256,7 @@
        setCurrentProgressStep(InstallProgressStep.FINISHED_WITH_ERROR);
        LocalizableMessage html = getFormattedError(ex, true);
        notifyListeners(html);
        LOG.log(Level.SEVERE, "Error installing.", ex);
        logger.error(LocalizableMessage.raw("Error installing.", ex));
        notifyListeners(getLineBreak());
        notifyListenersOfLogAfterError();
      }
@@ -280,7 +279,7 @@
            notifyListeners(getFormattedDoneWithLineBreak());
          }
        } catch (Throwable t2) {
          LOG.log(Level.INFO, "error stopping server", t2);
          logger.debug(LocalizableMessage.raw("error stopping server", t2));
        }
      }
      notifyListeners(getLineBreak());
@@ -291,7 +290,7 @@
          Utils.getThrowableMsg(INFO_BUG_MSG.get(), t), t);
      LocalizableMessage msg = getFormattedError(ex, true);
      notifyListeners(msg);
      LOG.log(Level.SEVERE, "Error installing.", t);
      logger.error(LocalizableMessage.raw("Error installing.", t));
      notifyListeners(getLineBreak());
      notifyListenersOfLogAfterError();
      runError = ex;
@@ -363,7 +362,7 @@
          notifyListeners(getFormattedDoneWithLineBreak());
        }
      } catch (ApplicationException e) {
        LOG.log(Level.INFO, "error stopping server", e);
        logger.debug(LocalizableMessage.raw("error stopping server", e));
      }
    }
@@ -377,7 +376,7 @@
      fm.rename(newConfig, installation.getCurrentConfigurationFile());
    } catch (ApplicationException ae) {
      LOG.log(Level.INFO, "failed to restore base configuration", ae);
      logger.debug(LocalizableMessage.raw("failed to restore base configuration", ae));
    }
    // Cleanup SSL if necessary
@@ -392,7 +391,7 @@
        try {
          cm.removeCertificate(SELF_SIGNED_CERT_ALIAS);
        } catch (KeyStoreException e) {
          LOG.log(Level.INFO, "Error deleting self signed certification", e);
          logger.debug(LocalizableMessage.raw("Error deleting self signed certification", e));
        }
      }
@@ -402,7 +401,7 @@
        try {
          fm.delete(keystore);
        } catch (ApplicationException e) {
          LOG.log(Level.INFO, "Failed to delete keystore", e);
          logger.debug(LocalizableMessage.raw("Failed to delete keystore", e));
        }
      }
@@ -412,7 +411,7 @@
        try {
          fm.delete(keystorePin);
        } catch (ApplicationException e) {
          LOG.log(Level.INFO, "Failed to delete keystore.pin", e);
          logger.debug(LocalizableMessage.raw("Failed to delete keystore.pin", e));
        }
      }
@@ -422,7 +421,7 @@
        try {
          fm.delete(truststore);
        } catch (ApplicationException e) {
          LOG.log(Level.INFO, "Failed to delete truststore", e);
          logger.debug(LocalizableMessage.raw("Failed to delete truststore", e));
        }
      }
    }
@@ -431,7 +430,7 @@
    try {
      fm.deleteChildren(installation.getDatabasesDirectory());
    } catch (ApplicationException e) {
      LOG.log(Level.INFO, "Error deleting databases", e);
      logger.debug(LocalizableMessage.raw("Error deleting databases", e));
    }
    if (!isVerbose())
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
@@ -35,8 +35,9 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.quicksetup.ApplicationException;
import org.opends.quicksetup.LicenseFile;
@@ -51,7 +52,6 @@
import org.opends.quicksetup.util.FileManager;
import org.opends.server.util.SetupUtils;
import org.forgerock.i18n.LocalizableMessage;
import static org.opends.messages.QuickSetupMessages.*;
/**
@@ -87,8 +87,7 @@
  private final Map<ProgressStep, LocalizableMessage> hmSummary =
      new HashMap<ProgressStep, LocalizableMessage>();
  private static final Logger LOG =
    Logger.getLogger(WebStartInstaller.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * WebStartInstaller constructor.
@@ -144,7 +143,7 @@
      }
      catch (Throwable t)
      {
        LOG.log(Level.INFO, "Error closing zip input stream: "+t, t);
        logger.debug(LocalizableMessage.raw("Error closing zip input stream: "+t, t));
      }
      checkAbort();
@@ -294,7 +293,7 @@
              notifyListeners(getFormattedDoneWithLineBreak());
            }
          } catch (Throwable t) {
            LOG.log(Level.INFO, "error stopping server", t);
            logger.debug(LocalizableMessage.raw("error stopping server", t));
          }
        }
        notifyListeners(getLineBreak());
@@ -302,7 +301,7 @@
        setCurrentProgressStep(InstallProgressStep.FINISHED_WITH_ERROR);
        LocalizableMessage html = getFormattedError(ex, true);
        notifyListeners(html);
        LOG.log(Level.SEVERE, "Error installing.", ex);
        logger.error(LocalizableMessage.raw("Error installing.", ex));
        notifyListeners(getLineBreak());
        notifyListenersOfLogAfterError();
      }
@@ -315,7 +314,7 @@
        try {
          new ServerController(installation).stopServer(true);
        } catch (Throwable t2) {
          LOG.log(Level.INFO, "error stopping server", t2);
          logger.debug(LocalizableMessage.raw("error stopping server", t2));
        }
      }
      notifyListeners(getLineBreak());
@@ -326,7 +325,7 @@
          Utils.getThrowableMsg(INFO_BUG_MSG.get(), t), t);
      LocalizableMessage msg = getFormattedError(ex, true);
      notifyListeners(msg);
      LOG.log(Level.SEVERE, "Error installing.", t);
      logger.error(LocalizableMessage.raw("Error installing.", t));
      notifyListeners(getLineBreak());
      notifyListenersOfLogAfterError();
    }
@@ -576,7 +575,7 @@
        try {
          new ServerController(installation).stopServer(true);
        } catch (ApplicationException e) {
          LOG.log(Level.INFO, "error stopping server", e);
          logger.debug(LocalizableMessage.raw("error stopping server", e));
        }
      }
@@ -586,7 +585,7 @@
        fm.deleteRecursively(installation.getRootDirectory(), null,
            FileManager.DeletionPolicy.DELETE_ON_EXIT_IF_UNSUCCESSFUL);
      } catch (ApplicationException e) {
        LOG.log(Level.INFO, "error deleting files", e);
        logger.debug(LocalizableMessage.raw("error deleting files", e));
      }
    }
    else
@@ -608,7 +607,7 @@
          fm.deleteRecursively(serverRoot, null,
              FileManager.DeletionPolicy.DELETE_ON_EXIT_IF_UNSUCCESSFUL);
        } catch (ApplicationException e) {
          LOG.log(Level.INFO, "error deleting files", e);
          logger.debug(LocalizableMessage.raw("error deleting files", e));
        }
      }
    }
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/ui/CertificateDialog.java
@@ -44,8 +44,9 @@
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.naming.ldap.LdapName;
import javax.naming.ldap.Rdn;
@@ -66,7 +67,6 @@
import org.opends.quicksetup.UserDataCertificateException;
import org.opends.quicksetup.event.MinimumSizeComponentListener;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.messages.QuickSetupMessages.*;
@@ -105,8 +105,7 @@
  private String explanationWithHideDetails;
  private String explanationWithShowDetails;
  private static final Logger LOG = Logger.getLogger(
      CertificateDialog.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Constructor of the certificate dialog.
@@ -630,10 +629,10 @@
      msg = LocalizableMessage.raw(sb);
    }
    catch (NoSuchAlgorithmException nsae) {
      LOG.log(Level.WARNING, "SHA1 algorithm not supported: "+nsae, nsae);
      logger.warn(LocalizableMessage.raw("SHA1 algorithm not supported: "+nsae, nsae));
    }
    catch (CertificateEncodingException cee) {
      LOG.log(Level.WARNING, "Certificate encoding exception: "+cee, cee);
      logger.warn(LocalizableMessage.raw("Certificate encoding exception: "+cee, cee));
    }
    return msg;
  }
@@ -662,10 +661,10 @@
      msg = LocalizableMessage.raw(sb);
    }
    catch (NoSuchAlgorithmException nsae) {
      LOG.log(Level.WARNING, "MD5 algorithm not supported: "+nsae, nsae);
      logger.warn(LocalizableMessage.raw("MD5 algorithm not supported: "+nsae, nsae));
    }
    catch (CertificateEncodingException cee) {
      LOG.log(Level.WARNING, "Certificate encoding exception: "+cee, cee);
      logger.warn(LocalizableMessage.raw("Certificate encoding exception: "+cee, cee));
    }
    return msg;
  }
@@ -703,8 +702,8 @@
    }
    catch (Throwable t)
    {
      LOG.log(Level.WARNING, "Error parsing subject dn: "+
          cert.getSubjectX500Principal(), t);
      logger.warn(LocalizableMessage.raw("Error parsing subject dn: "+
          cert.getSubjectX500Principal(), t));
    }
    return name;
  }
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java
@@ -44,8 +44,8 @@
import java.security.cert.X509Certificate;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
/**
 * This class represents an application with a wizard GUI that can be run in the
@@ -54,8 +54,7 @@
 */
public abstract class GuiApplication extends Application {
  static private final Logger LOG =
          Logger.getLogger(GuiApplication.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /** The currently displayed wizard step. */
  private WizardStep displayedStep;
@@ -432,25 +431,25 @@
    if ((chain != null) && (authType != null) && (host != null))
    {
      LOG.log(Level.INFO, "Accepting certificate presented by host "+host);
      logger.debug(LocalizableMessage.raw("Accepting certificate presented by host "+host));
      getTrustManager().acceptCertificate(chain, authType, host);
    }
    else
    {
      if (chain == null)
      {
        LOG.log(Level.WARNING,
            "The chain is null for the UserDataCertificateException");
        logger.warn(LocalizableMessage.raw(
            "The chain is null for the UserDataCertificateException"));
      }
      if (authType == null)
      {
        LOG.log(Level.WARNING,
            "The auth type is null for the UserDataCertificateException");
        logger.warn(LocalizableMessage.raw(
            "The auth type is null for the UserDataCertificateException"));
      }
      if (host == null)
      {
        LOG.log(Level.WARNING,
            "The host is null for the UserDataCertificateException");
        logger.warn(LocalizableMessage.raw(
            "The host is null for the UserDataCertificateException"));
      }
    }
    if (acceptPermanently)
@@ -463,7 +462,7 @@
        }
        catch (Throwable t)
        {
          LOG.log(Level.WARNING, "Error accepting certificate: "+t, t);
          logger.warn(LocalizableMessage.raw("Error accepting certificate: "+t, t));
        }
      }
    }
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java
@@ -47,8 +47,8 @@
import java.awt.Cursor;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Logger;
import java.util.logging.Level;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.logging.Handler;
import java.util.Map;
@@ -75,8 +75,7 @@
public class QuickSetup implements ButtonActionListener, ProgressUpdateListener
{
  static private final Logger LOG =
          Logger.getLogger(QuickSetup.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  private GuiApplication application;
@@ -492,13 +491,14 @@
   */
  public void quit()
  {
    LOG.log(Level.INFO, "quitting application");
    logger.debug(LocalizableMessage.raw("quitting application"));
    flushLogs();
    System.exit(0);
  }
  private void flushLogs() {
    Handler[] handlers = LOG.getHandlers();
    java.util.logging.Logger julLogger = java.util.logging.Logger.getLogger(logger.getName());
    Handler[] handlers = julLogger.getHandlers();
    if (handlers != null) {
      for (Handler h : handlers) {
        h.flush();
@@ -728,7 +728,7 @@
      {
        if (!(throwable instanceof UserDataException))
        {
          LOG.log(Level.WARNING, "Unhandled exception.", throwable);
          logger.warn(LocalizableMessage.raw("Unhandled exception.", throwable));
        }
        else
        {
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java
@@ -30,8 +30,9 @@
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.util.HashSet;
import java.util.logging.Logger;
import java.util.logging.Level;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.swing.JButton;
import javax.swing.JFrame;
@@ -44,7 +45,6 @@
import org.opends.quicksetup.event.ButtonEvent;
import org.opends.quicksetup.event.MinimumSizeComponentListener;
import org.opends.quicksetup.ProgressDescriptor;
import org.forgerock.i18n.LocalizableMessage;
/**
 * This class represents the dialog used by quicksetup applications.
 *
@@ -58,8 +58,7 @@
 */
public class QuickSetupDialog
{
  static private final Logger LOG =
          Logger.getLogger(QuickSetupDialog.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  private JFrame frame;
@@ -424,8 +423,8 @@
    if (button != null) {
      button.requestFocusInWindow();
    } else {
      LOG.log(Level.INFO, "Focus requested for unknown button '" +
              buttonName + "'");
      logger.debug(LocalizableMessage.raw("Focus requested for unknown button '" +
              buttonName + "'"));
    }
  }
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java
@@ -38,8 +38,8 @@
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
import java.util.HashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.QuickSetupMessages.*;
@@ -58,7 +58,7 @@
  private static String parentPackagePath;
  private static final Logger LOG = Logger.getLogger(UIFactory.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Specifies the horizontal insets between buttons.
@@ -760,7 +760,7 @@
      catch (Throwable t)
      {
        // This might occur when we do not get the display
        LOG.log(Level.WARNING, "Error updating UIManager: "+t, t);
        logger.warn(LocalizableMessage.raw("Error updating UIManager: "+t, t));
      }
      initializeLookAndFeel();
      initialized = true;
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/FileManager.java
@@ -34,8 +34,8 @@
import java.io.*;
import java.util.logging.Logger;
import java.util.logging.Level;
import org.forgerock.i18n.slf4j.LocalizedLogger;
/**
 * Utility class for use by applications containing methods for managing
@@ -68,8 +68,7 @@
  }
  static private final Logger LOG =
          Logger.getLogger(FileManager.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  private Application application = null;
@@ -387,7 +386,7 @@
        application.notifyListeners(application.getFormattedWarning(
                INFO_FILE_DOES_NOT_EXIST.get(String.valueOf(file))));
      }
      LOG.log(Level.INFO, "file '" + file.toString() + "' does not exist");
      logger.debug(LocalizableMessage.raw("file '" + file.toString() + "' does not exist"));
    }
  }
@@ -490,9 +489,9 @@
                              objectFile.getAbsolutePath(),
                              destination.getAbsolutePath())));
            }
            LOG.log(Level.INFO, "copying file '" +
            logger.debug(LocalizableMessage.raw("copying file '" +
                    objectFile.getAbsolutePath() + "' to '" +
                    destination.getAbsolutePath() + "'");
                    destination.getAbsolutePath() + "'"));
            FileInputStream fis = null;
            FileOutputStream fos = null;
            try {
@@ -552,9 +551,9 @@
                    errMsg, null);
          }
        } else {
          LOG.log(Level.INFO, "Ignoring file '" +
          logger.debug(LocalizableMessage.raw("Ignoring file '" +
                  objectFile.getAbsolutePath() + "' since '" +
                  destination.getAbsolutePath() + "' already exists");
                  destination.getAbsolutePath() + "' already exists"));
          if ((application != null) && application.isVerbose()) {
            application.notifyListeners(
                    INFO_INFO_IGNORING_FILE.get(
@@ -611,9 +610,9 @@
                          file.getAbsolutePath())));
        }
      }
      LOG.log(Level.INFO, "deleting " +
      logger.debug(LocalizableMessage.raw("deleting " +
              (isFile ? " file " : " directory ") +
              file.getAbsolutePath());
              file.getAbsolutePath()));
      boolean delete = false;
      /*
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java
@@ -30,15 +30,15 @@
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.quicksetup.ui.UIFactory;
import org.opends.quicksetup.Constants;
import static org.opends.messages.QuickSetupMessages.*;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
/**
@@ -48,8 +48,7 @@
 */
public class HtmlProgressMessageFormatter implements ProgressMessageFormatter
{
  static private final Logger LOG =
          Logger.getLogger(HtmlProgressMessageFormatter.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  private LocalizableMessage doneHtml;
  private LocalizableMessage errorHtml;
@@ -415,7 +414,7 @@
    int index = lastTextStr.indexOf(urlText);
    if (index == -1)
    {
      LOG.log(Level.FINE, "lastText: " + lastText +
      logger.trace("lastText: " + lastText +
              "does not contain: " + urlText);
    } else
    {
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/OutputReader.java
@@ -22,20 +22,22 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.quicksetup.util;
import java.io.BufferedReader;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
/**
   * This class is used to read an input stream and process ouput.
 */
abstract public class OutputReader {
  static private Logger LOG = Logger.getLogger(OutputReader.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Called whenever new input is read from the reader.
@@ -57,7 +59,7 @@
            processLine(line);
          }
        } catch (Throwable t) {
          LOG.log(Level.INFO, "error reading output", t);
          logger.debug(LocalizableMessage.raw("error reading output"), t);
        }
      }
    });
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java
@@ -44,8 +44,8 @@
import java.util.ArrayList;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.IOException;
@@ -55,8 +55,7 @@
 */
public class ServerController {
  static private final Logger LOG =
          Logger.getLogger(ServerController.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  private Application application;
@@ -145,7 +144,7 @@
        mb.append(application.getLineBreak());
        application.notifyListeners(mb.toMessage());
      }
      LOG.log(Level.INFO, "stopping server");
      logger.debug(LocalizableMessage.raw("stopping server"));
      ArrayList<String> argList = new ArrayList<String>();
      argList.add(Utils.getScriptPath(
@@ -167,19 +166,19 @@
      env.remove(SetupUtils.OPENDJ_JAVA_ARGS);
      env.remove("CLASSPATH");
      LOG.log(Level.INFO, "Before calling stop-ds.  Is server running? "+
          installation.getStatus().isServerRunning());
      logger.debug(LocalizableMessage.raw("Before calling stop-ds.  Is server running? "+
          installation.getStatus().isServerRunning()));
      int stopTries = 3;
      while (stopTries > 0)
      {
        stopTries --;
        LOG.log(Level.INFO, "Launching stop command, stopTries left: "+
            stopTries);
        logger.debug(LocalizableMessage.raw("Launching stop command, stopTries left: "+
            stopTries));
        try
        {
          LOG.log(Level.INFO, "Launching stop command, argList: "+argList);
          logger.debug(LocalizableMessage.raw("Launching stop command, argList: "+argList));
          Process process = pb.start();
          BufferedReader err =
@@ -211,7 +210,7 @@
              boolean stopped = false;
              for (int i = 0; i < nTries && !stopped; i++) {
                LOG.log(Level.FINE, "waiting for server to stop");
                logger.trace("waiting for server to stop");
                try {
                  Thread.sleep(5000);
                }
@@ -220,8 +219,8 @@
                  // do nothing
                }
                stopped = !installation.getStatus().isServerRunning();
                LOG.log(Level.INFO,
                    "After calling stop-ds.  Is server running? "+!stopped);
                logger.debug(LocalizableMessage.raw(
                    "After calling stop-ds.  Is server running? "+!stopped));
                if (!stopped) {
                  if (application != null) {
@@ -250,7 +249,7 @@
              mb.append(application.getLineBreak());
              application.notifyListeners(mb.toMessage());
            }
            LOG.log(Level.INFO, "server already stopped");
            logger.debug(LocalizableMessage.raw("server already stopped"));
            break;
          } else if (returnValue != 0) {
            if (stopTries <= 0)
@@ -270,7 +269,7 @@
              application.notifyListeners(application.getFormattedLog(
                  INFO_PROGRESS_SERVER_STOPPED.get()));
            }
            LOG.log(Level.INFO, "server stopped");
            logger.debug(LocalizableMessage.raw("server stopped"));
            break;
          }
@@ -341,7 +340,7 @@
        mb.append(application.getLineBreak());
        application.notifyListeners(mb.toMessage());
      }
      LOG.log(Level.INFO, "starting server");
      logger.debug(LocalizableMessage.raw("starting server"));
      ArrayList<String> argList = new ArrayList<String>();
      argList.add(Utils.getScriptPath(
@@ -376,7 +375,7 @@
        int returnValue = process.waitFor();
        LOG.log(Level.INFO, "start-ds return value: "+returnValue);
        logger.debug(LocalizableMessage.raw("start-ds return value: "+returnValue));
        if (returnValue != 0)
        {
@@ -386,15 +385,15 @@
        }
        if (outputReader.isFinished())
        {
          LOG.log(Level.INFO, "Output reader finished.");
          logger.debug(LocalizableMessage.raw("Output reader finished."));
        }
        if (errReader.isFinished())
        {
          LOG.log(Level.INFO, "Error reader finished.");
          logger.debug(LocalizableMessage.raw("Error reader finished."));
        }
        if (!outputReader.startedIdFound() && !errReader.startedIdFound())
        {
          LOG.log(Level.WARNING, "Started ID could not be found");
          logger.warn(LocalizableMessage.raw("Started ID could not be found"));
        }
        // Check if something wrong occurred reading the starting of the server
@@ -488,7 +487,7 @@
            }
            catch (NamingException ne)
            {
              LOG.log(Level.WARNING, "Could not connect to server: "+ne, ne);
              logger.warn(LocalizableMessage.raw("Could not connect to server: "+ne, ne));
            }
            finally
            {
@@ -605,7 +604,7 @@
                application.notifyListeners(buf.toMessage());
                isFirstLine = false;
              }
              LOG.log(Level.INFO, "server: " + line);
              logger.debug(LocalizableMessage.raw("server: " + line));
              line = reader.readLine();
            }
          } catch (Throwable t) {
@@ -613,7 +612,7 @@
              LocalizableMessage errorMsg = getThrowableMsg(errorTag, t);
              application.notifyListeners(errorMsg);
            }
            LOG.log(Level.INFO, "error reading server messages",t);
            logger.debug(LocalizableMessage.raw("error reading server messages",t));
          }
        }
      });
@@ -695,7 +694,7 @@
                application.notifyListeners(buf.toMessage());
                isFirstLine = false;
              }
              LOG.log(Level.INFO, "server: " + line);
              logger.debug(LocalizableMessage.raw("server: " + line));
              if (line.toLowerCase().contains("=" + startedId))
              {
                isFinished = true;
@@ -705,7 +704,7 @@
            }
          } catch (Throwable t)
          {
            LOG.log(Level.WARNING, "Error reading output: "+t, t);
            logger.warn(LocalizableMessage.raw("Error reading output: "+t, t));
            ex = new ApplicationException(
                ReturnCode.START_ERROR,
                getThrowableMsg(errorTag, t), t);
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/UIKeyStore.java
@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2008-2010 Sun Microsystems, Inc.
 *      Portions copyright 2011-2013 ForgeRock AS
 *      Portions Copyright 2011-2014 ForgeRock AS
 */
package org.opends.quicksetup.util;
@@ -38,8 +38,9 @@
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.Enumeration;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
/**
 * Class used to get the KeyStore that the graphical utilities use.
@@ -49,8 +50,7 @@
{
  private static KeyStore keyStore = null;
  private static final Logger LOG = Logger.getLogger(
      UIKeyStore.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * This should never be called.
@@ -80,22 +80,22 @@
      File f = new File(keyStorePath);
      if (!f.exists())
      {
        LOG.log(Level.INFO, "Path "+keyStorePath+ " does not exist");
        logger.debug(LocalizableMessage.raw("Path "+keyStorePath+ " does not exist"));
        keyStorePath = null;
      }
      else if (f.isDirectory())
      {
        LOG.log(Level.SEVERE, "Path "+keyStorePath+ " is a directory");
        logger.error(LocalizableMessage.raw("Path "+keyStorePath+ " is a directory"));
        keyStorePath = null;
      }
      else if (!f.canRead())
      {
        LOG.log(Level.SEVERE, "Path "+keyStorePath+ " is not readable");
        logger.error(LocalizableMessage.raw("Path "+keyStorePath+ " is not readable"));
        keyStorePath = null;
      }
      else if (!f.canWrite())
      {
        LOG.log(Level.SEVERE, "Path "+keyStorePath+ " is not writable");
        logger.error(LocalizableMessage.raw("Path "+keyStorePath+ " is not writable"));
        keyStorePath = null;
      }
@@ -109,7 +109,7 @@
        }
        catch (Throwable t)
        {
          LOG.log(Level.SEVERE, "Error reading key store on "+keyStorePath, t);
          logger.error(LocalizableMessage.raw("Error reading key store on "+keyStorePath, t));
          keyStore.load(null, null);
        }
        fos.close();
@@ -137,7 +137,7 @@
      throws IOException,KeyStoreException, CertificateException,
      NoSuchAlgorithmException
  {
    LOG.log(Level.INFO, "Accepting certificate chain.");
    logger.debug(LocalizableMessage.raw("Accepting certificate chain."));
    KeyStore k = getInstance();
    for (X509Certificate aChain : chain) {
      if (!containsCertificate(aChain, k)) {
@@ -183,17 +183,17 @@
    File f = new File(adminTrustStorePath);
    if (!f.exists())
    {
      LOG.log(Level.INFO, "Path "+adminTrustStorePath+ " does not exist");
      logger.debug(LocalizableMessage.raw("Path "+adminTrustStorePath+ " does not exist"));
      adminTrustStorePath = null;
    }
    else if (f.isDirectory())
    {
      LOG.log(Level.SEVERE, "Path "+adminTrustStorePath+ " is a directory");
      logger.error(LocalizableMessage.raw("Path "+adminTrustStorePath+ " is a directory"));
      adminTrustStorePath = null;
    }
    else if (!f.canRead())
    {
      LOG.log(Level.SEVERE, "Path "+adminTrustStorePath+ " is not readable");
      logger.error(LocalizableMessage.raw("Path "+adminTrustStorePath+ " is not readable"));
      adminTrustStorePath = null;
    }
@@ -223,8 +223,8 @@
      }
      catch (Throwable t)
      {
        LOG.log(Level.SEVERE, "Error reading admin key store on "+
            adminTrustStorePath, t);
        logger.error(LocalizableMessage.raw("Error reading admin key store on "+
            adminTrustStorePath, t));
      }
      finally
      {
@@ -237,8 +237,8 @@
        }
        catch (Throwable t)
        {
          LOG.log(Level.SEVERE, "Error closing admin key store on "+
              adminTrustStorePath, t);
          logger.error(LocalizableMessage.raw("Error closing admin key store on "+
              adminTrustStorePath, t));
        }
      }
    }
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java
@@ -45,8 +45,9 @@
import java.net.InetAddress;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.naming.AuthenticationException;
import javax.naming.CommunicationException;
@@ -67,7 +68,6 @@
import org.opends.admin.ads.SuffixDescriptor;
import org.opends.admin.ads.TopologyCacheException;
import org.opends.admin.ads.util.ConnectionUtils;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.LocalizableMessageDescriptor;
import org.opends.quicksetup.*;
@@ -86,8 +86,7 @@
 */
public class Utils
{
  private static final Logger LOG =
          Logger.getLogger(Utils.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  private static final int BUFFER_SIZE = 1024;
@@ -149,8 +148,8 @@
      String installPath)
  {
    boolean supported = false;
    LOG.log(Level.INFO, "Checking if options "+option+
        " are supported with java home: "+javaHome);
    logger.debug(LocalizableMessage.raw("Checking if options "+option+
        " are supported with java home: "+javaHome));
    try
    {
      List<String> args = new ArrayList<String>();
@@ -181,13 +180,13 @@
        env.put("DO_NOT_PAUSE", "true");
      }
      final Process process = pb.start();
      LOG.log(Level.INFO, "launching "+args+ " with env: "+env);
      logger.debug(LocalizableMessage.raw("launching "+args+ " with env: "+env));
      InputStream is = process.getInputStream();
      BufferedReader reader = new BufferedReader(new InputStreamReader(is));
      String line;
      boolean errorDetected = false;
      while (null != (line = reader.readLine())) {
        LOG.log(Level.INFO, "The output: "+line);
        logger.debug(LocalizableMessage.raw("The output: "+line));
        if (line.contains("ERROR:  The detected Java version"))
        {
          if (Utils.isWindows())
@@ -220,13 +219,13 @@
      }
      process.waitFor();
      int returnCode = process.exitValue();
      LOG.log(Level.INFO, "returnCode: "+returnCode);
      logger.debug(LocalizableMessage.raw("returnCode: "+returnCode));
      supported = returnCode == 0 && !errorDetected;
      LOG.log(Level.INFO, "supported: "+supported);
      logger.debug(LocalizableMessage.raw("supported: "+supported));
    }
    catch (Throwable t)
    {
      LOG.log(Level.WARNING, "Error testing option "+option+" on "+javaHome, t);
      logger.warn(LocalizableMessage.raw("Error testing option "+option+" on "+javaHome, t));
    }
    return supported;
  }
@@ -789,7 +788,7 @@
    }
    else
    {
      LOG.log(Level.WARNING, "Unexpected error: "+te, te);
      logger.warn(LocalizableMessage.raw("Unexpected error: "+te, te));
      // This is unexpected.
      if (te.getCause() != null)
      {
@@ -1517,7 +1516,7 @@
    }
    catch (Throwable t)
    {
      LOG.log(Level.WARNING, "Error retrieving server current time: "+t, t);
      logger.warn(LocalizableMessage.raw("Error retrieving server current time: "+t, t));
    }
    return time;
  }
@@ -1597,7 +1596,7 @@
      }
      catch (Throwable t)
      {
        LOG.log(Level.WARNING, "Failing checking host names: "+t, t);
        logger.warn(LocalizableMessage.raw("Failing checking host names: "+t, t));
      }
    }
    else
@@ -2554,8 +2553,7 @@
 *
 */
class EmptyPrintStream extends PrintStream {
  private static final Logger LOG =
    Logger.getLogger(EmptyPrintStream.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Default constructor.
@@ -2572,6 +2570,6 @@
  @Override
  public void println(String msg)
  {
    LOG.log(Level.INFO, "EmptyStream msg: "+msg);
    logger.debug(LocalizableMessage.raw("EmptyStream msg: "+msg));
  }
}
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java
@@ -40,8 +40,8 @@
import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
/**
 * Class for extracting the contents of a zip file and managing
@@ -49,8 +49,7 @@
 */
public class ZipExtractor {
  static private final Logger LOG =
          Logger.getLogger(ZipExtractor.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /** Path separator for zip file entry names on Windows and *nix. */
  static private final char ZIP_ENTRY_NAME_SEP = '/';
@@ -199,8 +198,8 @@
          if (sepPos != -1) {
            name = name.substring(sepPos + 1);
          } else {
            LOG.log(Level.WARNING,
                    "zip entry name does not contain a path separator");
            logger.warn(LocalizableMessage.raw(
                    "zip entry name does not contain a path separator"));
          }
        }
        if (name != null && name.length() > 0) {
@@ -287,7 +286,7 @@
        application.notifyListenersRatioChange(ratioBeforeCompleted);
      }
    }
    LOG.log(Level.INFO, "extracting " + Utils.getPath(destination));
    logger.debug(LocalizableMessage.raw("extracting " + Utils.getPath(destination)));
    if (Utils.insureParentsExist(destination))
    {
      if (entry.isDirectory())
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/webstart/WebStartDownloader.java
@@ -31,8 +31,8 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.jnlp.DownloadService;
import javax.jnlp.DownloadServiceListener;
@@ -60,8 +60,7 @@
 * ProgressStep.DOWNLOADING step.
 */
public class WebStartDownloader implements DownloadServiceListener {
  static private final Logger LOG =
    Logger.getLogger(WebStartDownloader.class.getName());
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  private ApplicationException ex;
@@ -250,8 +249,8 @@
          (DownloadService) ServiceManager.lookup(Utils.JNLP_SERVICE_NAME);
    } catch (UnavailableServiceException e)
    {
      LOG.log(Level.SEVERE, "Could not find service: "+
          Utils.JNLP_SERVICE_NAME, e);
      logger.error(LocalizableMessage.raw("Could not find service: "+
          Utils.JNLP_SERVICE_NAME, e));
      String setupFile;
      if (Utils.isWindows())
      {
opendj3-server-dev/src/server/org/opends/server/admin/AdministrationConnector.java
@@ -27,7 +27,6 @@
package org.opends.server.admin;
import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.messages.AdminMessages.*;
import java.io.File;
import java.io.FileWriter;
@@ -64,8 +63,7 @@
import org.opends.server.admin.std.server.TrustManagerProviderCfg;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.FilePermission;
@@ -90,9 +88,7 @@
  // Friendly name of the administration connector
  private static final String FRIENDLY_NAME = "Administration Connector";
  // The tracer object for the debug logger.
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  private LDAPConnectionHandler adminConnectionHandler;
@@ -751,10 +747,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_ADMIN_CERTIFICATE_GENERATION.get(e.getMessage());
      logError(message);
      throw new InitializationException(message);
opendj3-server-dev/src/server/org/opends/server/admin/AggregationPropertyDefinition.java
@@ -29,7 +29,6 @@
import static org.opends.messages.AdminMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.forgerock.util.Reject.*;
import java.util.Collection;
@@ -61,10 +60,9 @@
import org.opends.server.admin.std.meta.RootCfgDefn;
import org.opends.server.config.ConfigException;
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.ResultCode;
import org.opends.server.util.StaticUtils;
@@ -311,9 +309,7 @@
        }
      } catch (ConfigException e) {
        // The condition could not be evaluated.
        if (debugEnabled()) {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_REFINT_UNABLE_TO_EVALUATE_TARGET_CONDITION.get(mo
            .getManagedObjectDefinition().getUserFriendlyName(), String
@@ -810,13 +806,7 @@
      return instances;
    }
  }
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
opendj3-server-dev/src/server/org/opends/server/admin/ClassLoaderProvider.java
@@ -31,7 +31,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.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.util.ServerConstants.EOL;
@@ -60,8 +59,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.meta.RootCfgDefn;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.InitializationException;
import org.forgerock.util.Reject;
@@ -83,11 +81,7 @@
 * class loader as it can change at run-time.
 */
public final class ClassLoaderProvider {
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Private URLClassLoader implementation. This is only required so
@@ -414,9 +408,7 @@
      try {
        loader.addJarFile(extension);
      } catch (Exception e) {
        if (debugEnabled()) {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_ADMIN_CANNOT_OPEN_JAR_FILE.
            get(extension.getName(), extension.getParent(),
@@ -600,14 +592,10 @@
      // Add and initialize the extensions.
      addExtension(extensionsPath.listFiles(filter));
    } catch (InitializationException e) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      throw e;
    } catch (Exception e) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_ADMIN_EXTENSIONS_CANNOT_LIST_FILES.get(
          String.valueOf(extensionsPath), stackTraceToSingleLineString(e));
@@ -638,9 +626,7 @@
    try {
      loadDefinitionClasses(is);
    } catch (InitializationException e) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CLASS_LOADER_CANNOT_LOAD_CORE.get(CORE_MANIFEST,
          stackTraceToSingleLineString(e));
@@ -670,9 +656,7 @@
      try {
        is = jarFile.getInputStream(entry);
      } catch (Exception e) {
        if (debugEnabled()) {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_ADMIN_CANNOT_READ_EXTENSION_MANIFEST.get(
            EXTENSION_MANIFEST, jarFile.getName(),
@@ -683,9 +667,7 @@
      try {
        loadDefinitionClasses(is);
      } catch (InitializationException e) {
        if (debugEnabled()) {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_CLASS_LOADER_CANNOT_LOAD_EXTENSION.get(jarFile
            .getName(), EXTENSION_MANIFEST, stackTraceToSingleLineString(e));
@@ -749,7 +731,7 @@
        continue;
      }
      TRACER.debugMessage(DebugLogLevel.INFO, "Loading class " + className);
      logger.trace("Loading class " + className);
      // Load the class and get an instance of it if it is a definition.
      Class<?> theClass;
@@ -815,9 +797,7 @@
      // Load the extension jar file.
      jarFile = new JarFile(jar);
    } catch (Exception e) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_ADMIN_CANNOT_OPEN_JAR_FILE.get(
          jar.getName(), jar.getParent(), stackTraceToSingleLineString(e));
opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
@@ -28,8 +28,6 @@
package org.opends.server.admin.client.cli;
import static org.opends.server.admin.client.cli.DsFrameworkCliReturnCode.*;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.debug.DebugLogger.getTracer;
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.ToolMessages.*;
import org.forgerock.i18n.LocalizableMessage;
@@ -50,8 +48,8 @@
import java.security.cert.CertificateException;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.net.ssl.KeyManager;
@@ -67,8 +65,6 @@
import org.opends.server.admin.std.server.TrustManagerProviderCfg;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.util.PasswordReader;
import org.opends.server.util.SelectableCertificateKeyManager;
import org.opends.server.util.args.Argument;
@@ -186,22 +182,13 @@
  private ApplicationTrustManager trustManager;
  private boolean configurationInitialized = false;
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * End Of Line.
   */
  public static String EOL = System.getProperty("line.separator");
  /**
   * The Logger.
   */
  static private final Logger LOG =
    Logger.getLogger(SecureConnectionCliArgs.class.getName());
  // Defines if the CLI always use the SSL connection type.
  private boolean alwaysSSL = false;
@@ -321,10 +308,7 @@
          bindPasswordValue = new String(pwChars);
        } catch(Exception ex)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, ex);
          }
          logger.traceException(ex);
          try
          {
            err.write(wrapText(ex.getMessage(), MAX_LINE_WIDTH).getBytes());
@@ -356,10 +340,7 @@
        }
        catch (Exception ex)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, ex);
          }
          logger.traceException(ex);
          try
          {
            err.write(wrapText(ex.getMessage(), MAX_LINE_WIDTH).getBytes());
@@ -852,28 +833,28 @@
            // Nothing to do: if this occurs we will systematically refuse the
            // certificates.  Maybe we should avoid this and be strict, but we
            // are in a best effort mode.
            LOG.log(Level.WARNING, "Error with the truststore", e);
            logger.warn(LocalizableMessage.raw("Error with the truststore"), e);
          }
          catch (NoSuchAlgorithmException e)
          {
            // Nothing to do: if this occurs we will systematically refuse the
            // certificates.  Maybe we should avoid this and be strict, but we
            // are in a best effort mode.
            LOG.log(Level.WARNING, "Error with the truststore", e);
            logger.warn(LocalizableMessage.raw("Error with the truststore"), e);
          }
          catch (CertificateException e)
          {
            // Nothing to do: if this occurs we will systematically refuse the
            // certificates.  Maybe we should avoid this and be strict, but we
            // are in a best effort mode.
            LOG.log(Level.WARNING, "Error with the truststore", e);
            logger.warn(LocalizableMessage.raw("Error with the truststore"), e);
          }
          catch (IOException e)
          {
            // Nothing to do: if this occurs we will systematically refuse the
            // certificates.  Maybe we should avoid this and be strict, but we
            // are in a best effort mode.
            LOG.log(Level.WARNING, "Error with the truststore", e);
            logger.warn(LocalizableMessage.raw("Error with the truststore"), e);
          }
          finally
          {
@@ -930,7 +911,7 @@
        // the
        // certificates. Maybe we should avoid this and be strict, but
        // we are in a best effort mode.
        LOG.log(Level.WARNING, "Error with the keystore", e);
        logger.warn(LocalizableMessage.raw("Error with the keystore"), e);
      }
      catch (NoSuchAlgorithmException e)
      {
@@ -939,7 +920,7 @@
        // certificates. Maybe we should avoid this and be strict, but
        // we are
        // in a best effort mode.
        LOG.log(Level.WARNING, "Error with the keystore", e);
        logger.warn(LocalizableMessage.raw("Error with the keystore"), e);
      }
      catch (CertificateException e)
      {
@@ -948,7 +929,7 @@
        // certificates. Maybe we should avoid this and be strict, but
        // we are
        // in a best effort mode.
        LOG.log(Level.WARNING, "Error with the keystore", e);
        logger.warn(LocalizableMessage.raw("Error with the keystore"), e);
      }
      catch (IOException e)
      {
@@ -957,7 +938,7 @@
        // certificates. Maybe we should avoid this and be strict, but
        // we are
        // in a best effort mode.
        LOG.log(Level.WARNING, "Error with the keystore", e);
        logger.warn(LocalizableMessage.raw("Error with the keystore"), e);
      }
      finally
      {
opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
@@ -29,7 +29,6 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.admin.client.cli.DsFrameworkCliReturnCode.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.tools.ToolConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -45,8 +44,7 @@
import org.opends.admin.ads.util.ApplicationTrustManager;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.util.PasswordReader;
import org.opends.server.util.args.Argument;
import org.opends.server.util.args.ArgumentException;
@@ -90,11 +88,7 @@
   * look for properties file.
   */
  protected BooleanArgument noPropertiesFileArg;
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * End Of Line.
@@ -178,10 +172,7 @@
          bindPasswordValue = new String(pwChars);
        } catch(Exception ex)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, ex);
          }
          logger.traceException(ex);
          try
          {
            err.write(wrapText(ex.getMessage(), MAX_LINE_WIDTH).getBytes());
@@ -212,10 +203,7 @@
      }
      catch (Exception ex)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, ex);
        }
        logger.traceException(ex);
        try
        {
          err.write(wrapText(ex.getMessage(), MAX_LINE_WIDTH).getBytes());
opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigAddListenerAdaptor.java
@@ -28,8 +28,6 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import java.util.LinkedList;
import java.util.List;
@@ -48,11 +46,10 @@
import org.opends.server.api.ConfigAddListener;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.ResultCode;
@@ -67,11 +64,7 @@
 */
final class ConfigAddListenerAdaptor<S extends Configuration> extends
    AbstractConfigListenerAdaptor implements ConfigAddListener {
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // Cached managed object between accept/apply callbacks.
  private ServerManagedObject<? extends S> cachedManagedObject;
@@ -196,9 +189,7 @@
          try {
            handler.performPostAdd(cachedManagedObject);
          } catch (ConfigException e) {
            if (debugEnabled()) {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
          }
        }
      }
opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java
@@ -28,8 +28,6 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedList;
@@ -59,10 +57,9 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.ResultCode;
import org.opends.server.util.StaticUtils;
@@ -194,11 +191,7 @@
      return null;
    }
  }
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // Cached managed object between accept/apply call-backs.
  private ServerManagedObject<? extends S> cachedManagedObject;
@@ -352,9 +345,7 @@
          try {
            handler.performPostModify(cachedManagedObject);
          } catch (ConfigException e) {
            if (debugEnabled()) {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
          }
        }
      }
@@ -477,9 +468,7 @@
      }
    } catch (ConfigException e) {
      // The dependent entry could not be retrieved.
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = AdminMessages.ERR_ADMIN_CANNOT_GET_MANAGED_OBJECT.get(
          String.valueOf(dn), StaticUtils.getExceptionMessage(e));
opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java
@@ -29,8 +29,6 @@
import static org.opends.messages.AdminMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import java.util.LinkedList;
import java.util.List;
@@ -49,11 +47,10 @@
import org.opends.server.api.ConfigDeleteListener;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.ResultCode;
@@ -68,11 +65,7 @@
 */
final class ConfigDeleteListenerAdaptor<S extends Configuration> extends
    AbstractConfigListenerAdaptor implements ConfigDeleteListener {
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // Cached managed object between accept/apply callbacks.
  private ServerManagedObject<? extends S> cachedManagedObject;
@@ -197,9 +190,7 @@
          try {
            handler.performPostDelete(cachedManagedObject);
          } catch (ConfigException e) {
            if (debugEnabled()) {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
          }
        }
      }
opendj3-server-dev/src/server/org/opends/server/admin/server/DelayedConfigAddListener.java
@@ -28,8 +28,7 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ConfigAddListener;
import org.opends.server.api.ConfigDeleteListener;
@@ -38,7 +37,6 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.ResultCode;
import org.forgerock.i18n.LocalizableMessageBuilder;
@@ -50,11 +48,7 @@
 * "delayed" add or delete listener.
 */
final class DelayedConfigAddListener implements ConfigAddListener {
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // The name of the parent entry.
  private final DN parent;
@@ -137,9 +131,7 @@
          myEntry.deregisterAddListener(this);
        }
      } catch (ConfigException e) {
        if (debugEnabled()) {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        // Ignore this error as it implies that this listener has
        // already been deregistered.
opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagedObject.java
@@ -30,7 +30,6 @@
import static org.opends.messages.AdminMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
import java.util.Collections;
@@ -58,9 +57,8 @@
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
@@ -73,11 +71,7 @@
 */
public final class ServerManagedObject<S extends Configuration> implements
    PropertyProvider {
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // The configuration entry associated with this server managed
  // object (null if root).
@@ -956,9 +950,7 @@
        try {
          handler.performPostAdd(this);
        } catch (ConfigException e) {
          if (debugEnabled()) {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
      }
    }
@@ -1243,9 +1235,7 @@
      }
    } catch (ConfigException e) {
      // Ignore the exception since this implies deregistration.
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
  }
@@ -1275,9 +1265,7 @@
      }
    } catch (ConfigException e) {
      // Ignore the exception since this implies deregistration.
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
  }
@@ -1313,9 +1301,7 @@
      }
    } catch (ConfigException e) {
      // Ignore the exception since this implies deregistration.
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
  }
@@ -1345,9 +1331,7 @@
      }
    } catch (ConfigException e) {
      // Ignore the exception since this implies deregistration.
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
  }
@@ -1361,9 +1345,7 @@
    try {
      configEntry = DirectoryServer.getConfigEntry(dn);
    } catch (ConfigException e) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_ADMIN_CANNOT_GET_LISTENER_BASE.get(
          String.valueOf(dn), stackTraceToSingleLineString(e));
opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagementContext.java
@@ -31,7 +31,6 @@
import static org.opends.messages.AdminMessages.*;
import static org.opends.server.admin.PropertyException.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
import java.util.ArrayList;
@@ -77,11 +76,10 @@
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
@@ -401,11 +399,7 @@
    new ServerManagedObject<RootCfg>(
      ManagedObjectPath.emptyPath(), RootCfgDefn.getInstance(), Collections
          .<PropertyDefinition<?>, SortedSet<?>> emptyMap(), null);
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -944,9 +938,7 @@
    try {
      configEntry = DirectoryServer.getConfigEntry(dn);
    } catch (ConfigException e) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_ADMIN_CANNOT_GET_MANAGED_OBJECT.get(
          String.valueOf(dn), stackTraceToSingleLineString(e));
opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java
@@ -48,10 +48,7 @@
 */
public abstract class AuthenticationPolicy
{
  /**
   * The tracer object for the debug logger.
   */
  private static final LocalizedLogger logger = LocalizedLogger.getLocalizedLogger(AuthenticationPolicy.class);
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Returns the authentication policy for the user provided user. The following
@@ -135,7 +132,7 @@
              String.valueOf(subentryDN));
          if (useDefaultOnError)
          {
            //logger.error(message);
            logger.error(message);
            return DirectoryServer.getDefaultPasswordPolicy();
          }
          else
opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java
@@ -31,8 +31,6 @@
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.config.ConfigConstants.OP_ATTR_ACCOUNT_DISABLED;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.debug.DebugLogger.getTracer;
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
import static org.opends.server.util.StaticUtils.toLowerCase;
@@ -40,7 +38,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
@@ -54,10 +52,7 @@
 */
public abstract class AuthenticationPolicyState
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -130,9 +125,9 @@
        if (valueString.equals("true") || valueString.equals("yes")
            || valueString.equals("on") || valueString.equals("1"))
        {
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugInfo("Attribute %s resolves to true for user entry "
            logger.trace("Attribute %s resolves to true for user entry "
                + "%s", attributeType.getNameOrOID(),
                entry.getName().toString());
          }
@@ -143,9 +138,9 @@
        if (valueString.equals("false") || valueString.equals("no")
            || valueString.equals("off") || valueString.equals("0"))
        {
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugInfo("Attribute %s resolves to false for user "
            logger.trace("Attribute %s resolves to false for user "
                + "entry %s", attributeType.getNameOrOID(), entry.getName()
                .toString());
          }
@@ -153,9 +148,9 @@
          return ConditionResult.FALSE;
        }
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugError("Unable to resolve value %s for attribute %s "
          logger.trace("Unable to resolve value %s for attribute %s "
              + "in user entry %s as a Boolean.", valueString,
              attributeType.getNameOrOID(), entry.getName().toString());
        }
@@ -168,9 +163,9 @@
      }
    }
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Returning %s because attribute %s does not exist "
      logger.trace("Returning %s because attribute %s does not exist "
          + "in user entry %s", ConditionResult.UNDEFINED.toString(),
          attributeType.getNameOrOID(), entry.getName().toString());
    }
@@ -218,11 +213,11 @@
        }
        catch (final Exception e)
        {
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
            logger.traceException(e);
            TRACER.debugWarning("Unable to decode value %s for attribute %s "
            logger.trace("Unable to decode value %s for attribute %s "
                + "in user entry %s: %s", v.getValue().toString(),
                attributeType.getNameOrOID(), entry.getName().toString(),
                stackTraceToSingleLineString(e));
@@ -240,9 +235,9 @@
    if (timeValue == -1)
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning -1 because attribute %s does not "
        logger.trace("Returning -1 because attribute %s does not "
            + "exist in user entry %s", attributeType.getNameOrOID(), entry
            .getName().toString());
      }
@@ -324,15 +319,12 @@
    }
    catch (final Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      isDisabled = ConditionResult.TRUE;
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugWarning("User %s is considered administratively "
        logger.trace("User %s is considered administratively "
            + "disabled because an error occurred while "
            + "attempting to make the determination: %s.", userEntry.getName()
            .toString(), stackTraceToSingleLineString(e));
@@ -344,18 +336,18 @@
    if (isDisabled == ConditionResult.UNDEFINED)
    {
      isDisabled = ConditionResult.FALSE;
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("User %s is not administratively disabled since "
        logger.trace("User %s is not administratively disabled since "
            + "the attribute \"%s\" is not present in the entry.", userEntry
            .getName().toString(), OP_ATTR_ACCOUNT_DISABLED);
      }
      return false;
    }
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("User %s %s administratively disabled.", userEntry
      logger.trace("User %s %s administratively disabled.", userEntry
          .getName().toString(), ((isDisabled == ConditionResult.TRUE) ? " is"
          : " is not"));
    }
opendj3-server-dev/src/server/org/opends/server/api/ClientConnection.java
@@ -47,7 +47,7 @@
import org.opends.server.core.PluginConfigManager;
import org.opends.server.core.SearchOperation;
import org.opends.server.core.networkgroups.NetworkGroup;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
@@ -55,7 +55,6 @@
import org.opends.server.types.CancelRequest;
import org.opends.server.types.CancelResult;
import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DisconnectReason;
import org.opends.server.types.Entry;
@@ -70,7 +69,6 @@
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
/**
@@ -84,10 +82,7 @@
     mayInvoke=true)
public abstract class ClientConnection
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The set of authentication information for this client connection.
@@ -177,14 +172,14 @@
    networkGroup       = NetworkGroup.getDefaultNetworkGroup();
    networkGroup.addConnection(this);
    mustEvaluateNetworkGroup = true;
    if (debugEnabled())
    if (logger.isTraceEnabled())
      {
        LocalizableMessage message =
                INFO_CHANGE_NETWORK_GROUP.get(
                  getConnectionID(),
                  "null",
                  networkGroup.getID());
        TRACER.debugMessage(DebugLogLevel.INFO, message.toString());
        logger.trace(message.toString());
      }
  }
@@ -1059,7 +1054,7 @@
    if (operation == null)
    {
      result = privileges.contains(privilege);
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        DN authDN = authenticationInfo.getAuthenticationDN();
@@ -1067,7 +1062,7 @@
                .get(getConnectionID(), -1L,
                     String.valueOf(authDN),
                     privilege.getName(), result);
        TRACER.debugMessage(DebugLogLevel.INFO, message.toString());
        logger.trace(message.toString());
      }
    }
    else
@@ -1078,7 +1073,7 @@
           !authenticationInfo.isAuthenticated())) {
        result = privileges.contains(privilege) ||
                 DirectoryServer.isDisabled(privilege);
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          DN authDN = authenticationInfo.getAuthenticationDN();
@@ -1088,7 +1083,7 @@
                    operation.getOperationID(),
                    String.valueOf(authDN),
                    privilege.getName(), result);
          TRACER.debugMessage(DebugLogLevel.INFO, message.toString());
          logger.trace(message.toString());
        }
      }
      else
@@ -1133,7 +1128,7 @@
  {
    HashSet<Privilege> privSet = this.privileges;
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      for (Privilege p : privileges)
      {
@@ -1177,7 +1172,7 @@
                  getConnectionID(), -1L,
                  String.valueOf(authDN),
                  buffer.toString(), result);
        TRACER.debugMessage(DebugLogLevel.INFO,
        logger.trace(
                message.toString());
      }
      else
@@ -1190,7 +1185,7 @@
                  operation.getOperationID(),
                  String.valueOf(authDN),
                  buffer.toString(), result);
        TRACER.debugMessage(DebugLogLevel.INFO, message.toString());
        logger.trace(message.toString());
      }
      return result;
@@ -1709,14 +1704,14 @@
  public final void setNetworkGroup (NetworkGroup networkGroup)
  {
    if (this.networkGroup != networkGroup) {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        LocalizableMessage message =
                INFO_CHANGE_NETWORK_GROUP.get(
                  getConnectionID(),
                  this.networkGroup.getID(),
                  networkGroup.getID());
        TRACER.debugMessage(DebugLogLevel.INFO, message.toString());
        logger.trace(message.toString());
      }
      // If there is a change, first remove this connection
opendj3-server-dev/src/server/org/opends/server/api/DebugLogPublisher.java
@@ -31,11 +31,6 @@
import java.util.Map;
import java.util.TreeMap;
import com.sleepycat.je.Database;
import com.sleepycat.je.DatabaseEntry;
import com.sleepycat.je.OperationStatus;
import com.sleepycat.je.Transaction;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.DebugLogPublisherCfg;
import org.opends.server.loggers.debug.TraceSettings;
@@ -376,49 +371,4 @@
                                   String msg,
                                   Throwable ex, StackTraceElement[] stackTrace);
  /**
   * Log an JE database access in a method.
   * @param  settings        The current trace settings in effect.
   * @param  signature       The method signature.
   * @param  sourceLocation  The location of the method in the source.
   * @param  status          The status of the JE operation.
   * @param  database        The database handle.
   * @param  txn             The transaction handle (may be
   *                         {@code null}).
   * @param  key             The key to dump.
   * @param  data            The data to dump.
   * @param  stackTrace      The stack trace at the time the access
   *                         occurred or null if its not available.
   */
  public abstract void traceJEAccess(TraceSettings settings,
                                     String signature,
                                     String sourceLocation,
                                     OperationStatus status,
                                     Database database,
                                     Transaction txn,
                                     DatabaseEntry key,
                                     DatabaseEntry data,
                                     StackTraceElement[] stackTrace);
  /**
   * Log a protocol element in a method.
   * @param  settings        The current trace settings in effect.
   * @param  signature       The method signature.
   * @param  sourceLocation  The location of the method in the source.
   * @param  decodedForm     The string representation of the protocol
   *                         element.
   * @param  stackTrace      The stack trace at the time the protocol
   *                         element is logged or null if its not
   *                         available.
   */
  public abstract void traceProtocolElement(TraceSettings settings,
                                            String signature,
                                            String sourceLocation,
                                            String decodedForm,
                                            StackTraceElement[] stackTrace);
}
opendj3-server-dev/src/server/org/opends/server/api/DirectoryThread.java
@@ -35,13 +35,11 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.backends.task.Task;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -160,13 +158,7 @@
    }
  }
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The directory thread group that all directory threads will be a
@@ -252,10 +244,7 @@
        // shutdown.
        return;
      }
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_UNCAUGHT_THREAD_EXCEPTION.get(
          t.getName(), stackTraceToSingleLineString(e));
opendj3-server-dev/src/server/org/opends/server/api/EntryCache.java
@@ -40,12 +40,10 @@
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;
import org.opends.server.types.SearchFilter;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.admin.std.server.EntryCacheCfg;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.monitors.EntryCacheMonitorProvider;
import org.opends.server.types.Attribute;
import static org.opends.server.loggers.debug.DebugLogger.*;
@@ -83,10 +81,7 @@
public abstract class EntryCache
       <T extends EntryCacheCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // The set of filters that define the entries that should be
  // excluded from the cache.
@@ -538,10 +533,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          // This shouldn't happen, but if it does then we can't be
          // sure whether the entry should be excluded, so we will
@@ -568,10 +560,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          // This shouldn't happen, but if it does, then
          // just ignore it.
opendj3-server-dev/src/server/org/opends/server/api/VirtualAttributeProvider.java
@@ -35,11 +35,10 @@
import org.opends.server.admin.std.server.VirtualAttributeCfg;
import org.opends.server.config.ConfigException;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.debug.DebugLogger.*;
/**
 * This class defines the set of methods and structures that must be
@@ -57,10 +56,7 @@
public abstract class VirtualAttributeProvider
       <T extends VirtualAttributeCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Initializes this virtual attribute based on the information in
@@ -298,10 +294,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        // The substring couldn't be normalized.  We have to return
        // "undefined".
@@ -328,10 +321,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          // The substring couldn't be normalized.  We have to return
          // "undefined".
@@ -355,10 +345,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        // The substring couldn't be normalized.  We have to return
        // "undefined".
@@ -383,10 +370,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        // The value couldn't be normalized.  If we can't find a
        // definite match, then we should return "undefined".
@@ -434,10 +418,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      // We couldn't normalize the provided value.  We should return
      // "undefined".
@@ -459,10 +440,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        // We couldn't normalize one of the attribute values.  If we
        // can't find a definite match, then we should return
@@ -511,10 +489,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      // We couldn't normalize the provided value.  We should return
      // "undefined".
@@ -536,10 +511,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        // We couldn't normalize one of the attribute values.  If we
        // can't find a definite match, then we should return
@@ -588,10 +560,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      // We couldn't normalize the provided value.  We should return
      // "undefined".
@@ -611,10 +580,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        // We couldn't normalize one of the attribute values.  If we
        // can't find a definite match, then we should return
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
@@ -32,7 +32,6 @@
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.loggers.debug.DebugLogger.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -49,7 +48,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.controls.GetEffectiveRightsRequestControl;
import org.opends.server.core.*;
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.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPControl;
@@ -108,11 +107,7 @@
   * the search reference access check.
   */
  private static AttributeType refAttrType;
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  static
  {
@@ -1198,10 +1193,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        // FIXME -- Is there anything that we need to do here?
        continue;
@@ -1273,10 +1265,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = INFO_ACI_HANDLER_FAIL_PROCESS_GLOBAL_ACI.get(
          String.valueOf(configuration.dn()));
      throw new InitializationException(message, e);
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
@@ -44,8 +44,7 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPControl;
import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import static org.opends.messages.AccessControlMessages.*;
import org.opends.server.core.DirectoryServer;
@@ -63,10 +62,7 @@
public class AciListenerManager implements
    BackendInitializationListener, AlertGenerator
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The fully-qualified name of this class.
@@ -453,10 +449,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        continue;
      }
      InternalSearchOperation internalSearch =
@@ -474,10 +467,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        continue;
      }
      if (!internalSearch.getSearchEntries().isEmpty())
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/DNS.java
@@ -29,7 +29,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.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
import java.net.InetAddress;
@@ -39,18 +38,13 @@
import java.util.regex.Pattern;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
import org.forgerock.i18n.slf4j.LocalizedLogger;
/**
 * This class implements the dns bind rule keyword.
 */
public class DNS implements KeywordBindRule {
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
    /** List of patterns to match against. */
    private List<String> patterns = null;
@@ -150,10 +144,7 @@
              }
              catch (Exception e)
              {
                if (debugEnabled())
                {
                  TRACER.debugCaught(DebugLogLevel.ERROR, e);
                }
                logger.traceException(e);
                LocalizableMessage message = WARN_ACI_ERROR_CHECKING_CANONICAL_HOSTNAME.
                    get(hn, expr, getExceptionMessage(e));
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternDN.java
@@ -37,8 +37,7 @@
import static org.opends.server.util.StaticUtils.hexStringToByteArray;
import org.forgerock.util.Reject;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.ArrayList;
import java.util.List;
@@ -67,10 +66,7 @@
 */
public class PatternDN
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * If the pattern did not include any Multiple-Whole-RDN wildcards, then
@@ -1203,10 +1199,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.get(
            dnString, String.valueOf(e));
@@ -1447,10 +1440,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.get(
          dnString, String.valueOf(e));
opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java
@@ -43,7 +43,7 @@
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.schema.BooleanSyntax;
@@ -52,7 +52,6 @@
import static org.opends.messages.BackendMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -69,10 +68,7 @@
       extends Backend
       implements ConfigurationChangeListener<BackupBackendCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -150,10 +146,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message =
          ERR_BACKUP_CANNOT_DECODE_BACKUP_ROOT_DN.get(getExceptionMessage(e));
@@ -219,10 +212,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
          backupBaseDN.toString(), getExceptionMessage(e));
@@ -246,10 +236,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
  }
@@ -536,10 +523,7 @@
    }
    catch (ConfigException ce)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ce);
      }
      logger.traceException(ce);
      LocalizableMessage message = ERR_BACKUP_INVALID_BACKUP_DIRECTORY.get(
          String.valueOf(entryDN), ce.getMessage());
@@ -547,10 +531,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message =
          ERR_BACKUP_ERROR_GETTING_BACKUP_DIRECTORY.get(getExceptionMessage(e));
@@ -638,17 +619,13 @@
      backupDirectory = BackupDirectory.readBackupDirectoryDescriptor(v
          .getValue().toString());
    } catch (ConfigException ce) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, ce);
      }
      logger.traceException(ce);
      LocalizableMessage message = ERR_BACKUP_INVALID_BACKUP_DIRECTORY.get(String
          .valueOf(entryDN), ce.getMessageObject());
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
    } catch (Exception e) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_BACKUP_ERROR_GETTING_BACKUP_DIRECTORY
          .get(getExceptionMessage(e));
@@ -873,10 +850,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            continue;
          }
@@ -915,10 +889,7 @@
                }
                catch (Exception e)
                {
                  if (debugEnabled())
                  {
                    TRACER.debugCaught(DebugLogLevel.ERROR, e);
                  }
                  logger.traceException(e);
                  continue;
                }
@@ -972,10 +943,7 @@
            }
            catch (Exception e)
            {
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
              continue;
            }
opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java
@@ -39,14 +39,13 @@
import org.opends.server.config.ConfigException;
import org.opends.server.controls.SubtreeDeleteControl;
import org.opends.server.core.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.opends.server.util.*;
import org.forgerock.util.Reject;
import static org.opends.messages.BackendMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -61,10 +60,7 @@
       extends Backend
       implements ConfigurationChangeListener<LDIFBackendCfg>, AlertGenerator
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -141,10 +137,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
            dn.toString(), getExceptionMessage(e));
@@ -172,9 +165,9 @@
    if (! ldifFile.exists())
    {
      // This is fine.  We will just start with an empty backend.
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("LDIF backend starting empty because LDIF file " +
        logger.trace("LDIF backend starting empty because LDIF file " +
                         ldifFilePath + " does not exist");
      }
@@ -224,10 +217,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage m = ERR_LDIF_BACKEND_ERROR_CREATING_FILE.get(
                       tempFile.getAbsolutePath(),
@@ -248,10 +238,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        StaticUtils.close(writer);
@@ -280,10 +267,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
    try
@@ -295,10 +279,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
    try
@@ -307,10 +288,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage m = ERR_LDIF_BACKEND_ERROR_RENAMING_FILE.get(
                       tempFile.getAbsolutePath(),
@@ -345,10 +323,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
      }
    }
@@ -899,9 +874,9 @@
    if (oldEntry == null)
    {
      // This should never happen.
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugWarning("Subtree rename encountered entry DN " +
        logger.trace("Subtree rename encountered entry DN " +
                            entryDN + " for nonexistent entry.");
      }
      return;
@@ -1045,10 +1020,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage m = ERR_LDIF_BACKEND_CANNOT_CREATE_LDIF_WRITER.get(
                         stackTraceToSingleLineString(e));
opendj3-server-dev/src/server/org/opends/server/backends/MemoryBackend.java
@@ -46,13 +46,12 @@
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.AttributeType;
import org.opends.server.types.BackupConfig;
import org.opends.server.types.BackupDirectory;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.Control;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
@@ -71,7 +70,6 @@
import org.forgerock.util.Reject;
import static org.opends.messages.BackendMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -107,10 +105,7 @@
public class MemoryBackend
       extends Backend
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -215,10 +210,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
            dn.toString(), getExceptionMessage(e));
@@ -256,10 +248,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
@@ -500,10 +489,7 @@
          {
            // This shouldn't happen, but we want the delete to continue anyway
            // so just ignore it if it does for some reason.
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
          }
        }
      }
@@ -764,10 +750,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message =
          ERR_MEMORYBACKEND_CANNOT_CREATE_LDIF_WRITER.get(String.valueOf(e));
@@ -801,10 +784,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
opendj3-server-dev/src/server/org/opends/server/backends/MonitorBackend.java
@@ -31,8 +31,6 @@
import static org.opends.messages.BackendMessages.*;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.debug.DebugLogger.getTracer;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.getExceptionMessage;
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
@@ -48,7 +46,7 @@
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.opends.server.core.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.opends.server.util.DynamicConstants;
import org.opends.server.util.LDIFWriter;
@@ -66,10 +64,7 @@
public class MonitorBackend extends Backend implements
    ConfigurationChangeListener<MonitorBackendCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // The set of user-defined attributes that will be included in the base
  // monitor entry.
@@ -165,10 +160,7 @@
    }
    catch (final Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      messages.add(ERR_CONFIG_BACKEND_ERROR_INTERACTING_WITH_BACKEND_ENTRY.get(
          String.valueOf(configEntryDN), stackTraceToSingleLineString(e)));
@@ -257,10 +249,7 @@
    }
    catch (final Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      final LocalizableMessage message = ERR_MONITOR_CANNOT_DECODE_MONITOR_ROOT_DN
          .get(getExceptionMessage(e));
@@ -331,10 +320,7 @@
    }
    catch (final Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      final LocalizableMessage message = ERR_ROOTDSE_UNABLE_TO_CREATE_LDIF_WRITER
          .get(stackTraceToSingleLineString(e));
@@ -349,10 +335,7 @@
    }
    catch (final Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      try
      {
@@ -360,10 +343,7 @@
      }
      catch (final Exception e2)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e2);
        }
        logger.traceException(e2);
      }
      final LocalizableMessage message = ERR_MONITOR_UNABLE_TO_EXPORT_BASE
@@ -383,10 +363,7 @@
      }
      catch (final Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        try
        {
@@ -394,10 +371,7 @@
        }
        catch (final Exception e2)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e2);
          }
          logger.traceException(e2);
        }
        final LocalizableMessage message = ERR_MONITOR_UNABLE_TO_EXPORT_PROVIDER_ENTRY
@@ -415,10 +389,7 @@
    }
    catch (final Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
  }
@@ -437,10 +408,7 @@
    }
    catch (final Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
  }
@@ -585,10 +553,7 @@
    }
    catch (final Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      final LocalizableMessage message = ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
          baseMonitorDN.toString(), getExceptionMessage(e));
opendj3-server-dev/src/server/org/opends/server/backends/NullBackend.java
@@ -44,12 +44,11 @@
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.AttributeType;
import org.opends.server.types.BackupConfig;
import org.opends.server.types.BackupDirectory;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
@@ -67,7 +66,6 @@
import org.forgerock.util.Reject;
import static org.opends.messages.BackendMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -103,10 +101,7 @@
 */
public class NullBackend extends Backend
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -200,10 +195,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
            dn.toString(), getExceptionMessage(e));
@@ -227,10 +219,7 @@
    try {
      DirectoryServer.registerObjectClass(nulOC, false);
    } catch (DirectoryException de) {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, de);
      }
      logger.traceException(de);
      throw new InitializationException(de.getMessageObject());
    }
    objectClasses.put(nulOC, nulOCName);
@@ -258,10 +247,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
@@ -443,9 +429,7 @@
    try {
      ldifWriter = new LDIFWriter(exportConfig);
    } catch (Exception e) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = LocalizableMessage.raw(e.getMessage());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
@@ -455,9 +439,7 @@
    try {
      ldifWriter.close();
    } catch (Exception e) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
  }
opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java
@@ -59,7 +59,7 @@
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.SearchOperation;
import org.opends.server.core.WorkflowTopologyNode;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.opends.server.util.LDIFWriter;
import org.forgerock.util.Reject;
@@ -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.debug.DebugLogger.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -91,10 +90,7 @@
       extends Backend
       implements ConfigurationChangeListener<RootDSEBackendCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -250,10 +246,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = WARN_ROOTDSE_SUBORDINATE_BASE_EXCEPTION.get(
          stackTraceToSingleLineString(e));
@@ -1204,19 +1197,13 @@
        }
        catch (DirectoryException de)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, de);
          }
          logger.traceException(de);
          throw de;
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message = ERR_ROOTDSE_UNEXPECTED_SEARCH_FAILURE.
              get(searchOperation.getConnectionID(),
@@ -1292,10 +1279,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_ROOTDSE_UNABLE_TO_CREATE_LDIF_WRITER.get(
          stackTraceToSingleLineString(e));
@@ -1312,10 +1296,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message =
          ERR_ROOTDSE_UNABLE_TO_EXPORT_DSE.get(stackTraceToSingleLineString(e));
@@ -1330,10 +1311,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
@@ -1494,10 +1472,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = WARN_ROOTDSE_SUBORDINATE_BASE_EXCEPTION.get(
              stackTraceToSingleLineString(e));
@@ -1559,10 +1534,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = WARN_ROOTDSE_SUBORDINATE_BASE_EXCEPTION.get(
              stackTraceToSingleLineString(e));
@@ -1611,10 +1583,7 @@
    }
    catch (ConfigException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      messages.add(ERR_CONFIG_BACKEND_ERROR_INTERACTING_WITH_BACKEND_ENTRY.get(
              String.valueOf(configEntryDN),
opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
@@ -72,7 +72,7 @@
import org.opends.server.core.SchemaConfigManager;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.schema.AttributeTypeSyntax;
import org.opends.server.schema.DITContentRuleSyntax;
import org.opends.server.schema.DITStructureRuleSyntax;
@@ -93,7 +93,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.debug.DebugLogger.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.ServerConstants.*;
@@ -109,10 +108,7 @@
     extends Backend
     implements ConfigurationChangeListener<SchemaBackendCfg>, AlertGenerator
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
@@ -398,9 +394,7 @@
      try {
        DirectoryServer.registerBaseDN(baseDN, this, true);
      } catch (Exception e) {
        if (debugEnabled()) {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
            baseDN.toString(), getExceptionMessage(e));
@@ -511,10 +505,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_SCHEMA_ERROR_DETERMINING_SCHEMA_CHANGES.get(
          getExceptionMessage(e));
@@ -544,10 +535,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
@@ -1168,10 +1156,7 @@
              }
              catch (DirectoryException de)
              {
                if (debugEnabled())
                {
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }
                logger.traceException(de);
                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_ATTRTYPE.get(
                    v.getValue().toString(), de.getMessageObject());
@@ -1194,10 +1179,7 @@
              }
              catch (DirectoryException de)
              {
                if (debugEnabled())
                {
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }
                logger.traceException(de);
                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_OBJECTCLASS.
                    get(v.getValue().toString(), de.getMessageObject());
@@ -1220,10 +1202,7 @@
              }
              catch (DirectoryException de)
              {
                if (debugEnabled())
                {
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }
                logger.traceException(de);
                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_NAME_FORM.get(
                    v.getValue().toString(), de.getMessageObject());
@@ -1246,10 +1225,7 @@
              }
              catch (DirectoryException de)
              {
                if (debugEnabled())
                {
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }
                logger.traceException(de);
                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_DCR.get(
                    v.getValue().toString(), de.getMessageObject());
@@ -1272,10 +1248,7 @@
              }
              catch (DirectoryException de)
              {
                if (debugEnabled())
                {
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }
                logger.traceException(de);
                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_DSR.get(
                    v.getValue().toString(), de.getMessageObject());
@@ -1298,10 +1271,7 @@
              }
              catch (DirectoryException de)
              {
                if (debugEnabled())
                {
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }
                logger.traceException(de);
                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_MR_USE.get(
                    v.getValue().toString(), de.getMessageObject());
@@ -1324,10 +1294,7 @@
              }
              catch (DirectoryException de)
              {
                if (debugEnabled())
                {
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }
                logger.traceException(de);
                LocalizableMessage message =
                    ERR_SCHEMA_MODIFY_CANNOT_DECODE_LDAP_SYNTAX.get(
@@ -1370,10 +1337,7 @@
              }
              catch (DirectoryException de)
              {
                if (debugEnabled())
                {
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }
                logger.traceException(de);
                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_ATTRTYPE.get(
                    v.getValue().toString(), de.getMessageObject());
@@ -1397,10 +1361,7 @@
              }
              catch (DirectoryException de)
              {
                if (debugEnabled())
                {
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }
                logger.traceException(de);
                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_OBJECTCLASS.
                    get(v.getValue().toString(), de.getMessageObject());
@@ -1423,10 +1384,7 @@
              }
              catch (DirectoryException de)
              {
                if (debugEnabled())
                {
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }
                logger.traceException(de);
                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_NAME_FORM.get(
                    v.getValue().toString(), de.getMessageObject());
@@ -1449,10 +1407,7 @@
              }
              catch (DirectoryException de)
              {
                if (debugEnabled())
                {
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }
                logger.traceException(de);
                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_DCR.get(
                    v.getValue().toString(), de.getMessageObject());
@@ -1476,10 +1431,7 @@
              }
              catch (DirectoryException de)
              {
                if (debugEnabled())
                {
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }
                logger.traceException(de);
                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_DSR.get(
                    v.getValue().toString(), de.getMessageObject());
@@ -1503,10 +1455,7 @@
              }
              catch (DirectoryException de)
              {
                if (debugEnabled())
                {
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }
                logger.traceException(de);
                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_MR_USE.get(
                    v.getValue().toString(), de.getMessageObject());
@@ -1530,10 +1479,7 @@
              }
              catch (DirectoryException de)
              {
                if (debugEnabled())
                {
                  TRACER.debugCaught(DebugLogLevel.ERROR, de);
                }
                logger.traceException(de);
                LocalizableMessage message =
                    ERR_SCHEMA_MODIFY_CANNOT_DECODE_LDAP_SYNTAX.get(
@@ -1644,19 +1590,13 @@
    }
    catch (DirectoryException de)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, de);
      }
      logger.traceException(de);
      throw de;
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message =
          ERR_SCHEMA_MODIFY_CANNOT_WRITE_NEW_SCHEMA.get(getExceptionMessage(e));
@@ -1901,10 +1841,7 @@
        }
        catch (DirectoryException de)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, de);
          }
          logger.traceException(de);
          LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_ATTRTYPE.get(
              v.getValue().toString(), de.getMessageObject());
@@ -2231,10 +2168,7 @@
        }
        catch (DirectoryException de)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, de);
          }
          logger.traceException(de);
          LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_OBJECTCLASS.get(
              v.getValue().toString(), de.getMessageObject());
@@ -2536,10 +2470,7 @@
        }
        catch (DirectoryException de)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, de);
          }
          logger.traceException(de);
          LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_NAME_FORM.get(
              v.getValue().toString(), de.getMessageObject());
@@ -3082,10 +3013,7 @@
        }
        catch (DirectoryException de)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, de);
          }
          logger.traceException(de);
          LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_DSR.get(
              v.getValue().toString(), de.getMessageObject());
@@ -3928,10 +3856,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      boolean allCleaned = true;
      for (File f : origFileList)
@@ -3948,10 +3873,7 @@
        }
        catch (Exception e2)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e2);
          }
          logger.traceException(e2);
          allCleaned = false;
        }
@@ -3993,10 +3915,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      for (File f : installedFileList)
      {
@@ -4009,10 +3928,7 @@
        }
        catch (Exception e2)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e2);
          }
          logger.traceException(e2);
        }
      }
@@ -4034,10 +3950,7 @@
        }
        catch (Exception e2)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e2);
          }
          logger.traceException(e2);
          allRestored = false;
        }
@@ -4079,10 +3992,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
@@ -4097,10 +4007,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
@@ -4143,10 +4050,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
      }
@@ -4184,10 +4088,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
@@ -4314,10 +4215,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_SCHEMA_UNABLE_TO_CREATE_LDIF_WRITER.get(
          stackTraceToSingleLineString(e));
@@ -4334,10 +4232,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message =
          ERR_SCHEMA_UNABLE_TO_EXPORT_BASE.get(stackTraceToSingleLineString(e));
@@ -4352,10 +4247,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
@@ -4481,10 +4373,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      attrTypeSyntax = new AttributeTypeSyntax();
    }
@@ -4601,10 +4490,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      ocSyntax = new ObjectClassSyntax();
    }
@@ -4789,10 +4675,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message = ERR_SCHEMA_BACKUP_CANNOT_GET_MAC.get(
              macKeyID, stackTraceToSingleLineString(e));
@@ -4813,10 +4696,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message = ERR_SCHEMA_BACKUP_CANNOT_GET_DIGEST.get(
              digestAlgorithm, stackTraceToSingleLineString(e));
@@ -4865,10 +4745,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_SCHEMA_BACKUP_CANNOT_CREATE_ARCHIVE_FILE.
          get(String.valueOf(filename), backupDirectory.getPath(),
@@ -4889,10 +4766,7 @@
      }
      catch (CryptoManagerException e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_SCHEMA_BACKUP_CANNOT_GET_CIPHER.get(
                stackTraceToSingleLineString(e));
@@ -4944,10 +4818,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      try
      {
@@ -4977,10 +4848,7 @@
    catch (Exception e)
    {
      // Can't locate or list Instance schema directory
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
    }
      logger.traceException(e);
      message = ERR_SCHEMA_BACKUP_CANNOT_LIST_SCHEMA_FILES.get(
          schemaInstanceDirPath, stackTraceToSingleLineString(e));
@@ -5053,10 +4921,7 @@
          inputStream.close();
        } catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
           try
          {
@@ -5091,10 +4956,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      message = ERR_SCHEMA_BACKUP_CANNOT_CLOSE_ZIP_STREAM.get(
          filename, backupDirectory.getPath(), stackTraceToSingleLineString(e));
@@ -5134,10 +4996,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      message = ERR_SCHEMA_BACKUP_CANNOT_UPDATE_BACKUP_DESCRIPTOR.get(
          backupDirectory.getDescriptorPath(), stackTraceToSingleLineString(e));
@@ -5177,10 +5036,7 @@
    }
    catch (ConfigException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   e.getMessageObject());
    }
@@ -5191,10 +5047,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_BACKUP_CANNOT_UPDATE_BACKUP_DESCRIPTOR.get(
        backupDirectory.getDescriptorPath(), stackTraceToSingleLineString(e));
@@ -5738,10 +5591,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      messages.add(ERR_SCHEMA_CANNOT_DETERMINE_BASE_DN.get(
@@ -5787,10 +5637,7 @@
    }
    catch (ConfigException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      messages.add(ERR_CONFIG_BACKEND_ERROR_INTERACTING_WITH_BACKEND_ENTRY.get(
              String.valueOf(configEntryDN),
@@ -5829,10 +5676,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          messages.add(ERR_SCHEMA_CANNOT_DEREGISTER_BASE_DN.get(
                  String.valueOf(dn),
@@ -5851,10 +5695,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          messages.add(ERR_SCHEMA_CANNOT_REGISTER_BASE_DN.get(
                  String.valueOf(dn),
opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java
@@ -30,7 +30,6 @@
import static org.opends.messages.BackendMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -74,7 +73,7 @@
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.CertificateManager;
@@ -91,10 +90,7 @@
     extends Backend
       implements ConfigurationChangeListener<TrustStoreBackendCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -197,10 +193,7 @@
    }
    catch (KeyStoreException kse)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, kse);
      }
      logger.traceException(kse);
      LocalizableMessage message = ERR_TRUSTSTORE_INVALID_TYPE.
          get(String.valueOf(trustStoreType), String.valueOf(configEntryDN),
@@ -383,10 +376,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
          String.valueOf(baseDN), String.valueOf(e));
@@ -410,10 +400,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
  }
@@ -448,10 +435,7 @@
    }
    catch (KeyStoreException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
    return numEntries;
@@ -574,9 +558,9 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.VERBOSE, e);
        logger.traceException(e);
      }
      LocalizableMessage message = ERR_TRUSTSTORE_CANNOT_RETRIEVE_CERT.get(
@@ -749,10 +733,7 @@
      }
      catch (KeyStoreException e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
      if (aliases == null)
@@ -776,9 +757,9 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            if (logger.isTraceEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.VERBOSE, e);
              logger.traceException(e);
            }
            continue;
@@ -1018,10 +999,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      unacceptableReasons.add(ERR_TRUSTSTORE_CANNOT_DETERMINE_FILE.get(
              String.valueOf(cfgEntryDN),
@@ -1040,10 +1018,7 @@
      }
      catch (KeyStoreException kse)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, kse);
        }
        logger.traceException(kse);
        LocalizableMessage message = ERR_TRUSTSTORE_INVALID_TYPE.get(
                String.valueOf(storeType),
@@ -1175,10 +1150,7 @@
    }
    catch (KeyStoreException kse)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, kse);
      }
      logger.traceException(kse);
      messages.add(ERR_TRUSTSTORE_INVALID_TYPE.get(
              String.valueOf(newTrustStoreType),
@@ -1378,10 +1350,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_TRUSTSTORE_CANNOT_LOAD.get(
          trustStoreFile, getExceptionMessage(e));
@@ -1411,10 +1380,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_TRUSTSTORE_CANNOT_CREATE_FACTORY.get(
          trustStoreFile, getExceptionMessage(e));
@@ -1449,10 +1415,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_TRUSTSTORE_CANNOT_LOAD.get(
          trustStoreFile, getExceptionMessage(e));
@@ -1489,10 +1452,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_TRUSTSTORE_CANNOT_CREATE_FACTORY.get(
          trustStoreFile, getExceptionMessage(e));
@@ -1528,10 +1488,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_TRUSTSTORE_CANNOT_LOAD.get(
          trustStoreFile, getExceptionMessage(e));
@@ -1556,10 +1513,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_TRUSTSTORE_ERROR_READING_KEY.get(
           alias, trustStoreFile, getExceptionMessage(e));
opendj3-server-dev/src/server/org/opends/server/backends/jeb/ApproximateIndexer.java
@@ -22,14 +22,14 @@
 *
 *
 *      Copyright 2006-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.backends.jeb;
import java.util.*;
import org.opends.server.types.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.ApproximateMatchingRule;
/**
@@ -37,10 +37,7 @@
 */
public class ApproximateIndexer extends Indexer
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The comparator for index keys generated by this class.
@@ -174,10 +171,7 @@
        }
        catch (DirectoryException e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
      }
    }
@@ -222,10 +216,7 @@
        }
        catch (DirectoryException e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
      }
    }
opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
@@ -36,10 +36,8 @@
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.ApproximateMatchingRule;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.monitors.DatabaseEnvironmentMonitor;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.admin.std.server.LocalDBIndexCfg;
@@ -73,10 +71,7 @@
public class AttributeIndex
    implements ConfigurationChangeListener<LocalDBIndexCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -1018,10 +1013,7 @@
    }
    catch (DirectoryException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      return new EntryIDSet();
    }
  }
@@ -1171,10 +1163,7 @@
    }
    catch (DirectoryException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      return new EntryIDSet();
    }
  }
@@ -1258,10 +1247,7 @@
    }
    catch (DirectoryException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      return new EntryIDSet();
    }
  }
@@ -1445,10 +1431,7 @@
    }
    catch (DirectoryException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      return new EntryIDSet();
    }
  }
@@ -1489,10 +1472,7 @@
    }
    catch (DirectoryException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      return new EntryIDSet();
    }
  }
@@ -1619,10 +1599,7 @@
    }
    catch (DirectoryException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      return new EntryIDSet();
    }
  }
@@ -2705,10 +2682,7 @@
      }
      catch (DirectoryException e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        return IndexQuery.createNullIndexQuery().evaluate(null);
      }
    }
@@ -2776,10 +2750,7 @@
    }
    catch (DirectoryException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      return IndexQuery.createNullIndexQuery().evaluate(null);
    }
  }
opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
@@ -51,7 +51,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.*;
import org.opends.server.extensions.DiskSpaceMonitor;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.opends.server.util.RuntimeInformation;
import org.forgerock.util.Reject;
@@ -66,7 +66,6 @@
import static org.opends.messages.BackendMessages.*;
import static org.opends.messages.JebMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -79,10 +78,7 @@
    implements ConfigurationChangeListener<LocalDBBackendCfg>, AlertGenerator,
    DiskSpaceMonitorHandler
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
@@ -199,10 +195,7 @@
      }
      catch (InterruptedException e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
@@ -242,19 +235,13 @@
        return cis.getChecksum().getValue();
      } catch (Exception e) {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      } finally {
        if (fis != null) {
          try {
            fis.close();
          } catch (Exception e) {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
          }
        }
      }
@@ -306,10 +293,7 @@
    }
    catch(DatabaseException databaseException)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, databaseException);
      }
      logger.traceException(databaseException);
      LocalizableMessage message =
          WARN_JEB_GET_ENTRY_COUNT_FAILED.get(databaseException.getMessage());
      throw new InitializationException(
@@ -324,10 +308,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
            String.valueOf(dn), String.valueOf(e));
@@ -371,10 +352,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
@@ -394,10 +372,7 @@
    }
    catch (DatabaseException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_JEB_DATABASE_EXCEPTION.get(e.getMessage());
      logError(message);
    }
@@ -469,10 +444,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      return false;
    }
@@ -547,10 +519,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
@@ -617,10 +586,7 @@
    }
    catch (DatabaseException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      throw createDirectoryException(e);
    }
    finally
@@ -658,10 +624,7 @@
    }
    catch (DatabaseException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      throw createDirectoryException(e);
    }
    finally
@@ -703,10 +666,7 @@
    }
    catch (DatabaseException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      throw createDirectoryException(e);
    }
    finally
@@ -745,10 +705,7 @@
    }
    catch (DatabaseException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      throw createDirectoryException(e);
    }
    finally
@@ -790,10 +747,7 @@
    }
    catch (DatabaseException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      throw createDirectoryException(e);
    }
    finally
@@ -843,10 +797,7 @@
    }
    catch (DatabaseException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      throw createDirectoryException(e);
    }
    finally
@@ -884,10 +835,7 @@
    }
    catch (DatabaseException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      throw createDirectoryException(e);
    }
    finally
@@ -919,20 +867,14 @@
    }
    catch (IOException ioe)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ioe);
      }
      logger.traceException(ioe);
      LocalizableMessage message = ERR_JEB_EXPORT_IO_ERROR.get(ioe.getMessage());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message);
    }
    catch (DatabaseException de)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, de);
      }
      logger.traceException(de);
      throw createDirectoryException(de);
    }
    catch (IdentifiedException e)
@@ -941,10 +883,7 @@
      {
        throw (DirectoryException) e;
      }
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   e.getMessageObject());
    }
@@ -1003,10 +942,7 @@
    }
    catch (ExecutionException execEx)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, execEx);
      }
      logger.traceException(execEx);
      if (execEx.getCause() instanceof DirectoryException)
      {
        throw ((DirectoryException) execEx.getCause());
@@ -1020,38 +956,26 @@
    }
    catch (InterruptedException intEx)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, intEx);
      }
      logger.traceException(intEx);
      LocalizableMessage message = ERR_INTERRUPTED_ERROR.get(intEx.getMessage());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
              message);
    }
    catch (JebException je)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, je);
      }
      logger.traceException(je);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   je.getMessageObject());
    }
    catch (InitializationException ie)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ie);
      }
      logger.traceException(ie);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   ie.getMessageObject());
    }
    catch (ConfigException ce)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ce);
      }
      logger.traceException(ce);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   ce.getMessageObject());
    }
@@ -1073,18 +997,15 @@
        }
        // Sync the environment to disk.
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          LocalizableMessage message = NOTE_JEB_IMPORT_CLOSING_DATABASE.get();
          TRACER.debugInfo(message.toString());
          logger.trace(message.toString());
        }
      }
      catch (DatabaseException de)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, de);
        }
        logger.traceException(de);
      }
    }
  }
@@ -1136,18 +1057,12 @@
    }
    catch (DatabaseException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      throw createDirectoryException(e);
    }
    catch (JebException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   e.getMessageObject());
    }
@@ -1210,48 +1125,33 @@
    }
    catch (ExecutionException execEx)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, execEx);
      }
      logger.traceException(execEx);
      LocalizableMessage message = ERR_EXECUTION_ERROR.get(execEx.getMessage());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
              message);
    }
    catch (InterruptedException intEx)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, intEx);
      }
      logger.traceException(intEx);
      LocalizableMessage message = ERR_INTERRUPTED_ERROR.get(intEx.getMessage());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
              message);
    }
    catch (ConfigException ce)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ce);
      }
      logger.traceException(ce);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
              ce.getMessageObject());
    }
    catch (JebException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
              e.getMessageObject());
    }
    catch (InitializationException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      throw new InitializationException(e.getMessageObject());
    }
    finally
@@ -1275,10 +1175,7 @@
      }
      catch (DatabaseException e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
@@ -1408,10 +1305,7 @@
            }
            catch (Exception e)
            {
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
              resultCode = DirectoryServer.getServerErrorResultCode();
@@ -1563,9 +1457,7 @@
      return rc;
    }
    catch (DatabaseException e) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_JEB_OPEN_ENV_FAIL.get(e.getMessage());
      throw new InitializationException(message, e);
    }
opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java
@@ -54,8 +54,7 @@
import org.opends.server.types.*;
import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.JebMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -67,10 +66,7 @@
 */
public class BackupManager
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The common prefix for archive files.
@@ -168,10 +164,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message = ERR_JEB_BACKUP_CANNOT_GET_MAC.get(
              macKeyID, stackTraceToSingleLineString(e));
@@ -191,10 +184,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message = ERR_JEB_BACKUP_CANNOT_GET_DIGEST.get(
              digestAlgorithm, stackTraceToSingleLineString(e));
@@ -288,10 +278,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_JEB_BACKUP_CANNOT_CREATE_ARCHIVE_FILE.
          get(String.valueOf(archiveFilename), backupDir.getPath(),
@@ -311,10 +298,7 @@
      }
      catch (CryptoManagerException e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_JEB_BACKUP_CANNOT_GET_CIPHER.get(
                stackTraceToSingleLineString(e));
@@ -357,10 +341,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      message = ERR_JEB_BACKUP_CANNOT_LIST_LOG_FILES.get(
          backendDir.getAbsolutePath(), stackTraceToSingleLineString(e));
@@ -379,10 +360,7 @@
      }
      catch (IOException e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        message = ERR_JEB_BACKUP_CANNOT_WRITE_ARCHIVE_FILE.get(
            ZIPENTRY_EMPTY_PLACEHOLDER, stackTraceToSingleLineString(e));
        throw new DirectoryException(
@@ -435,10 +413,7 @@
          }
          catch (IOException e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            message = ERR_JEB_BACKUP_CANNOT_WRITE_ARCHIVE_FILE.get(
                zipEntryName, stackTraceToSingleLineString(e));
            throw new DirectoryException(
@@ -468,20 +443,14 @@
          }
          catch (FileNotFoundException e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            // A log file has been deleted by the cleaner since we started.
            deletedFiles = true;
          }
          catch (IOException e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            message = ERR_JEB_BACKUP_CANNOT_WRITE_ARCHIVE_FILE.get(
                logFile.getName(), stackTraceToSingleLineString(e));
            throw new DirectoryException(
@@ -509,10 +478,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            message = ERR_JEB_BACKUP_CANNOT_LIST_LOG_FILES.get(
                backendDir.getAbsolutePath(), stackTraceToSingleLineString(e));
@@ -544,10 +510,7 @@
    // to close the zipStream is clumsy. Needs cleanup and best practice.
    catch (DirectoryException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      try
      {
@@ -563,10 +526,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      message = ERR_JEB_BACKUP_CANNOT_CLOSE_ZIP_STREAM.
          get(archiveFilename, backupDir.getPath(),
@@ -608,10 +568,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      message = ERR_JEB_BACKUP_CANNOT_UPDATE_BACKUP_DESCRIPTOR.get(
          backupDir.getDescriptorPath(), stackTraceToSingleLineString(e));
@@ -665,10 +622,7 @@
    }
    catch (IOException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_JEB_BACKUP_CANNOT_RESTORE.get(
          backupInfo.getBackupID(), stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
@@ -685,10 +639,7 @@
      }
      catch (IOException e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_JEB_BACKUP_CANNOT_RESTORE.get(
            dependent.getBackupID(), stackTraceToSingleLineString(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
@@ -703,10 +654,7 @@
    }
    catch (IOException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_JEB_BACKUP_CANNOT_RESTORE.get(
          backupInfo.getBackupID(), stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
@@ -761,10 +709,7 @@
    }
    catch (ConfigException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   e.getMessageObject());
    }
@@ -775,10 +720,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_JEB_BACKUP_CANNOT_UPDATE_BACKUP_DESCRIPTOR.get(
          backupDir.getDescriptorPath(), stackTraceToSingleLineString(e));
@@ -856,10 +798,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_JEB_BACKUP_CANNOT_GET_MAC.get(
            macKeyID, stackTraceToSingleLineString(e));
@@ -879,10 +818,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_JEB_BACKUP_CANNOT_GET_DIGEST.get(
            digestAlgorithm, stackTraceToSingleLineString(e));
@@ -902,10 +838,7 @@
      }
      catch (CryptoManagerException e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_JEB_BACKUP_CANNOT_GET_CIPHER.get(
            stackTraceToSingleLineString(e));
@@ -1228,10 +1161,7 @@
      }
      catch (CryptoManagerException e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_JEB_BACKUP_CANNOT_GET_CIPHER.get(
                stackTraceToSingleLineString(e));
opendj3-server-dev/src/server/org/opends/server/backends/jeb/ConfigurableEnvironment.java
@@ -34,6 +34,7 @@
import java.util.logging.Logger;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.admin.BooleanPropertyDefinition;
import org.opends.server.admin.DurationPropertyDefinition;
import org.opends.server.admin.PropertyDefinition;
@@ -41,9 +42,6 @@
import org.opends.server.admin.std.server.LocalDBBackendCfg;
import org.opends.server.config.ConfigConstants;
import org.opends.server.config.ConfigException;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
import com.sleepycat.je.Durability;
import com.sleepycat.je.EnvironmentConfig;
import com.sleepycat.je.dbi.MemoryBudget;
@@ -54,17 +52,13 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.JebMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
/**
 * This class maps JE properties to configuration attributes.
 */
public class ConfigurableEnvironment
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The name of the attribute which configures the database cache size as a
@@ -374,10 +368,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      return "";
    }
  }
@@ -409,10 +400,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
  }
@@ -596,9 +584,7 @@
          // Add this property to unique set.
          uniqueJEProperties.add(jePropertyName);
        } catch(IllegalArgumentException e) {
          if (debugEnabled()) {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message =
            ERR_CONFIG_JE_PROPERTY_INVALID.get(
            jeEntry, e.getMessage());
opendj3-server-dev/src/server/org/opends/server/backends/jeb/DN2ID.java
@@ -29,8 +29,7 @@
import com.sleepycat.je.*;
import org.opends.server.types.DN;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.Comparator;
@@ -41,10 +40,7 @@
 */
public class DN2ID extends DatabaseContainer
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The key comparator used for the DN database.
opendj3-server-dev/src/server/org/opends/server/backends/jeb/DN2URI.java
@@ -32,7 +32,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.opends.server.util.StaticUtils;
@@ -40,7 +40,6 @@
import java.util.*;
import static org.opends.server.util.ServerConstants.ATTR_REFERRAL_URL;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.messages.JebMessages.
     NOTE_JEB_REFERRAL_RESULT_MESSAGE;
/**
@@ -53,10 +52,7 @@
 */
public class DN2URI extends DatabaseContainer
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The key comparator used for the DN database.
@@ -262,10 +258,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      return ConditionResult.UNDEFINED;
    }
@@ -496,10 +489,7 @@
      }
      catch (DirectoryException e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        // Return the non-LDAP URI as is.
      }
@@ -578,17 +568,11 @@
    }
    catch (DatabaseException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
    catch (UnsupportedEncodingException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
  }
@@ -720,10 +704,7 @@
            }
            catch (DirectoryException e)
            {
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
              // Return the non-LDAP URI as is.
            }
@@ -745,17 +726,11 @@
    }
    catch (DatabaseException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
    catch (UnsupportedEncodingException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
    return true;
opendj3-server-dev/src/server/org/opends/server/backends/jeb/DatabaseContainer.java
@@ -22,15 +22,15 @@
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Portions Copyright 2011 ForgeRock AS
 *      Portions Copyright 2011-2014 ForgeRock AS
 */
package org.opends.server.backends.jeb;
import com.sleepycat.je.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
/**
 * This class is a wrapper around the JE database object and provides basic
@@ -38,10 +38,7 @@
 */
public abstract class DatabaseContainer
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The database entryContainer.
@@ -104,9 +101,9 @@
      try
      {
        database = env.openDatabase(txn, name, dbConfig);
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugVerbose("JE database %s opened. txnid=%d",
          logger.trace("JE database %s opened. txnid=%d",
                              database.getDatabaseName(),
                              txn.getId());
        }
@@ -121,9 +118,9 @@
    else
    {
      database = env.openDatabase(null, name, dbConfig);
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugVerbose("JE database %s opened. txnid=none",
        logger.trace("JE database %s opened. txnid=none",
                            database.getDatabaseName());
      }
    }
@@ -153,9 +150,9 @@
    database.close();
    database = null;
    if(debugEnabled())
    if(logger.isTraceEnabled())
    {
      TRACER.debugInfo("Closed database %s", name);
      logger.trace("Closed database %s", name);
    }
  }
@@ -173,10 +170,9 @@
      throws DatabaseException
  {
    OperationStatus status = database.put(txn, key, data);
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugJEAccess(DebugLogLevel.VERBOSE, status, database,
                           txn, key, data);
      logger.trace(messageToLog(status, database, txn, key, data));
    }
    return status;
  }
@@ -198,10 +194,9 @@
      throws DatabaseException
  {
    OperationStatus status = database.get(txn, key, data, lockMode);
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugJEAccess(DebugLogLevel.VERBOSE, status, database, txn, key,
                           data);
      logger.trace(messageToLog(status, database, txn, key, data));
    }
    return status;
  }
@@ -220,10 +215,9 @@
      throws DatabaseException
  {
    OperationStatus status = database.putNoOverwrite(txn, key, data);
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugJEAccess(DebugLogLevel.VERBOSE, status, database, txn, key,
                           data);
      logger.trace(messageToLog(status, database, txn, key, data));
    }
    return status;
  }
@@ -241,10 +235,9 @@
      throws DatabaseException
  {
    OperationStatus status = database.delete(txn, key);
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugJEAccess(DebugLogLevel.VERBOSE, status, database, txn,
                           key, null);
      logger.trace(messageToLog(status, database, txn, key, null));
    }
    return status;
  }
@@ -289,10 +282,9 @@
  public long getRecordCount() throws DatabaseException
  {
    long count = database.count();
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugJEAccess(DebugLogLevel.VERBOSE, OperationStatus.SUCCESS,
                    database, null, null, null);
      logger.trace(messageToLog(OperationStatus.SUCCESS, database, null, null, null));
    }
    return count;
  }
@@ -339,4 +331,61 @@
  {
    this.name = name;
  }
  /** Returns the message to log given the provided information. */
  private String messageToLog(OperationStatus status, Database database,
      Transaction txn, DatabaseEntry key, DatabaseEntry data)
  {
    StringBuilder builder = new StringBuilder();
    builder.append(" (");
    builder.append(status.toString());
    builder.append(")");
    builder.append(" db=");
    try
    {
      builder.append(database.getDatabaseName());
    }
    catch (DatabaseException de)
    {
      builder.append(de.toString());
    }
    if (txn != null)
    {
      builder.append(" txnid=");
      try
      {
        builder.append(txn.getId());
      }
      catch (DatabaseException de)
      {
        builder.append(de.toString());
      }
    }
    else
    {
      builder.append(" txnid=none");
    }
    builder.append(ServerConstants.EOL);
    if (key != null)
    {
      builder.append("key:");
      builder.append(ServerConstants.EOL);
      StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
    }
    // If the operation was successful we log the same common information
    // plus the data
    if (status == OperationStatus.SUCCESS && data != null)
    {
      builder.append("data(len=");
      builder.append(data.getSize());
      builder.append("):");
      builder.append(ServerConstants.EOL);
      StaticUtils.byteArrayToHexPlusAscii(builder, data.getData(), 4);
    }
    return builder.toString();
  }
}
opendj3-server-dev/src/server/org/opends/server/backends/jeb/DbPreloadComparator.java
@@ -22,11 +22,11 @@
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.backends.jeb;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.Comparator;
@@ -37,10 +37,7 @@
public class DbPreloadComparator
    implements Comparator<DatabaseContainer>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java
@@ -47,13 +47,11 @@
import java.util.concurrent.atomic.AtomicLong;
import org.opends.server.api.DirectoryThread;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
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.debug.DebugLogger.*;
import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.messages.ExtensionMessages.*;
@@ -77,10 +75,7 @@
 */
class EntryCachePreloader
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * BackendImpl object.
@@ -247,9 +242,7 @@
        jeb.getBackendID(), processedEntries.get());
      logError(message);
    } catch (InterruptedException ex) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, ex);
      }
      logger.traceException(ex);
      // Interrupt the collector.
      collector.interrupt();
      // Interrupt all preload threads.
@@ -300,9 +293,7 @@
            DirectoryServer.getEntryCache().putEntry(entry, jeb, entryID);
            processedEntries.getAndIncrement();
          } catch (Exception ex) {
            if (debugEnabled()) {
              TRACER.debugCaught(DebugLogLevel.ERROR, ex);
            }
            logger.traceException(ex);
            LocalizableMessage message = ERR_CACHE_PRELOAD_ENTRY_FAILED.get(
              entry.getName().toNormalizedString(),
              (ex.getCause() != null ? ex.getCause().getMessage() :
@@ -362,9 +353,7 @@
                try {
                  cursor.close();
                } catch (DatabaseException de) {
                  if (debugEnabled()) {
                    TRACER.debugCaught(DebugLogLevel.ERROR, de);
                  }
                  logger.traceException(de);
                }
                status = OperationStatus.SUCCESS;
                cursor = null;
@@ -378,9 +367,7 @@
          } catch (InterruptedException e) {
            return;
          } catch (Exception e) {
            if (debugEnabled()) {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
          }
        }
      } finally {
@@ -389,9 +376,7 @@
          try {
            cursor.close();
          } catch (DatabaseException de) {
            if (debugEnabled()) {
              TRACER.debugCaught(DebugLogLevel.ERROR, de);
            }
            logger.traceException(de);
          }
        }
      }
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -29,7 +29,6 @@
import static org.opends.messages.JebMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
import com.sleepycat.je.*;
@@ -53,7 +52,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.controls.*;
import org.opends.server.core.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
@@ -68,10 +67,7 @@
public class EntryContainer
implements ConfigurationChangeListener<LocalDBBackendCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
@@ -599,10 +595,7 @@
    }
    catch (DatabaseException de)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, de);
      }
      logger.traceException(de);
      close();
      throw de;
    }
@@ -1264,10 +1257,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        String str = pageRequest.getCookie().toHexString();
        LocalizableMessage msg = ERR_JEB_INVALID_PAGED_RESULTS_COOKIE.get(str);
        throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
@@ -1396,10 +1386,7 @@
    }
    catch (DatabaseException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
    if (pageRequest != null)
@@ -1457,10 +1444,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        String str = pageRequest.getCookie().toHexString();
        LocalizableMessage msg = ERR_JEB_INVALID_PAGED_RESULTS_COOKIE.get(str);
        throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
@@ -1508,10 +1492,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            continue;
          }
        }
@@ -2169,10 +2150,7 @@
    }
    catch (DatabaseException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
    return false;
@@ -2464,9 +2442,9 @@
          // and added back into the attribute indexes.
          newApexID = rootContainer.getNextEntryID();
          if(debugEnabled())
          if(logger.isTraceEnabled())
          {
            TRACER.debugInfo("Move of target entry requires renumbering" +
            logger.trace("Move of target entry requires renumbering" +
                "all entries in the subtree. " +
                "Old DN: %s " +
                "New DN: %s " +
@@ -2551,9 +2529,9 @@
          {
            newID = rootContainer.getNextEntryID();
            if(debugEnabled())
            if(logger.isTraceEnabled())
            {
              TRACER.debugInfo("Move of subordinate entry requires " +
              logger.trace("Move of subordinate entry requires " +
                  "renumbering. " +
                  "Old DN: %s " +
                  "New DN: %s " +
@@ -3249,9 +3227,9 @@
    Transaction parentTxn = null;
    TransactionConfig txnConfig = null;
    Transaction txn = env.beginTransaction(parentTxn, txnConfig);
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugVerbose("beginTransaction", "begin txnid=" + txn.getId());
      logger.trace("beginTransaction", "begin txnid=" + txn.getId());
    }
    return txn;
  }
@@ -3269,9 +3247,9 @@
    if (txn != null)
    {
      txn.commit();
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugVerbose("commit txnid=%d", txn.getId());
        logger.trace("commit txnid=%d", txn.getId());
      }
    }
  }
@@ -3289,9 +3267,9 @@
    if (txn != null)
    {
      txn.abort();
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugVerbose("abort txnid=%d", txn.getId());
        logger.trace("abort txnid=%d", txn.getId());
      }
    }
  }
@@ -3751,10 +3729,7 @@
      }
      catch(Exception de)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, de);
        }
        logger.traceException(de);
        // This is mainly used during the unit tests, so it's not essential.
        try
@@ -3766,10 +3741,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, de);
          }
          logger.traceException(de);
        }
      }
    }
@@ -3812,9 +3784,9 @@
    {
      database.open();
    }
    if(debugEnabled())
    if(logger.isTraceEnabled())
    {
      TRACER.debugVerbose("Cleared the database %s", database.getName());
      logger.trace("Cleared the database %s", database.getName());
    }
  }
@@ -3922,10 +3894,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
    // The base entry must exist for a successful result.
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EnvManager.java
@@ -27,9 +27,7 @@
package org.opends.server.backends.jeb;
import org.forgerock.i18n.LocalizableMessage;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.JebMessages.*;
import java.io.File;
@@ -40,10 +38,7 @@
 */
public class EnvManager
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
@@ -97,10 +92,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_JEB_CREATE_FAIL.get(e.getMessage());
        throw new JebException(message, e);
      }
@@ -140,10 +132,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_JEB_REMOVE_FAIL.get(e.getMessage());
      throw new JebException(message, e);
    }
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EqualityIndexer.java
@@ -22,12 +22,11 @@
 *
 *
 *      Copyright 2006-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.backends.jeb;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
@@ -43,10 +42,7 @@
 */
public class EqualityIndexer extends Indexer
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -181,10 +177,7 @@
        }
        catch (DirectoryException e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
      }
    }
@@ -228,10 +221,7 @@
        }
        catch (DirectoryException e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
      }
    }
opendj3-server-dev/src/server/org/opends/server/backends/jeb/ExportJob.java
@@ -43,8 +43,7 @@
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.JebMessages.*;
/**
@@ -52,10 +51,7 @@
 */
public class ExportJob
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
@@ -217,11 +213,11 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
            logger.traceException(e);
            TRACER.debugError("Malformed id2entry ID %s.%n",
            logger.trace("Malformed id2entry ID %s.%n",
                            StaticUtils.bytesToHex(key.getData()));
          }
          skippedCount++;
@@ -242,11 +238,11 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
            logger.traceException(e);
            TRACER.debugError("Malformed id2entry record for ID %d:%n%s%n",
            logger.trace("Malformed id2entry record for ID %d:%n%s%n",
                       entryID.longValue(),
                       StaticUtils.bytesToHex(data.getData()));
          }
opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2Entry.java
@@ -28,9 +28,7 @@
import org.forgerock.i18n.LocalizableMessage;
import static org.opends.server.core.DirectoryServer.getMaxInternalBufferSize;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.JebMessages.*;
@@ -60,10 +58,7 @@
 */
public class ID2Entry extends DatabaseContainer
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Parameters for compression and encryption.
@@ -250,9 +245,9 @@
      catch(IOException ioe)
      {
        // TODO: This should never happen with byte buffer.
        if(debugEnabled())
        if(logger.isTraceEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, ioe);
          logger.traceException(ioe);
        }
      }
    }
opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java
@@ -22,12 +22,11 @@
 *
 *
 *      Copyright 2006-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2012-2013 ForgeRock AS
 *      Portions Copyright 2012-2014 ForgeRock AS
 */
package org.opends.server.backends.jeb;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.loggers.ErrorLogger.*;
import com.sleepycat.je.*;
@@ -47,10 +46,7 @@
 */
public class Index extends DatabaseContainer
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The indexer object to construct index keys from LDAP attribute values.
@@ -452,11 +448,11 @@
        }
        entryLimitExceededCount++;
        if(debugEnabled())
        if(logger.isTraceEnabled())
        {
          StringBuilder builder = new StringBuilder();
          StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
          TRACER.debugInfo("Index entry exceeded in index %s. " +
          logger.trace("Index entry exceeded in index %s. " +
              "Limit: %d. ID list size: %d.\nKey:%s",
              name, indexEntryLimit, entryIDList.size(),
              builder.toString());
@@ -505,11 +501,11 @@
      if(status != OperationStatus.SUCCESS)
      {
        if(debugEnabled())
        if(logger.isTraceEnabled())
        {
          StringBuilder builder = new StringBuilder();
          StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
          TRACER.debugError(
          logger.trace(
                  "The expected key does not exist in the index %s.\nKey:%s ",
                  name, builder.toString());
        }
@@ -561,11 +557,11 @@
      {
        if(deletedIDs != null && !rebuildRunning && trusted)
        {
          if(debugEnabled())
          if(logger.isTraceEnabled())
          {
            StringBuilder builder = new StringBuilder();
            StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
            TRACER.debugError(
            logger.trace(
                  "The expected key does not exist in the index %s.\nKey:%s ",
                  name, builder.toString());
          }
@@ -632,11 +628,11 @@
            }
            entryLimitExceededCount++;
            if(debugEnabled())
            if(logger.isTraceEnabled())
            {
              StringBuilder builder = new StringBuilder();
              StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
              TRACER.debugInfo("Index entry exceeded in index %s. " +
              logger.trace("Index entry exceeded in index %s. " +
                  "Limit: %d. ID list size: %d.\nKey:%s",
                  name, indexEntryLimit, idCountDelta + addedIDs.size(),
                  builder.toString());
@@ -684,11 +680,11 @@
    {
      if(deletedIDs != null && !rebuildRunning && trusted)
      {
        if(debugEnabled())
        if(logger.isTraceEnabled())
        {
          StringBuilder builder = new StringBuilder();
          StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
          TRACER.debugError(
          logger.trace(
                "The expected key does not exist in the index %s.\nKey:%s",
                name, builder.toString());
        }
@@ -790,11 +786,11 @@
        // will probably not be rebuilt.
        if(trusted && !rebuildRunning)
        {
          if(debugEnabled())
          if(logger.isTraceEnabled())
          {
            StringBuilder builder = new StringBuilder();
            StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
            TRACER.debugError(
            logger.trace(
                  "The expected key does not exist in the index %s.\nKey:%s",
                  name, builder.toString());
          }
@@ -839,11 +835,11 @@
      // probably already removed.
      if (!entryIDList.remove(entryID) && !rebuildRunning && trusted)
      {
        if(debugEnabled())
        if(logger.isTraceEnabled())
        {
          StringBuilder builder = new StringBuilder();
          StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
          TRACER.debugError("The expected entry ID does not exist in " +
          logger.trace("The expected entry ID does not exist in " +
                "the entry ID list for index %s.\nKey:%s",
                name, builder.toString());
        }
@@ -874,11 +870,11 @@
      // will probably not be rebuilt.
      if(trusted && !rebuildRunning)
      {
        if(debugEnabled())
        if(logger.isTraceEnabled())
        {
          StringBuilder builder = new StringBuilder();
          StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
          TRACER.debugError(
          logger.trace(
                "The expected key does not exist in the index %s.\nKey:%s",
                name, builder.toString());
        }
@@ -1010,10 +1006,7 @@
    }
    catch (DatabaseException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      return new EntryIDSet();
    }
  }
@@ -1165,10 +1158,7 @@
    }
    catch (DatabaseException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      return new EntryIDSet();
    }
  }
opendj3-server-dev/src/server/org/opends/server/backends/jeb/JECompressedSchema.java
@@ -29,9 +29,6 @@
import static org.opends.messages.JebMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.debug.DebugLogger.getTracer;
import java.io.IOException;
import java.util.Collection;
import java.util.LinkedList;
@@ -40,13 +37,12 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.CompressedSchema;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.asn1.ASN1;
import org.opends.server.protocols.asn1.ASN1Exception;
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
@@ -79,11 +75,7 @@
   * definitions.
   */
  private static final String DB_NAME_OC = "compressed_object_classes";
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // The compressed attribute description schema database.
  private Database adDatabase;
@@ -292,10 +284,7 @@
    }
    catch (final ASN1Exception ae)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ae);
      }
      logger.traceException(ae);
      final LocalizableMessage m = ERR_JEB_COMPSCHEMA_CANNOT_DECODE_OC_TOKEN.get(ae
          .getMessage());
@@ -334,10 +323,7 @@
    }
    catch (final ASN1Exception ae)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ae);
      }
      logger.traceException(ae);
      final LocalizableMessage m = ERR_JEB_COMPSCHEMA_CANNOT_DECODE_AD_TOKEN.get(ae
          .getMessage());
opendj3-server-dev/src/server/org/opends/server/backends/jeb/JebFormat.java
@@ -26,8 +26,7 @@
 */
package org.opends.server.backends.jeb;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.DN;
import org.opends.server.types.RDN;
import org.forgerock.opendj.ldap.ByteStringBuilder;
@@ -42,10 +41,7 @@
 */
public class JebFormat
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
opendj3-server-dev/src/server/org/opends/server/backends/jeb/OrderingIndexer.java
@@ -22,12 +22,11 @@
 *
 *
 *      Copyright 2006-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.backends.jeb;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.types.Attribute;
@@ -44,10 +43,7 @@
 */
public class OrderingIndexer extends Indexer
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -179,10 +175,7 @@
        }
        catch (DirectoryException e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
      }
    }
@@ -228,10 +221,7 @@
        }
        catch (DirectoryException e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
      }
    }
opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java
@@ -34,7 +34,6 @@
import java.util.*;
import java.io.File;
import org.opends.server.monitors.DatabaseEnvironmentMonitor;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DN;
import org.opends.server.types.FilePermission;
import org.opends.server.types.ConfigChangeResult;
@@ -45,8 +44,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.config.ConfigException;
import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.InitializationException;
import static org.opends.messages.JebMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -60,10 +58,7 @@
public class RootContainer
     implements ConfigurationChangeListener<LocalDBBackendCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
@@ -217,9 +212,9 @@
    env = new Environment(backendDirectory,
                          envConfig);
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("JE (%s) environment opened with the following " +
      logger.trace("JE (%s) environment opened with the following " +
          "config: %n%s", JEVersion.CURRENT_VERSION.toString(),
                          env.getConfig().toString());
@@ -236,9 +231,9 @@
      // after garbage collection and decrease as new objects are created.
      long heapFreeSize = Runtime.getRuntime().freeMemory();
      TRACER.debugInfo("Current size of heap: %d bytes", heapSize);
      TRACER.debugInfo("Max size of heap: %d bytes", heapMaxSize);
      TRACER.debugInfo("Free memory in heap: %d bytes", heapFreeSize);
      logger.trace("Current size of heap: %d bytes", heapSize);
      logger.trace("Max size of heap: %d bytes", heapMaxSize);
      logger.trace("Free memory in heap: %d bytes", heapFreeSize);
    }
    compressedSchema = new JECompressedSchema(env);
@@ -434,9 +429,9 @@
          preloadConfig.setMaxMillisecs(timeRemaining);
          PreloadStats preloadStats = db.preload(preloadConfig);
          if(debugEnabled())
          if(logger.isTraceEnabled())
          {
            TRACER.debugInfo("file=" + db.getName() +
            logger.trace("file=" + db.getName() +
                      " LNs=" + preloadStats.getNLNsLoaded());
          }
@@ -484,10 +479,7 @@
      }
      catch (DatabaseException e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message =
          ERR_JEB_CACHE_PRELOAD.get(backend.getBackendID(),
@@ -805,8 +797,8 @@
                adminActionRequired = true;
                messages.add(INFO_CONFIG_JE_PROPERTY_REQUIRES_RESTART.get(
                        jePropertyName));
                if(debugEnabled()) {
                  TRACER.debugInfo("The change to the following property " +
                if(logger.isTraceEnabled()) {
                  logger.trace("The change to the following property " +
                    "will take effect when the component is restarted: " +
                    jePropertyName);
                }
@@ -838,9 +830,9 @@
                messages.add(NOTE_JEB_CONFIG_ATTR_REQUIRES_RESTART
                    .get(param.getName()));
              }
              if(debugEnabled())
              if(logger.isTraceEnabled())
              {
                TRACER.debugInfo("The change to the following property will " +
                logger.trace("The change to the following property will " +
                    "take effect when the backend is restarted: " +
                    param.getName());
              }
@@ -852,9 +844,9 @@
        // properties that are mutable at runtime.
        env.setMutableConfig(newEnvConfig);
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugInfo(env.getConfig().toString());
          logger.trace(env.getConfig().toString());
        }
      }
opendj3-server-dev/src/server/org/opends/server/backends/jeb/SubstringIndexer.java
@@ -26,8 +26,7 @@
 */
package org.opends.server.backends.jeb;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import java.util.*;
import org.opends.server.api.SubstringMatchingRule;
@@ -37,10 +36,7 @@
 */
public class SubstringIndexer extends Indexer
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -181,10 +177,7 @@
        }
        catch (DirectoryException e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
      }
    }
@@ -267,10 +260,7 @@
        }
        catch (DirectoryException e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
      }
    }
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java
@@ -28,7 +28,7 @@
import org.forgerock.i18n.LocalizableMessage;
import com.sleepycat.je.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
@@ -47,7 +47,6 @@
    ERR_JEB_CONFIG_VLV_INDEX_BAD_FILTER;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.util.StaticUtils;
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
import org.opends.server.api.OrderingMatchingRule;
@@ -73,10 +72,7 @@
public class VLVIndex extends DatabaseContainer
    implements ConfigurationChangeListener<LocalDBVLVIndexCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The comparator for vlvIndex keys.
@@ -672,22 +668,22 @@
      if(status != OperationStatus.SUCCESS)
      {
        // There are no records in the database
        if(debugEnabled())
        if(logger.isTraceEnabled())
        {
          TRACER.debugVerbose("No sort values set exist in VLV vlvIndex %s. " +
          logger.trace("No sort values set exist in VLV vlvIndex %s. " +
              "Creating unbound set.", config.getName());
        }
        sortValuesSet = new SortValuesSet(this);
      }
      else
      {
        if(debugEnabled())
        if(logger.isTraceEnabled())
        {
          StringBuilder searchKeyHex = new StringBuilder();
          StaticUtils.byteArrayToHexPlusAscii(searchKeyHex, key.getData(), 4);
          StringBuilder foundKeyHex = new StringBuilder();
          StaticUtils.byteArrayToHexPlusAscii(foundKeyHex, key.getData(), 4);
          TRACER.debugVerbose("Retrieved a sort values set in VLV vlvIndex " +
          logger.trace("Retrieved a sort values set in VLV vlvIndex " +
              "%s\nSearch Key:%s\nFound Key:%s\n",
                              config.getName(),
                              searchKeyHex,
@@ -759,9 +755,9 @@
    if(status != OperationStatus.SUCCESS)
    {
      // There are no records in the database
      if(debugEnabled())
      if(logger.isTraceEnabled())
      {
        TRACER.debugVerbose("No sort values set exist in VLV vlvIndex %s. " +
        logger.trace("No sort values set exist in VLV vlvIndex %s. " +
            "Creating unbound set.", config.getName());
      }
      sortValuesSet = new SortValuesSet(this);
@@ -769,13 +765,13 @@
    }
    else
    {
      if(debugEnabled())
      if(logger.isTraceEnabled())
      {
        StringBuilder searchKeyHex = new StringBuilder();
        StaticUtils.byteArrayToHexPlusAscii(searchKeyHex, key.getData(), 4);
        StringBuilder foundKeyHex = new StringBuilder();
        StaticUtils.byteArrayToHexPlusAscii(foundKeyHex, key.getData(), 4);
        TRACER.debugVerbose("Retrieved a sort values set in VLV vlvIndex " +
        logger.trace("Retrieved a sort values set in VLV vlvIndex " +
            "%s\nSearch Key:%s\nFound Key:%s\n",
                            config.getName(),
                            searchKeyHex,
@@ -803,9 +799,9 @@
      data.setData(after);
      put(txn, key, data);
      if(debugEnabled())
      if(logger.isTraceEnabled())
      {
        TRACER.debugInfo("SortValuesSet with key %s has reached" +
        logger.trace("SortValuesSet with key %s has reached" +
            " the entry size of %d. Spliting into two sets with " +
            " keys %s and %s.", splitSortValuesSet.getKeySortValues(),
                                newSize, sortValuesSet.getKeySortValues(),
@@ -852,13 +848,13 @@
    if(status == OperationStatus.SUCCESS)
    {
      if(debugEnabled())
      if(logger.isTraceEnabled())
      {
        StringBuilder searchKeyHex = new StringBuilder();
        StaticUtils.byteArrayToHexPlusAscii(searchKeyHex, key.getData(), 4);
        StringBuilder foundKeyHex = new StringBuilder();
        StaticUtils.byteArrayToHexPlusAscii(foundKeyHex, key.getData(), 4);
        TRACER.debugVerbose("Retrieved a sort values set in VLV vlvIndex " +
        logger.trace("Retrieved a sort values set in VLV vlvIndex " +
            "%s\nSearch Key:%s\nFound Key:%s\n",
                            config.getName(),
                            searchKeyHex,
@@ -980,9 +976,9 @@
      if(status != OperationStatus.SUCCESS)
      {
        // There are no records in the database
        if(debugEnabled())
        if(logger.isTraceEnabled())
        {
          TRACER.debugVerbose("No sort values set exist in VLV vlvIndex %s. " +
          logger.trace("No sort values set exist in VLV vlvIndex %s. " +
              "Creating unbound set.", config.getName());
        }
        sortValuesSet = new SortValuesSet(this);
@@ -990,13 +986,13 @@
      }
      else
      {
        if(debugEnabled())
        if(logger.isTraceEnabled())
        {
          StringBuilder searchKeyHex = new StringBuilder();
          StaticUtils.byteArrayToHexPlusAscii(searchKeyHex, key.getData(), 4);
          StringBuilder foundKeyHex = new StringBuilder();
          StaticUtils.byteArrayToHexPlusAscii(foundKeyHex, key.getData(), 4);
          TRACER.debugVerbose("Retrieved a sort values set in VLV vlvIndex " +
          logger.trace("Retrieved a sort values set in VLV vlvIndex " +
              "%s\nSearch Key:%s\nFound Key:%s\n",
              config.getName(),
              searchKeyHex,
@@ -1084,9 +1080,9 @@
        data.setData(after);
        put(txn, key, data);
        if(debugEnabled())
        if(logger.isTraceEnabled())
        {
          TRACER.debugInfo("SortValuesSet with key %s has reached" +
          logger.trace("SortValuesSet with key %s has reached" +
              " the entry size of %d. Spliting into two sets with " +
              " keys %s and %s.", splitSortValuesSet.getKeySortValues(),
              newSize, sortValuesSet.getKeySortValues(),
@@ -1232,7 +1228,7 @@
          status = cursor.getFirst(key, data,lockMode);
          while(status == OperationStatus.SUCCESS)
          {
            if(debugEnabled())
            if(logger.isTraceEnabled())
            {
              StringBuilder searchKeyHex = new StringBuilder();
              StaticUtils.byteArrayToHexPlusAscii(searchKeyHex, key.getData(),
@@ -1240,7 +1236,7 @@
              StringBuilder foundKeyHex = new StringBuilder();
              StaticUtils.byteArrayToHexPlusAscii(foundKeyHex, key.getData(),
                                                  4);
              TRACER.debugVerbose("Retrieved a sort values set in VLV " +
              logger.trace("Retrieved a sort values set in VLV " +
                  "vlvIndex %s\nSearch Key:%s\nFound Key:%s\n",
                                  config.getName(),
                                  searchKeyHex,
@@ -1307,7 +1303,7 @@
          status = cursor.getSearchKeyRange(key, data, lockMode);
          if(status == OperationStatus.SUCCESS)
          {
            if(debugEnabled())
            if(logger.isTraceEnabled())
            {
              StringBuilder searchKeyHex = new StringBuilder();
              StaticUtils.byteArrayToHexPlusAscii(searchKeyHex, key.getData(),
@@ -1315,7 +1311,7 @@
              StringBuilder foundKeyHex = new StringBuilder();
              StaticUtils.byteArrayToHexPlusAscii(foundKeyHex, key.getData(),
                                                  4);
              TRACER.debugVerbose("Retrieved a sort values set in VLV " +
              logger.trace("Retrieved a sort values set in VLV " +
                  "vlvIndex %s\nSearch Key:%s\nFound Key:%s\n",
                                  config.getName(),
                                  searchKeyHex,
@@ -1451,13 +1447,13 @@
        status = cursor.getFirst(key, data, lockMode);
        while(status == OperationStatus.SUCCESS)
        {
          if(debugEnabled())
          if(logger.isTraceEnabled())
          {
            StringBuilder searchKeyHex = new StringBuilder();
            StaticUtils.byteArrayToHexPlusAscii(searchKeyHex, key.getData(), 4);
            StringBuilder foundKeyHex = new StringBuilder();
            StaticUtils.byteArrayToHexPlusAscii(foundKeyHex, key.getData(), 4);
            TRACER.debugVerbose("Retrieved a sort values set in VLV vlvIndex " +
            logger.trace("Retrieved a sort values set in VLV vlvIndex " +
                "%s\nSearch Key:%s\nFound Key:%s\n",
                                config.getName(),
                                searchKeyHex,
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
@@ -29,8 +29,7 @@
import org.forgerock.i18n.LocalizableMessage;
import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.OrderingMatchingRule;
@@ -51,10 +50,7 @@
 */
public class VerifyJob
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
@@ -467,11 +463,11 @@
        catch (Exception e)
        {
          errorCount++;
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
            logger.traceException(e);
            TRACER.debugError("Malformed id2entry ID %s.%n",
            logger.trace("Malformed id2entry ID %s.%n",
                       StaticUtils.bytesToHex(key.getData()));
          }
          continue;
@@ -489,11 +485,11 @@
        catch (Exception e)
        {
          errorCount++;
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
            logger.traceException(e);
            TRACER.debugError("Malformed id2entry record for ID %d:%n%s%n",
            logger.trace("Malformed id2entry record for ID %d:%n%s%n",
                       entryID.longValue(),
                       StaticUtils.bytesToHex(data.getData()));
          }
@@ -505,9 +501,9 @@
      if (keyCount != storedEntryCount)
      {
        errorCount++;
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugError("The stored entry count in id2entry (%d) does " +
          logger.trace("The stored entry count in id2entry (%d) does " +
              "not agree with the actual number of entry " +
              "records found (%d).%n", storedEntryCount, keyCount);
        }
@@ -594,11 +590,11 @@
        catch (Exception e)
        {
          errorCount++;
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
            logger.traceException(e);
            TRACER.debugError("File dn2id has malformed ID for DN <%s>:%n%s%n",
            logger.trace("File dn2id has malformed ID for DN <%s>:%n%s%n",
                       new String(key.getData()),
                       StaticUtils.bytesToHex(data.getData()));
          }
@@ -613,19 +609,16 @@
        catch (Exception e)
        {
          errorCount++;
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          continue;
        }
        if (entry == null)
        {
          errorCount++;
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugError("File dn2id has DN <%s> referencing unknown " +
            logger.trace("File dn2id has DN <%s> referencing unknown " +
                "ID %d%n", new String(key.getData()), entryID.longValue());
          }
        }
@@ -636,9 +629,9 @@
                             key.getData()))
          {
            errorCount++;
            if (debugEnabled())
            if (logger.isTraceEnabled())
            {
              TRACER.debugError("File dn2id has DN <%s> referencing entry " +
              logger.trace("File dn2id has DN <%s> referencing entry " +
                  "with wrong DN <%s>%n", new String(key.getData()),
                                          entry.getName().toNormalizedString());
            }
@@ -680,11 +673,11 @@
        catch (Exception e)
        {
          errorCount++;
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
            logger.traceException(e);
            TRACER.debugError("File id2children has malformed ID %s%n",
            logger.trace("File id2children has malformed ID %s%n",
                       StaticUtils.bytesToHex(key.getData()));
          }
          continue;
@@ -700,11 +693,11 @@
        catch (Exception e)
        {
          errorCount++;
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
            logger.traceException(e);
            TRACER.debugError("File id2children has malformed ID list " +
            logger.trace("File id2children has malformed ID list " +
                "for ID %s:%n%s%n", entryID,
                                    StaticUtils.bytesToHex(data.getData()));
          }
@@ -722,10 +715,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            errorCount++;
            continue;
          }
@@ -733,9 +723,9 @@
          if (entry == null)
          {
            errorCount++;
            if (debugEnabled())
            if (logger.isTraceEnabled())
            {
              TRACER.debugError("File id2children has unknown ID %d%n",
              logger.trace("File id2children has unknown ID %d%n",
                         entryID.longValue());
            }
            continue;
@@ -750,10 +740,7 @@
            }
            catch (Exception e)
            {
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
              errorCount++;
              continue;
            }
@@ -761,9 +748,9 @@
            if (childEntry == null)
            {
              errorCount++;
              if (debugEnabled())
              if (logger.isTraceEnabled())
              {
                TRACER.debugError("File id2children has ID %d referencing " +
                logger.trace("File id2children has ID %d referencing " +
                    "unknown ID %d%n", entryID.longValue(), id.longValue());
              }
              continue;
@@ -774,9 +761,9 @@
                 entry.getName().size() + 1)
            {
              errorCount++;
              if (debugEnabled())
              if (logger.isTraceEnabled())
              {
                TRACER.debugError("File id2children has ID %d with DN <%s> " +
                logger.trace("File id2children has ID %d with DN <%s> " +
                    "referencing ID %d with non-child DN <%s>%n",
                           entryID.longValue(), entry.getName().toString(),
                           id.longValue(), childEntry.getName().toString());
@@ -820,11 +807,11 @@
        catch (Exception e)
        {
          errorCount++;
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
            logger.traceException(e);
            TRACER.debugError("File id2subtree has malformed ID %s%n",
            logger.trace("File id2subtree has malformed ID %s%n",
                       StaticUtils.bytesToHex(key.getData()));
          }
          continue;
@@ -839,11 +826,11 @@
        catch (Exception e)
        {
          errorCount++;
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
            logger.traceException(e);
            TRACER.debugError("File id2subtree has malformed ID list " +
            logger.trace("File id2subtree has malformed ID list " +
                "for ID %s:%n%s%n", entryID,
                                    StaticUtils.bytesToHex(data.getData()));
          }
@@ -861,10 +848,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            errorCount++;
            continue;
          }
@@ -872,9 +856,9 @@
          if (entry == null)
          {
            errorCount++;
            if (debugEnabled())
            if (logger.isTraceEnabled())
            {
              TRACER.debugError("File id2subtree has unknown ID %d%n",
              logger.trace("File id2subtree has unknown ID %d%n",
                         entryID.longValue());
            }
            continue;
@@ -889,10 +873,7 @@
            }
            catch (Exception e)
            {
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
              errorCount++;
              continue;
            }
@@ -900,9 +881,9 @@
            if (subordEntry == null)
            {
              errorCount++;
              if (debugEnabled())
              if (logger.isTraceEnabled())
              {
                TRACER.debugError("File id2subtree has ID %d referencing " +
                logger.trace("File id2subtree has ID %d referencing " +
                    "unknown ID %d%n", entryID.longValue(), id.longValue());
              }
              continue;
@@ -911,9 +892,9 @@
            if (!subordEntry.getName().isDescendantOf(entry.getName()))
            {
              errorCount++;
              if (debugEnabled())
              if (logger.isTraceEnabled())
              {
                TRACER.debugError("File id2subtree has ID %d with DN <%s> " +
                logger.trace("File id2subtree has ID %d with DN <%s> " +
                    "referencing ID %d with non-subordinate " +
                    "DN <%s>%n",
                           entryID.longValue(), entry.getName().toString(),
@@ -1019,9 +1000,9 @@
          if(lastValues != null && lastValues.compareTo(values) >= 1)
          {
            // Make sure the values is larger then the previous one.
            if(debugEnabled())
            if(logger.isTraceEnabled())
            {
              TRACER.debugError("Values %s and %s are incorrectly ordered",
              logger.trace("Values %s and %s are incorrectly ordered",
                                lastValues, values, keyDump(vlvIndex,
                                          sortValuesSet.getKeySortValues()));
            }
@@ -1036,9 +1017,9 @@
                                                   values.getValues());
            if(!Arrays.equals(key.getData(), encodedKey))
            {
              if(debugEnabled())
              if(logger.isTraceEnabled())
              {
                TRACER.debugError("Incorrect key for SortValuesSet in VLV " +
                logger.trace("Incorrect key for SortValuesSet in VLV " +
                    "index %s. Last values bytes %s, Key bytes %s",
                                  vlvIndex.getName(), encodedKey, key);
              }
@@ -1057,10 +1038,7 @@
            }
            catch (Exception e)
            {
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
              errorCount++;
              continue;
            }
@@ -1068,9 +1046,9 @@
            if (entry == null)
            {
              errorCount++;
              if (debugEnabled())
              if (logger.isTraceEnabled())
              {
                TRACER.debugError("Reference to unknown ID %d%n%s",
                logger.trace("Reference to unknown ID %d%n%s",
                                  id.longValue(),
                                  keyDump(vlvIndex,
                                          sortValuesSet.getKeySortValues()));
@@ -1083,9 +1061,9 @@
            if(entryValues.compareTo(values) != 0)
            {
              errorCount++;
              if(debugEnabled())
              if(logger.isTraceEnabled())
              {
                TRACER.debugError("Reference to entry ID %d " +
                logger.trace("Reference to entry ID %d " +
                    "which does not match the values%n%s",
                                  id.longValue(),
                                  keyDump(vlvIndex,
@@ -1140,11 +1118,11 @@
        catch (Exception e)
        {
          errorCount++;
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
            logger.traceException(e);
            TRACER.debugError("Malformed ID list: %s%n%s",
            logger.trace("Malformed ID list: %s%n%s",
                       StaticUtils.bytesToHex(data.getData()),
                       keyDump(index, key.getData()));
          }
@@ -1162,9 +1140,9 @@
          {
            if (prevID != null && id.equals(prevID))
            {
              if (debugEnabled())
              if (logger.isTraceEnabled())
              {
                TRACER.debugError("Duplicate reference to ID %d%n%s",
                logger.trace("Duplicate reference to ID %d%n%s",
                           id.longValue(), keyDump(index, key.getData()));
              }
            }
@@ -1177,10 +1155,7 @@
            }
            catch (Exception e)
            {
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
              errorCount++;
              continue;
            }
@@ -1188,9 +1163,9 @@
            if (entry == null)
            {
              errorCount++;
              if (debugEnabled())
              if (logger.isTraceEnabled())
              {
                TRACER.debugError("Reference to unknown ID %d%n%s",
                logger.trace("Reference to unknown ID %d%n%s",
                           id.longValue(), keyDump(index, key.getData()));
              }
              continue;
@@ -1238,9 +1213,9 @@
            if (!foundMatchingKey.get())
            {
              errorCount++;
              if (debugEnabled())
              if (logger.isTraceEnabled())
              {
                TRACER.debugError("Reference to entry "
                logger.trace("Reference to entry "
                    + "<%s> which does not match the value%n%s",
                    entry.getName(),
                    keyDump(index, value));
@@ -1295,18 +1270,18 @@
      EntryID id = dn2id.get(null, dn, LockMode.DEFAULT);
      if (id == null)
      {
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugError("File dn2id is missing key %s.%n",
          logger.trace("File dn2id is missing key %s.%n",
                     dn.toNormalizedString());
        }
        errorCount++;
      }
      else if (!id.equals(entryID))
      {
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugError("File dn2id has ID %d instead of %d for key %s.%n",
          logger.trace("File dn2id has ID %d instead of %d for key %s.%n",
                     id.longValue(),
                     entryID.longValue(),
                     dn.toNormalizedString());
@@ -1316,11 +1291,11 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
        logger.traceException(e);
        TRACER.debugError("File dn2id has error reading key %s: %s.%n",
        logger.trace("File dn2id has error reading key %s: %s.%n",
                   dn.toNormalizedString(),
                   e.getMessage());
      }
@@ -1336,9 +1311,9 @@
        EntryID id = dn2id.get(null, parentDN, LockMode.DEFAULT);
        if (id == null)
        {
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugError("File dn2id is missing key %s.%n",
            logger.trace("File dn2id is missing key %s.%n",
                       parentDN.toNormalizedString());
          }
          errorCount++;
@@ -1346,11 +1321,11 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
          logger.traceException(e);
          TRACER.debugError("File dn2id has error reading key %s: %s.%n",
          logger.trace("File dn2id has error reading key %s: %s.%n",
                     parentDN.toNormalizedString(),
                     e.getMessage());
        }
@@ -1378,9 +1353,9 @@
        parentID = dn2id.get(null, parentDN, LockMode.DEFAULT);
        if (parentID == null)
        {
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugError("File dn2id is missing key %s.%n",
            logger.trace("File dn2id is missing key %s.%n",
                       parentDN.toNormalizedString());
          }
          errorCount++;
@@ -1388,11 +1363,11 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
          logger.traceException(e);
          TRACER.debugError("File dn2id has error reading key %s: %s.",
          logger.trace("File dn2id has error reading key %s: %s.",
                     parentDN.toNormalizedString(),
                     e.getMessage());
        }
@@ -1406,9 +1381,9 @@
          cr = id2c.containsID(null, parentID.getDatabaseEntry(), entryID);
          if (cr == ConditionResult.FALSE)
          {
            if (debugEnabled())
            if (logger.isTraceEnabled())
            {
              TRACER.debugError("File id2children is missing ID %d " +
              logger.trace("File id2children is missing ID %d " +
                  "for key %d.%n",
                         entryID.longValue(), parentID.longValue());
            }
@@ -1421,11 +1396,11 @@
        }
        catch (DatabaseException e)
        {
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
            logger.traceException(e);
            TRACER.debugError("File id2children has error reading key %d: %s.",
            logger.trace("File id2children has error reading key %d: %s.",
                       parentID.longValue(), e.getMessage());
          }
          errorCount++;
@@ -1450,9 +1425,9 @@
        id = dn2id.get(null, dn, LockMode.DEFAULT);
        if (id == null)
        {
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugError("File dn2id is missing key %s.%n",
            logger.trace("File dn2id is missing key %s.%n",
                       dn.toNormalizedString());
          }
          errorCount++;
@@ -1460,11 +1435,11 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
          logger.traceException(e);
          TRACER.debugError("File dn2id has error reading key %s: %s.%n",
          logger.trace("File dn2id has error reading key %s: %s.%n",
                     dn.toNormalizedString(),
                     e.getMessage());
        }
@@ -1478,9 +1453,9 @@
          cr = id2s.containsID(null, id.getDatabaseEntry(), entryID);
          if (cr == ConditionResult.FALSE)
          {
            if (debugEnabled())
            if (logger.isTraceEnabled())
            {
              TRACER.debugError("File id2subtree is missing ID %d " +
              logger.trace("File id2subtree is missing ID %d " +
                  "for key %d.%n",
                         entryID.longValue(), id.longValue());
            }
@@ -1493,11 +1468,11 @@
        }
        catch (DatabaseException e)
        {
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
            logger.traceException(e);
            TRACER.debugError("File id2subtree has error reading key %d: %s.%n",
            logger.trace("File id2subtree has error reading key %d: %s.%n",
                       id.longValue(), e.getMessage());
          }
          errorCount++;
@@ -1595,11 +1570,11 @@
      }
      catch (DirectoryException e)
      {
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
          logger.traceException(e);
          TRACER.debugError("Error normalizing values of attribute %s in " +
          logger.trace("Error normalizing values of attribute %s in " +
              "entry <%s>: %s.%n",
                     attrIndex.getAttributeType().toString(),
                     entry.getName().toString(),
@@ -1617,9 +1592,9 @@
          if(!vlvIndex.containsValues(null, entryID.longValue(),
                                  vlvIndex.getSortValues(entry)))
          {
            if(debugEnabled())
            if(logger.isTraceEnabled())
            {
              TRACER.debugError("Missing entry %s in VLV index %s",
              logger.trace("Missing entry %s in VLV index %s",
                                entry.getName().toString(),
                                vlvIndex.getName());
            }
@@ -1629,11 +1604,11 @@
      }
      catch (DirectoryException e)
      {
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
          logger.traceException(e);
          TRACER.debugError("Error checking entry %s against filter or " +
          logger.trace("Error checking entry %s against filter or " +
              "base DN for VLV index %s: %s",
                     entry.getName().toString(),
                     vlvIndex.getName(),
@@ -1643,11 +1618,11 @@
      }
      catch (DatabaseException e)
      {
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
          logger.traceException(e);
          TRACER.debugError("Error reading VLV index %s for entry %s: %s",
          logger.trace("Error reading VLV index %s for entry %s: %s",
                     vlvIndex.getName(),
                     entry.getName().toString(),
                     StaticUtils.getBacktrace(e));
@@ -1656,11 +1631,11 @@
      }
      catch (JebException e)
      {
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
          logger.traceException(e);
          TRACER.debugError("Error reading VLV index %s for entry %s: %s",
          logger.trace("Error reading VLV index %s for entry %s: %s",
                     vlvIndex.getName(),
                     entry.getName().toString(),
                     StaticUtils.getBacktrace(e));
@@ -1700,9 +1675,9 @@
        cr = presenceIndex.containsID(txn, presenceKey, entryID);
        if (cr == ConditionResult.FALSE)
        {
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugError("Missing ID %d%n%s",
            logger.trace("Missing ID %d%n%s",
                       entryID.longValue(),
                       keyDump(presenceIndex, presenceKey.getData()));
          }
@@ -1715,11 +1690,11 @@
      }
      catch (DatabaseException e)
      {
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
          logger.traceException(e);
          TRACER.debugError("Error reading database: %s%n%s",
          logger.trace("Error reading database: %s%n%s",
                     e.getMessage(),
                     keyDump(presenceIndex, presenceKey.getData()));
        }
@@ -1745,9 +1720,9 @@
              cr = equalityIndex.containsID(txn, key, entryID);
              if (cr == ConditionResult.FALSE)
              {
                if (debugEnabled())
                if (logger.isTraceEnabled())
                {
                  TRACER.debugError("Missing ID %d%n%s",
                  logger.trace("Missing ID %d%n%s",
                             entryID.longValue(),
                             keyDump(equalityIndex, normalizedBytes));
                }
@@ -1760,11 +1735,11 @@
            }
            catch (DatabaseException e)
            {
              if (debugEnabled())
              if (logger.isTraceEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
                logger.traceException(e);
                TRACER.debugError("Error reading database: %s%n%s",
                logger.trace("Error reading database: %s%n%s",
                           e.getMessage(),
                           keyDump(equalityIndex, normalizedBytes));
              }
@@ -1787,9 +1762,9 @@
                cr = substringIndex.containsID(txn, key, entryID);
                if (cr == ConditionResult.FALSE)
                {
                  if (debugEnabled())
                  if (logger.isTraceEnabled())
                  {
                    TRACER.debugError("Missing ID %d%n%s",
                    logger.trace("Missing ID %d%n%s",
                               entryID.longValue(),
                               keyDump(substringIndex, key.getData()));
                  }
@@ -1802,11 +1777,11 @@
              }
              catch (DatabaseException e)
              {
                if (debugEnabled())
                if (logger.isTraceEnabled())
                {
                  TRACER.debugCaught(DebugLogLevel.ERROR, e);
                  logger.traceException(e);
                  TRACER.debugError("Error reading database: %s%n%s",
                  logger.trace("Error reading database: %s%n%s",
                             e.getMessage(),
                             keyDump(substringIndex, key.getData()));
                }
@@ -1832,9 +1807,9 @@
              cr = orderingIndex.containsID(txn, key, entryID);
              if (cr == ConditionResult.FALSE)
              {
                if (debugEnabled())
                if (logger.isTraceEnabled())
                {
                  TRACER.debugError("Missing ID %d%n%s",
                  logger.trace("Missing ID %d%n%s",
                             entryID.longValue(),
                             keyDump(orderingIndex, normalizedBytes));
                }
@@ -1847,11 +1822,11 @@
            }
            catch (DatabaseException e)
            {
              if (debugEnabled())
              if (logger.isTraceEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
                logger.traceException(e);
                TRACER.debugError("Error reading database: %s%n%s",
                logger.trace("Error reading database: %s%n%s",
                           e.getMessage(),
                           keyDump(orderingIndex, normalizedBytes));
              }
@@ -1875,9 +1850,9 @@
              cr = approximateIndex.containsID(txn, key, entryID);
              if (cr == ConditionResult.FALSE)
              {
                if (debugEnabled())
                if (logger.isTraceEnabled())
                {
                  TRACER.debugError("Missing ID %d%n%s",
                  logger.trace("Missing ID %d%n%s",
                             entryID.longValue(),
                             keyDump(orderingIndex, normalizedBytes));
                }
@@ -1890,11 +1865,11 @@
            }
            catch (DatabaseException e)
            {
              if (debugEnabled())
              if (logger.isTraceEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
                logger.traceException(e);
                TRACER.debugError("Error reading database: %s%n%s",
                logger.trace("Error reading database: %s%n%s",
                           e.getMessage(),
                           keyDump(approximateIndex, normalizedBytes));
              }
@@ -2079,10 +2054,7 @@
      }
      catch (DatabaseException e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
@@ -30,8 +30,6 @@
import static org.opends.messages.JebMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.debug.DebugLogger.getTracer;
import static org.opends.server.util.DynamicConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -54,7 +52,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.DiskSpaceMonitor;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.LDIFReader;
@@ -70,10 +68,7 @@
 */
public final class Importer implements DiskSpaceMonitorHandler
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  private static final int TIMER_INTERVAL = 10000;
  private static final int KB = 1024;
@@ -3324,10 +3319,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_JEB_IMPORT_LDIF_REBUILD_INDEX_TASK_ERR.get(
          stackTraceToSingleLineString(e));
        logError(message);
opendj3-server-dev/src/server/org/opends/server/backends/task/RecurringTask.java
@@ -49,10 +49,8 @@
import org.opends.server.types.ResultCode;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.Attributes;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.RDN;
import static org.opends.messages.BackendMessages.*;
@@ -70,10 +68,7 @@
 */
public class RecurringTask
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -304,10 +299,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_RECURRINGTASK_CANNOT_LOAD_CLASS.
          get(String.valueOf(taskClassName), ATTR_TASK_CLASS,
@@ -324,10 +316,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_RECURRINGTASK_CANNOT_INSTANTIATE_CLASS_AS_TASK.get(
          String.valueOf(taskClassName), Task.class.getName());
@@ -344,10 +333,7 @@
    }
    catch (InitializationException ie)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ie);
      }
      logger.traceException(ie);
      LocalizableMessage message = ERR_RECURRINGTASK_CANNOT_INITIALIZE_INTERNAL.get(
          String.valueOf(taskClassName), ie.getMessage());
@@ -425,10 +411,7 @@
    try {
      nextTaskDate = getNextIteration(calendar);
    } catch (IllegalArgumentException e) {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
        ERR_RECURRINGTASK_INVALID_TOKENS_COMBO.get(
@@ -468,10 +451,7 @@
      nextTask.initializeTask();
    } catch (Exception e) {
      // Should not happen, debug log it otherwise.
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
    return nextTask;
opendj3-server-dev/src/server/org/opends/server/backends/task/Task.java
@@ -30,7 +30,6 @@
import static org.opends.messages.BackendMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -52,7 +51,7 @@
import org.opends.messages.Severity;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.opends.server.util.EMailMessage;
import org.opends.server.util.StaticUtils;
@@ -67,10 +66,7 @@
public abstract class Task
       implements Comparable<Task>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -251,10 +247,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message =
            ERR_TASK_CANNOT_PARSE_SCHEDULED_START_TIME.get(timeString, taskDN);
@@ -285,10 +278,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message =
            ERR_TASK_CANNOT_PARSE_ACTUAL_START_TIME.get(timeString, taskDN);
@@ -319,10 +309,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message =
            ERR_TASK_CANNOT_PARSE_COMPLETION_TIME.get(timeString, taskDN);
@@ -1194,10 +1181,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      taskState = TaskState.STOPPED_BY_ERROR;
opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
@@ -48,7 +48,7 @@
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.opends.server.core.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.opends.server.util.*;
import org.forgerock.util.Reject;
@@ -56,7 +56,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.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -71,10 +70,7 @@
       extends Backend
       implements ConfigurationChangeListener<TaskBackendCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -180,10 +176,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        // This should never happen.
        LocalizableMessage message = ERR_TASKBE_CANNOT_DECODE_RECURRING_TASK_BASE_DN.get(
@@ -199,10 +192,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        // This should never happen.
        LocalizableMessage message = ERR_TASKBE_CANNOT_DECODE_SCHEDULED_TASK_BASE_DN.get(
@@ -268,10 +258,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
          taskRootDN.toString(), getExceptionMessage(e));
@@ -296,10 +283,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
    try
@@ -312,10 +296,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
    try
@@ -324,10 +305,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
  }
@@ -1152,10 +1130,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_TASKS_CANNOT_EXPORT_TO_FILE.get(
          stackTraceToSingleLineString(e));
@@ -1197,10 +1172,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
    finally
    {
@@ -1210,10 +1182,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
      try
      {
@@ -1221,10 +1190,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
@@ -1325,10 +1291,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message = ERR_TASKS_BACKUP_CANNOT_GET_MAC.get(
              macKeyID, stackTraceToSingleLineString(e));
@@ -1348,10 +1311,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message = ERR_TASKS_BACKUP_CANNOT_GET_DIGEST.get(
              digestAlgorithm, stackTraceToSingleLineString(e));
@@ -1400,10 +1360,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_TASKS_BACKUP_CANNOT_CREATE_ARCHIVE_FILE.
          get(String.valueOf(filename), backupDirectory.getPath(),
@@ -1424,10 +1381,7 @@
      }
      catch (CryptoManagerException e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_TASKS_BACKUP_CANNOT_GET_CIPHER.get(
                stackTraceToSingleLineString(e));
@@ -1495,9 +1449,7 @@
      zipStream.closeEntry();
      inputStream.close();
    } catch (Exception e) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      try {
        inputStream.close();
@@ -1524,10 +1476,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      message = ERR_TASKS_BACKUP_CANNOT_CLOSE_ZIP_STREAM.get(
          filename, backupDirectory.getPath(), stackTraceToSingleLineString(e));
@@ -1567,10 +1516,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      message = ERR_TASKS_BACKUP_CANNOT_UPDATE_BACKUP_DESCRIPTOR.get(
          backupDirectory.getDescriptorPath(), stackTraceToSingleLineString(e));
@@ -1610,10 +1556,7 @@
    }
    catch (ConfigException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   e.getMessageObject());
    }
@@ -1624,10 +1567,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_BACKUP_CANNOT_UPDATE_BACKUP_DESCRIPTOR.get(
        backupDirectory.getDescriptorPath(), stackTraceToSingleLineString(e));
@@ -2069,10 +2009,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      unacceptableReasons.add(ERR_TASKBE_ERROR_GETTING_BACKING_FILE.get(
              getExceptionMessage(e)));
@@ -2140,10 +2077,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      messages.add(ERR_TASKBE_ERROR_GETTING_BACKING_FILE.get(
              getExceptionMessage(e)));
opendj3-server-dev/src/server/org/opends/server/backends/task/TaskScheduler.java
@@ -31,7 +31,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.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -47,7 +46,7 @@
import org.opends.server.api.DirectoryThread;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.opends.server.util.LDIFException;
import org.opends.server.util.LDIFReader;
@@ -65,10 +64,7 @@
       extends DirectoryThread
       implements AlertGenerator
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The fully-qualified name of this class.
@@ -576,10 +572,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
      String taskID = completedTask.getTaskID();
@@ -653,10 +646,7 @@
            // log error and continue.
            if (de.getResultCode() != ResultCode.ENTRY_ALREADY_EXISTS)
            {
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, de);
              }
              logger.traceException(de);
              LocalizableMessage message =
                  ERR_TASKSCHED_ERROR_SCHEDULING_RECURRING_ITERATION.
@@ -725,10 +715,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
    try
@@ -737,10 +724,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
    pendingTasks.clear();
@@ -798,10 +782,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
@@ -817,10 +798,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
      }
    }
@@ -1079,10 +1057,7 @@
        }
        catch (LDIFException le)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, le);
          }
          logger.traceException(le);
          if (le.canContinueReading())
          {
@@ -1100,10 +1075,7 @@
            }
            catch (Exception e)
            {
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
            }
            LocalizableMessage message = ERR_TASKSCHED_CANNOT_PARSE_ENTRY_FATAL.get(
@@ -1168,10 +1140,7 @@
            }
            catch (DirectoryException de)
            {
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, de);
              }
              logger.traceException(de);
              LocalizableMessage message = ERR_TASKSCHED_CANNOT_SCHEDULE_TASK_FROM_ENTRY.
                  get(String.valueOf(entryDN), de.getMessageObject());
@@ -1187,10 +1156,7 @@
            }
            catch (DirectoryException de)
            {
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, de);
              }
              logger.traceException(de);
              LocalizableMessage message =
                  ERR_TASKSCHED_CANNOT_SCHEDULE_RECURRING_TASK_FROM_ENTRY.
@@ -1211,10 +1177,7 @@
    }
    catch (IOException ioe)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ioe);
      }
      logger.traceException(ioe);
      LocalizableMessage message = ERR_TASKSCHED_ERROR_READING_TASK_BACKING_FILE.get(
          String.valueOf(backingFilePath), stackTraceToSingleLineString(ioe));
@@ -1267,10 +1230,7 @@
    }
    catch (IOException ioe)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ioe);
      }
      logger.traceException(ioe);
      LocalizableMessage message = ERR_TASKSCHED_CANNOT_CREATE_BACKING_FILE.get(
          backingFile, stackTraceToSingleLineString(ioe));
@@ -1278,10 +1238,7 @@
    }
    catch (LDIFException le)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, le);
      }
      logger.traceException(le);
      LocalizableMessage message = ERR_TASKSCHED_CANNOT_CREATE_BACKING_FILE.get(
@@ -1349,10 +1306,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
@@ -1367,10 +1321,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = WARN_TASKSCHED_CANNOT_RENAME_CURRENT_BACKING_FILE.
            get(String.valueOf(backingFilePath),
@@ -1392,10 +1343,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_TASKSCHED_CANNOT_RENAME_NEW_BACKING_FILE.
            get(String.valueOf(tmpFilePath), String.valueOf(backingFilePath),
@@ -1409,10 +1357,7 @@
    }
    catch (IOException ioe)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ioe);
      }
      logger.traceException(ioe);
      LocalizableMessage message = ERR_TASKSCHED_CANNOT_WRITE_BACKING_FILE.get(
          tmpFilePath, stackTraceToSingleLineString(ioe));
@@ -1422,10 +1367,7 @@
    }
    catch (LDIFException le)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, le);
      }
      logger.traceException(le);
      LocalizableMessage message = ERR_TASKSCHED_CANNOT_WRITE_BACKING_FILE.get(
@@ -1436,10 +1378,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_TASKSCHED_CANNOT_WRITE_BACKING_FILE.get(
          tmpFilePath, stackTraceToSingleLineString(e));
@@ -2006,10 +1945,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_TASKSCHED_CANNOT_LOAD_CLASS.
          get(String.valueOf(taskClassName), ATTR_TASK_CLASS,
@@ -2026,10 +1962,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_TASKSCHED_CANNOT_INSTANTIATE_CLASS_AS_TASK.get(
          String.valueOf(taskClassName), Task.class.getName());
@@ -2044,10 +1977,7 @@
    }
    catch (InitializationException ie)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ie);
      }
      logger.traceException(ie);
      LocalizableMessage message = ERR_TASKSCHED_CANNOT_INITIALIZE_INTERNAL.get(
          String.valueOf(taskClassName), ie.getMessage());
opendj3-server-dev/src/server/org/opends/server/backends/task/TaskThread.java
@@ -30,12 +30,10 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.DirectoryThread;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.BackendMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
/**
@@ -45,10 +43,7 @@
 */
public class TaskThread extends DirectoryThread
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -145,10 +140,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
@@ -180,10 +172,7 @@
        }
        catch (InterruptedException ie)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, ie);
          }
          logger.traceException(ie);
        }
        continue;
@@ -209,10 +198,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        Task task = getAssociatedTask();
opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java
@@ -37,11 +37,10 @@
import org.opends.server.api.ConfigChangeListener;
import org.opends.server.api.ConfigDeleteListener;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
/**
@@ -56,10 +55,7 @@
     mayInvoke=true)
public final class ConfigEntry
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -402,10 +398,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_CONFIG_ENTRY_CANNOT_REMOVE_CHILD.
            get(String.valueOf(childDN), String.valueOf(entry.getName()),
opendj3-server-dev/src/server/org/opends/server/config/DNConfigAttribute.java
@@ -43,8 +43,7 @@
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.loggers.ErrorLogger;
import static org.opends.messages.ConfigMessages.*;
/**
@@ -59,10 +58,7 @@
public final class DNConfigAttribute
       extends ConfigAttribute
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -577,10 +573,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      rejectReason.append(ERR_CONFIG_ATTR_DN_CANNOT_PARSE.get(
              value.getValue().toString(), getName(),
@@ -667,10 +660,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_CONFIG_ATTR_DN_CANNOT_PARSE.get(
                valueString, getName(),
@@ -841,10 +831,7 @@
              }
              catch (Exception e)
              {
                if (debugEnabled())
                {
                  TRACER.debugCaught(DebugLogLevel.ERROR, e);
                }
                logger.traceException(e);
                LocalizableMessage message = ERR_CONFIG_ATTR_DN_CANNOT_PARSE.get(
                    v.getValue().toString(), getName(), String.valueOf(e));
@@ -911,10 +898,7 @@
            }
            catch (Exception e)
            {
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
              LocalizableMessage message = ERR_CONFIG_ATTR_DN_CANNOT_PARSE.get(
                  v.getValue().toString(), getName(), String.valueOf(e));
@@ -1204,10 +1188,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_CONFIG_ATTR_DN_CANNOT_PARSE.get(
            (String) value, getName(), String.valueOf(e));
@@ -1248,10 +1229,7 @@
            }
            catch (Exception e)
            {
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
              LocalizableMessage message = ERR_CONFIG_ATTR_DN_CANNOT_PARSE.get(
                  valueStr, getName(), String.valueOf(e));
@@ -1265,19 +1243,13 @@
        }
        catch (ConfigException ce)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, ce);
          }
          logger.traceException(ce);
          throw ce;
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message = ERR_CONFIG_ATTR_INVALID_DN_VALUE.get(
              getName(), String.valueOf(value), String.valueOf(e));
opendj3-server-dev/src/server/org/opends/server/config/IntegerConfigAttribute.java
@@ -43,8 +43,7 @@
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.loggers.ErrorLogger;
import static org.opends.messages.ConfigMessages.*;
/**
@@ -61,10 +60,7 @@
public final class IntegerConfigAttribute
       extends ConfigAttribute
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -802,10 +798,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      rejectReason.append(ERR_CONFIG_ATTR_INVALID_INT_VALUE.get(
              getName(), stringValue, String.valueOf(e)));
@@ -893,10 +886,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_CONFIG_ATTR_INT_COULD_NOT_PARSE.get(
                valueString, getName(),
@@ -1489,10 +1479,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_CONFIG_ATTR_INT_COULD_NOT_PARSE.get(
            String.valueOf(value), getName(), String.valueOf(e));
@@ -1550,19 +1537,13 @@
      }
      catch (ConfigException ce)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, ce);
        }
        logger.traceException(ce);
        throw ce;
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_CONFIG_ATTR_INT_COULD_NOT_PARSE.get(
            componentType + "[" + length + "]", getName(), String.valueOf(e));
opendj3-server-dev/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java
@@ -44,8 +44,7 @@
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.loggers.ErrorLogger;
import static org.opends.messages.ConfigMessages.*;
/**
@@ -69,10 +68,7 @@
public final class IntegerWithUnitConfigAttribute
       extends ConfigAttribute
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -574,10 +570,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_ATTR_COULD_NOT_PARSE_INT_COMPONENT.get(
          String.valueOf(value), getName(), String.valueOf(e));
@@ -695,10 +688,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      rejectReason.append(ERR_CONFIG_ATTR_INT_COULD_NOT_PARSE.get(
              lowerValue, getName(), String.valueOf(e)));
opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java
@@ -55,7 +55,7 @@
import org.opends.server.api.InvokableComponent;
import org.opends.server.api.MonitorProvider;
import org.opends.server.core.DirectoryServer;
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.internal.InternalSearchOperation;
import org.opends.server.protocols.jmx.Credential;
@@ -65,7 +65,6 @@
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -84,10 +83,7 @@
public final class JMXMBean
       implements DynamicMBean, DirectoryServerMBean
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The fully-qualified name of this class.
@@ -162,10 +158,7 @@
          nameStr = MBEAN_BASE_DOMAIN + ":" + "Name=rootDSE" + typeStr;
      } catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
          LocalizableMessage message = ERR_CONFIG_JMX_CANNOT_REGISTER_MBEAN.get(
              configEntryDN.toString(), String.valueOf(e));
@@ -206,20 +199,14 @@
                  }
                } catch(Exception e)
                {
                  if (debugEnabled())
                  {
                    TRACER.debugCaught(DebugLogLevel.ERROR, e);
                  }
                  logger.traceException(e);
                }
                mBeanServer.registerMBean(this, objectName);
            } catch (Exception e)
            {
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
                e.printStackTrace();
                LocalizableMessage message = ERR_CONFIG_JMX_CANNOT_REGISTER_MBEAN.get(
@@ -495,10 +482,7 @@
    }
    catch (LDAPException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_JMX_CANNOT_GET_ATTRIBUTE.
          get(String.valueOf(attributeName), String.valueOf(configEntryDN),
@@ -538,10 +522,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_JMX_ATTR_NO_ATTR.get(
          String.valueOf(configEntryDN), attributeName);
@@ -640,10 +621,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
      // It's possible that this is a monitor attribute rather than a
@@ -753,19 +731,13 @@
          }
          catch (MBeanException me)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, me);
            }
            logger.traceException(me);
            throw me;
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            throw new MBeanException(e);
          }
opendj3-server-dev/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java
@@ -43,8 +43,7 @@
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.loggers.ErrorLogger;
import static org.opends.messages.ConfigMessages.*;
/**
@@ -60,10 +59,7 @@
public final class MultiChoiceConfigAttribute
       extends ConfigAttribute
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -1212,19 +1208,13 @@
        }
        catch (ConfigException ce)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, ce);
          }
          logger.traceException(ce);
          throw ce;
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message = ERR_CONFIG_ATTR_INVALID_STRING_VALUE.get(
              getName(), String.valueOf(value), String.valueOf(e));
opendj3-server-dev/src/server/org/opends/server/config/StringConfigAttribute.java
@@ -43,8 +43,7 @@
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.loggers.ErrorLogger;
import static org.opends.messages.ConfigMessages.*;
/**
@@ -59,10 +58,7 @@
public final class StringConfigAttribute
       extends ConfigAttribute
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -1105,19 +1101,13 @@
        }
        catch (ConfigException ce)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, ce);
          }
          logger.traceException(ce);
          throw ce;
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message = ERR_CONFIG_ATTR_INVALID_STRING_VALUE.get(
              getName(), String.valueOf(value), String.valueOf(e));
opendj3-server-dev/src/server/org/opends/server/controls/AccountUsableResponseControl.java
@@ -35,8 +35,7 @@
    UNIVERSAL_OCTET_STRING_TYPE;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -150,10 +149,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message =
            ERR_ACCTUSABLERES_DECODE_ERROR.get(getExceptionMessage(e));
@@ -173,11 +169,7 @@
   */
  public static final ControlDecoder<AccountUsableResponseControl> DECODER =
    new Decoder();
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
opendj3-server-dev/src/server/org/opends/server/controls/EntryChangeNotificationControl.java
@@ -37,8 +37,7 @@
    UNIVERSAL_INTEGER_TYPE;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -108,10 +107,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message =
            ERR_ECN_CANNOT_DECODE_VALUE.get(getExceptionMessage(e));
@@ -135,11 +131,7 @@
   */
  public static final ControlDecoder<EntryChangeNotificationControl> DECODER =
    new Decoder();
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
opendj3-server-dev/src/server/org/opends/server/controls/EntryChangelogNotificationControl.java
@@ -27,8 +27,6 @@
package org.opends.server.controls;
import static org.opends.messages.ProtocolMessages.ERR_ECLN_CANNOT_DECODE_VALUE;
import static org.opends.messages.ProtocolMessages.ERR_ECLN_NO_CONTROL_VALUE;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.debug.DebugLogger.getTracer;
import static org.opends.server.protocols.asn1.ASN1Constants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.getExceptionMessage;
@@ -36,13 +34,12 @@
import java.io.IOException;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.asn1.ASN1;
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
@@ -56,8 +53,7 @@
public class EntryChangelogNotificationControl
       extends Control
       {
  // The tracer object for the debug logger.
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // The cookie value - payload of this control.
  private String cookie;
@@ -91,10 +87,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message =
          ERR_ECLN_CANNOT_DECODE_VALUE.get(getExceptionMessage(e));
opendj3-server-dev/src/server/org/opends/server/controls/GetEffectiveRightsRequestControl.java
@@ -36,8 +36,7 @@
import static org.opends.server.util.ServerConstants.OID_GET_EFFECTIVE_RIGHTS;
import org.opends.server.core.DirectoryServer;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.List;
import java.util.LinkedList;
@@ -128,9 +127,7 @@
          }
          reader.readEndSequence();
        } catch (ASN1Exception e) {
          if (debugEnabled()) {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message =
              INFO_GETEFFECTIVERIGHTS_DECODE_ERROR.get(e.getMessage());
@@ -154,11 +151,7 @@
   */
  public static final ControlDecoder<GetEffectiveRightsRequestControl> DECODER =
    new Decoder();
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  //The DN representing the authzId. May be null.
  private DN authzDN=null;
opendj3-server-dev/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java
@@ -39,8 +39,7 @@
import static org.opends.server.plugins.LDAPADListPlugin.*;
import static org.opends.server.protocols.asn1.ASN1Constants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
@@ -88,10 +87,7 @@
      }
      catch (Exception ae)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, ae);
        }
        logger.traceException(ae);
        LocalizableMessage message = ERR_POSTREADREQ_CANNOT_DECODE_VALUE.get(ae
            .getMessage());
@@ -117,11 +113,7 @@
   */
  public static final ControlDecoder<LDAPPostReadRequestControl> DECODER =
      new Decoder();
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // The set of raw attributes to return in the entry.
  private Set<String> rawAttributes;
opendj3-server-dev/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java
@@ -34,8 +34,7 @@
import org.opends.server.protocols.ldap.*;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -80,10 +79,7 @@
      }
      catch (LDAPException le)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, le);
        }
        logger.traceException(le);
        LocalizableMessage message =
            ERR_POSTREADRESP_CANNOT_DECODE_VALUE.get(le.getMessage());
@@ -106,13 +102,7 @@
   */
  public static final ControlDecoder<LDAPPostReadResponseControl> DECODER =
    new Decoder();
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
opendj3-server-dev/src/server/org/opends/server/controls/LDAPPreReadRequestControl.java
@@ -41,8 +41,7 @@
import static org.opends.server.protocols.asn1.ASN1Constants.*;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -88,10 +87,7 @@
      }
      catch (Exception ae)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, ae);
        }
        logger.traceException(ae);
        LocalizableMessage message = ERR_PREREADREQ_CANNOT_DECODE_VALUE.get(ae
            .getMessage());
@@ -117,11 +113,7 @@
   */
  public static final ControlDecoder<LDAPPreReadRequestControl> DECODER =
      new Decoder();
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // The set of raw attributes to return in the entry.
  private Set<String> rawAttributes;
opendj3-server-dev/src/server/org/opends/server/controls/LDAPPreReadResponseControl.java
@@ -35,8 +35,7 @@
import org.opends.server.protocols.ldap.LDAPReader;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -81,10 +80,7 @@
      }
      catch (LDAPException le)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, le);
        }
        logger.traceException(le);
        LocalizableMessage message =
            ERR_PREREADRESP_CANNOT_DECODE_VALUE.get(le.getMessage());
@@ -107,11 +103,7 @@
   */
  public static final ControlDecoder<LDAPPreReadResponseControl> DECODER =
    new Decoder();
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesControl.java
@@ -37,8 +37,7 @@
    UNIVERSAL_OCTET_STRING_TYPE;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -96,10 +95,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_MATCHEDVALUES_CANNOT_DECODE_VALUE_AS_SEQUENCE.get(
            getExceptionMessage(e));
@@ -122,11 +118,7 @@
   */
  public static final ControlDecoder<MatchedValuesControl> DECODER =
    new Decoder();
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -214,10 +206,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesFilter.java
@@ -44,8 +44,7 @@
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.forgerock.util.Reject;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
@@ -65,10 +64,7 @@
 */
public class MatchedValuesFilter
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -758,10 +754,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message =
              ERR_MVFILTER_CANNOT_DECODE_AVA.get(getExceptionMessage(e));
@@ -822,10 +815,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message =
              ERR_MVFILTER_CANNOT_DECODE_SUBSTRINGS.get(getExceptionMessage(e));
@@ -845,10 +835,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message = ERR_MVFILTER_CANNOT_DECODE_PRESENT_TYPE.get(
              getExceptionMessage(e));
@@ -887,10 +874,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message = ERR_MVFILTER_CANNOT_DECODE_EXTENSIBLE_MATCH.get(
              getExceptionMessage(e));
@@ -1031,10 +1015,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
      }
    }
@@ -1093,10 +1074,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          normalizedSubAny = null;
        }
@@ -1140,10 +1118,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
      }
    }
@@ -1335,10 +1310,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            return false;
          }
@@ -1365,10 +1337,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            return false;
          }
@@ -1393,10 +1362,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            return false;
          }
@@ -1421,10 +1387,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            return false;
          }
@@ -1456,10 +1419,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            return false;
          }
@@ -1494,10 +1454,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            return false;
          }
@@ -1517,10 +1474,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            return false;
          }
opendj3-server-dev/src/server/org/opends/server/controls/PagedResultsControl.java
@@ -27,8 +27,7 @@
package org.opends.server.controls;
import org.forgerock.i18n.LocalizableMessage;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.OID_PAGED_RESULTS_CONTROL;
@@ -81,10 +80,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message =
            ERR_LDAP_PAGED_RESULTS_DECODE_SEQUENCE.get(String.valueOf(e));
@@ -98,10 +94,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message =
            ERR_LDAP_PAGED_RESULTS_DECODE_SIZE.get(String.valueOf(e));
@@ -115,10 +108,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message =
            ERR_LDAP_PAGED_RESULTS_DECODE_COOKIE.get(String.valueOf(e));
@@ -131,10 +121,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message =
            ERR_LDAP_PAGED_RESULTS_DECODE_SEQUENCE.get(String.valueOf(e));
@@ -156,11 +143,7 @@
   */
  public static final  ControlDecoder<PagedResultsControl> DECODER =
    new Decoder();
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
opendj3-server-dev/src/server/org/opends/server/controls/PasswordExpiringControl.java
@@ -32,8 +32,7 @@
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -76,10 +75,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PWEXPIRING_CANNOT_DECODE_SECONDS_UNTIL_EXPIRATION.
            get(getExceptionMessage(e));
@@ -103,11 +99,7 @@
   */
  public static final ControlDecoder<PasswordExpiringControl> DECODER =
    new Decoder();
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
opendj3-server-dev/src/server/org/opends/server/controls/PasswordPolicyResponseControl.java
@@ -34,8 +34,7 @@
import org.opends.server.protocols.asn1.*;
import static org.opends.server.protocols.asn1.ASN1Constants.
    UNIVERSAL_OCTET_STRING_TYPE;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
@@ -125,10 +124,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message =
            ERR_PWPOLICYRES_DECODE_ERROR.get(getExceptionMessage(e));
@@ -149,11 +145,7 @@
   */
  public static final ControlDecoder<PasswordPolicyResponseControl> DECODER =
    new Decoder();
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
opendj3-server-dev/src/server/org/opends/server/controls/PersistentSearchControl.java
@@ -34,8 +34,7 @@
import org.opends.server.protocols.asn1.*;
import static org.opends.server.protocols.asn1.ASN1Constants.
    UNIVERSAL_OCTET_STRING_TYPE;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
@@ -92,10 +91,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message =
            ERR_PSEARCH_CANNOT_DECODE_VALUE.get(getExceptionMessage(e));
@@ -119,11 +115,7 @@
   */
  public static final ControlDecoder<PersistentSearchControl> DECODER =
    new Decoder();
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV1Control.java
@@ -33,14 +33,13 @@
import org.opends.server.api.AuthenticationPolicyState;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.PasswordPolicyState;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.asn1.ASN1;
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.protocols.asn1.ASN1Constants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -92,10 +91,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message =
            ERR_PROXYAUTH1_CANNOT_DECODE_VALUE.get(getExceptionMessage(e));
@@ -118,11 +114,7 @@
   */
  public static final ControlDecoder<ProxiedAuthV1Control> DECODER =
    new Decoder();
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV2Control.java
@@ -34,14 +34,13 @@
import org.opends.server.api.IdentityMapper;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.PasswordPolicyState;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.asn1.ASN1;
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.forgerock.util.Reject.*;
@@ -98,10 +97,7 @@
        if (!lowerAuthZIDStr.startsWith("dn:") &&
            !lowerAuthZIDStr.startsWith("u:"))
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message =
              ERR_PROXYAUTH2_INVALID_AUTHZID.get(lowerAuthZIDStr);
@@ -126,11 +122,7 @@
   */
  public static final ControlDecoder<ProxiedAuthV2Control> DECODER =
    new Decoder();
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
opendj3-server-dev/src/server/org/opends/server/controls/SubentriesControl.java
@@ -30,13 +30,12 @@
import java.io.IOException;
import org.opends.server.protocols.asn1.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.protocols.asn1.ASN1Constants.
    UNIVERSAL_OCTET_STRING_TYPE;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -74,10 +73,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message =
            ERR_SUBENTRIES_CANNOT_DECODE_VALUE.get(getExceptionMessage(e));
@@ -99,11 +95,7 @@
   */
  public static final ControlDecoder<SubentriesControl> DECODER =
    new Decoder();
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // The visibility from the control value.
  private boolean visibility = false;
opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java
@@ -30,7 +30,6 @@
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -51,9 +50,8 @@
import org.opends.server.api.AccessControlHandler;
import org.opends.server.api.AlertGenerator;
import org.opends.server.config.ConfigException;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
@@ -71,10 +69,7 @@
       implements AlertGenerator ,
                  ConfigurationChangeListener<AccessControlHandlerCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // Fully qualified class name.
  private static final String CLASS_NAME =
@@ -310,9 +305,7 @@
        }
      }
    } catch (Exception e) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_AUTHZ_UNABLE_TO_INSTANTIATE_HANDLER.
              get(handlerClassName, String.valueOf(config.dn().toString()),
                      stackTraceToSingleLineString(e));
opendj3-server-dev/src/server/org/opends/server/core/AddOperationBasis.java
@@ -29,7 +29,6 @@
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.AccessLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
import java.util.ArrayList;
@@ -40,8 +39,7 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.core.networkgroups.NetworkGroup;
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.ldap.LDAPAttribute;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.*;
@@ -58,11 +56,7 @@
       extends AbstractOperation
       implements PreParseAddOperation, AddOperation, PostResponseAddOperation
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = DebugLogger.getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /** The set of response controls to send to the client. */
  private ArrayList<Control> responseControls;
@@ -239,10 +233,7 @@
    }
    catch (DirectoryException de)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, de);
      }
      logger.traceException(de);
      setResultCode(de.getResultCode());
      appendErrorMessage(de.getMessageObject());
@@ -692,10 +683,7 @@
    }
    catch(CanceledOperationException coe)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, coe);
      }
      logger.traceException(coe);
      setResultCode(ResultCode.CANCELED);
      cancelResult = new CancelResult(ResultCode.CANCELED, null);
opendj3-server-dev/src/server/org/opends/server/core/AuthenticatedUsers.java
@@ -37,10 +37,9 @@
import org.opends.server.api.ChangeNotificationListener;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.DITCacheMap;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.DisconnectReason;
import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.Entry;
import org.opends.server.types.operation.PostResponseAddOperation;
import org.opends.server.types.operation.PostResponseDeleteOperation;
@@ -48,7 +47,6 @@
import org.opends.server.types.operation.PostResponseModifyDNOperation;
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
/**
 * This class provides a data structure which maps an authenticated user DN to
@@ -63,10 +61,7 @@
public class AuthenticatedUsers
       implements ChangeNotificationListener
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // The mapping between authenticated user DNs and the associated client
  // connection objects.
@@ -330,10 +325,7 @@
            catch (Exception e)
            {
              // Shouldnt happen.
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
            }
          }
          if (authZDN == null)
@@ -352,10 +344,7 @@
            catch (Exception e)
            {
              // Shouldnt happen.
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
            }
          }
          if ((newAuthNDN != null) && (authNDN != null) &&
opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java
@@ -45,8 +45,7 @@
import org.opends.server.types.*;
import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -71,10 +70,7 @@
     ConfigurationAddListener<BackendCfg>,
     ConfigurationDeleteListener<BackendCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -131,10 +127,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message =
          ERR_CONFIG_BACKEND_CANNOT_GET_CONFIG_BASE.get(getExceptionMessage(e));
@@ -197,10 +190,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message = ERR_CONFIG_BACKEND_CANNOT_INSTANTIATE.
              get(String.valueOf(className), String.valueOf(backendDN),
@@ -260,10 +250,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message = ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK.get(
              backendID, stackTraceToSingleLineString(e));
@@ -280,10 +267,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message = ERR_CONFIG_BACKEND_CANNOT_INITIALIZE.
              get(String.valueOf(className), String.valueOf(backendDN),
@@ -304,10 +288,7 @@
          }
          catch (Exception e2)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e2);
            }
            logger.traceException(e2);
            message = WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.
                get(backendID, stackTraceToSingleLineString(e2));
@@ -334,10 +315,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message = WARN_CONFIG_BACKEND_CANNOT_REGISTER_BACKEND.get(
              backendID, getExceptionMessage(e));
@@ -413,10 +391,7 @@
        }
        catch (DirectoryException de)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, de);
          }
          logger.traceException(de);
          unacceptableReason.add(de.getMessageObject());
          return false;
@@ -431,10 +406,7 @@
        }
        catch (DirectoryException de)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, de);
          }
          logger.traceException(de);
          unacceptableReason.add(de.getMessageObject());
          return false;
@@ -468,10 +440,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      unacceptableReason.add(ERR_CONFIG_BACKEND_CANNOT_INSTANTIATE.get(
@@ -551,10 +520,7 @@
          }
          catch (Exception e2)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e2);
            }
            logger.traceException(e2);
            LocalizableMessage message = WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.
                get(backend.getBackendID(), stackTraceToSingleLineString(e2));
@@ -573,10 +539,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      messages.add(ERR_CONFIG_BACKEND_UNABLE_TO_DETERMINE_ENABLED_STATE.get(
@@ -662,10 +625,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          messages.add(ERR_CONFIG_BACKEND_CANNOT_INSTANTIATE.get(
@@ -728,10 +688,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK.get(
            backendID, stackTraceToSingleLineString(e));
@@ -752,10 +709,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        messages.add(ERR_CONFIG_BACKEND_CANNOT_INITIALIZE.get(
                String.valueOf(className), String.valueOf(backendDN),
@@ -776,10 +730,7 @@
        }
        catch (Exception e2)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e2);
          }
          logger.traceException(e2);
          LocalizableMessage message = WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.get(
              backendID, stackTraceToSingleLineString(e2));
@@ -807,10 +758,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = WARN_CONFIG_BACKEND_CANNOT_REGISTER_BACKEND.get(
                backendID, getExceptionMessage(e));
@@ -887,10 +835,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      unacceptableReason.add(ERR_CONFIG_BACKEND_CANNOT_INSTANTIATE.get(
              String.valueOf(className),
@@ -1018,10 +963,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      messages.add(ERR_CONFIG_BACKEND_CANNOT_INSTANTIATE.get(
              String.valueOf(className),
@@ -1060,10 +1002,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK.get(
          backendID, stackTraceToSingleLineString(e));
@@ -1085,10 +1024,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      messages.add(ERR_CONFIG_BACKEND_CANNOT_INITIALIZE.get(
              String.valueOf(className),
@@ -1110,10 +1046,7 @@
      }
      catch (Exception e2)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e2);
        }
        logger.traceException(e2);
        LocalizableMessage message = WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.get(
            backendID, stackTraceToSingleLineString(e2));
@@ -1141,10 +1074,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = WARN_CONFIG_BACKEND_CANNOT_REGISTER_BACKEND.get(
              backendID, getExceptionMessage(e));
@@ -1236,10 +1166,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
      for (BackendInitializationListener listener :
@@ -1266,10 +1193,7 @@
      }
      catch (Exception e2)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e2);
        }
        logger.traceException(e2);
        LocalizableMessage message = WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.get(
            backend.getBackendID(), stackTraceToSingleLineString(e2));
opendj3-server-dev/src/server/org/opends/server/core/BindOperationBasis.java
@@ -29,8 +29,6 @@
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.AccessLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import java.util.ArrayList;
import java.util.List;
@@ -38,8 +36,7 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.core.networkgroups.NetworkGroup;
import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PreParseBindOperation;
@@ -59,10 +56,7 @@
             extends AbstractOperation
             implements BindOperation, PreParseBindOperation
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = DebugLogger.getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /** The credentials used for SASL authentication. */
  private ByteString saslCredentials;
@@ -381,10 +375,7 @@
    }
    catch (DirectoryException de)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, de);
      }
      logger.traceException(de);
      setResultCode(ResultCode.INVALID_CREDENTIALS);
      setAuthFailureReason(de.getMessageObject());
@@ -741,10 +732,7 @@
    catch(CanceledOperationException coe)
    {
      // This shouldn't happen for bind operations. Just cancel anyways
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, coe);
      }
      logger.traceException(coe);
      setResultCode(ResultCode.CANCELED);
opendj3-server-dev/src/server/org/opends/server/core/CompareOperationBasis.java
@@ -28,7 +28,6 @@
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.loggers.AccessLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
import java.util.ArrayList;
@@ -39,8 +38,7 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.core.networkgroups.NetworkGroup;
import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PostResponseCompareOperation;
@@ -57,10 +55,7 @@
             implements PreParseCompareOperation, CompareOperation,
                        PostResponseCompareOperation
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = DebugLogger.getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /** The attribute type for this compare operation. */
  private AttributeType attributeType;
@@ -199,10 +194,7 @@
      }
      catch (DirectoryException de)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, de);
        }
        logger.traceException(de);
        setResultCode(de.getResultCode());
        appendErrorMessage(de.getMessageObject());
@@ -465,10 +457,7 @@
      }
      catch (DirectoryException de)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, de);
        }
        logger.traceException(de);
        setResultCode(de.getResultCode());
        appendErrorMessage(de.getMessageObject());
@@ -494,10 +483,7 @@
    }
    catch(CanceledOperationException coe)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, coe);
      }
      logger.traceException(coe);
      setResultCode(ResultCode.CANCELED);
      cancelResult = new CancelResult(ResultCode.CANCELED, null);
opendj3-server-dev/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
@@ -29,8 +29,7 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.CoreMessages.*;
@@ -57,7 +56,6 @@
import org.opends.server.protocols.ldap.LDAPConnectionHandler;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
@@ -73,10 +71,7 @@
    ConfigurationAddListener<ConnectionHandlerCfg>,
    ConfigurationDeleteListener<ConnectionHandlerCfg>,
    ConfigurationChangeListener<ConnectionHandlerCfg> {
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // The mapping between configuration entry DNs and their
@@ -127,18 +122,12 @@
        // Register the connection handler with the Directory Server.
        DirectoryServer.registerConnectionHandler(connectionHandler);
      } catch (ConfigException e) {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        messages.add(e.getMessageObject());
        resultCode = DirectoryServer.getServerErrorResultCode();
      } catch (Exception e) {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        messages.add(ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.get(
@@ -188,18 +177,12 @@
          // Server.
          DirectoryServer.registerConnectionHandler(connectionHandler);
        } catch (ConfigException e) {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          messages.add(e.getMessageObject());
          resultCode = DirectoryServer.getServerErrorResultCode();
        } catch (Exception e) {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          messages.add(ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.get(
                  String.valueOf(configuration
@@ -417,10 +400,7 @@
      theClass = pd.loadClass(className, ConnectionHandler.class);
      connectionHandler = theClass.newInstance();
    } catch (Exception e) {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.
          get(String.valueOf(className), String.valueOf(config.dn()),
@@ -439,10 +419,7 @@
      method.invoke(connectionHandler, config);
    } catch (Exception e) {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.
          get(String.valueOf(className), String.valueOf(config.dn()),
@@ -478,10 +455,7 @@
        connectionHandler = theClass.newInstance();
      }
    } catch (Exception e) {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      unacceptableReasons.add(
              ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.get(
@@ -508,10 +482,7 @@
        return false;
      }
    } catch (Exception e) {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      unacceptableReasons.add(ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.get(
              String.valueOf(className), String.valueOf(config.dn()),
opendj3-server-dev/src/server/org/opends/server/core/DefaultCompressedSchema.java
@@ -30,8 +30,6 @@
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.debug.DebugLogger.getTracer;
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
import java.io.File;
@@ -44,12 +42,11 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.CompressedSchema;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.asn1.ASN1;
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
@@ -61,10 +58,7 @@
 */
public final class DefaultCompressedSchema extends CompressedSchema
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // Synchronizes calls to save.
  private final Object saveLock = new Object();
@@ -178,10 +172,7 @@
    }
    catch (final Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      // FIXME -- Should we do something else here?
      throw new RuntimeException(e);
@@ -197,10 +188,7 @@
      }
      catch (final Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
@@ -300,10 +288,7 @@
      }
      catch (final Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        final LocalizableMessage message = ERR_COMPRESSEDSCHEMA_CANNOT_WRITE_UPDATED_DATA
            .get(stackTraceToSingleLineString(e));
@@ -321,10 +306,7 @@
        }
        catch (final Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
      }
    }
opendj3-server-dev/src/server/org/opends/server/core/DeleteOperationBasis.java
@@ -28,16 +28,13 @@
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.loggers.AccessLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import java.util.ArrayList;
import java.util.List;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.core.networkgroups.NetworkGroup;
import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PostResponseDeleteOperation;
@@ -54,10 +51,7 @@
                  DeleteOperation,
                  PostResponseDeleteOperation
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = DebugLogger.getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /** The raw, unprocessed entry DN as included in the client request. */
  private ByteString rawEntryDN;
@@ -167,10 +161,7 @@
    }
    catch (DirectoryException de)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, de);
      }
      logger.traceException(de);
      setResultCode(de.getResultCode());
      appendErrorMessage(de.getMessageObject());
@@ -334,10 +325,7 @@
    }
    catch(CanceledOperationException coe)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, coe);
      }
      logger.traceException(coe);
      setResultCode(ResultCode.CANCELED);
      cancelResult = new CancelResult(ResultCode.CANCELED, null);
opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
@@ -78,7 +78,7 @@
import org.opends.server.extensions.JMXAlertHandler;
import org.opends.server.loggers.*;
import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.loggers.debug.TextDebugLogPublisher;
import org.opends.server.monitors.BackendMonitor;
import org.opends.server.monitors.ConnectionHandlerMonitor;
@@ -102,10 +102,7 @@
public final class DirectoryServer
       implements AlertGenerator
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The singleton Directory Server instance.
@@ -1061,9 +1058,9 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.WARNING, e);
          logger.traceException(e);
        }
        directoryServer.mBeanServer =
@@ -1074,10 +1071,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CANNOT_CREATE_MBEAN_SERVER.get(String.valueOf(e));
      throw new InitializationException(message, e);
@@ -1111,10 +1105,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message =
          ERR_CANNOT_LOAD_CONFIG_HANDLER_CLASS.get(
@@ -1161,10 +1152,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message =
          ERR_CANNOT_INSTANTIATE_CONFIG_HANDLER.get(
@@ -1190,19 +1178,13 @@
    }
    catch (InitializationException ie)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ie);
      }
      logger.traceException(ie);
      throw ie;
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message =
          ERR_CANNOT_INITIALIZE_CONFIG_HANDLER.get(
@@ -1251,10 +1233,7 @@
    }
    catch (InitializationException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      throw new InitializationException(e.getMessageObject());
    }
@@ -1298,10 +1277,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message = ERR_CANNOT_ACQUIRE_EXCLUSIVE_SERVER_LOCK.get(
              lockFile, stackTraceToSingleLineString(e));
@@ -1506,10 +1482,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
      }
@@ -1620,10 +1593,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CANNOT_BOOTSTRAP_MATCHING_RULE.
          get(currentFactory.getClass().getName(),
@@ -1666,10 +1636,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      logError(ERR_CANNOT_BOOTSTRAP_SYNTAX.get(syntax.getClass().getName(),
          stackTraceToSingleLineString(e)));
@@ -1837,10 +1804,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
    try
@@ -1849,19 +1813,13 @@
    }
    catch (InitializationException ie)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ie);
      }
      logger.traceException(ie);
      throw ie;
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message =
          ERR_CANNOT_INITIALIZE_CONFIG_HANDLER.get(
@@ -2060,10 +2018,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CANNOT_GET_ROOT_DSE_CONFIG_ENTRY.get(
          stackTraceToSingleLineString(e));
@@ -2472,10 +2427,7 @@
    }
    catch (DirectoryException de)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, de);
      }
      logger.traceException(de);
      throw new InitializationException(de.getMessageObject());
    }
@@ -2677,10 +2629,7 @@
    }
    catch (DirectoryException de)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, de);
      }
      logger.traceException(de);
      throw new InitializationException(de.getMessageObject());
    }
@@ -2810,10 +2759,7 @@
         ServerManagementContext.getInstance().getRootConfiguration();
    rootDSECfg = root.getRootDSEBackend();
  }  catch (Exception e) {
    if (debugEnabled())
    {
      TRACER.debugCaught(DebugLogLevel.ERROR, e);
    }
    logger.traceException(e);
    LocalizableMessage message = ERR_CANNOT_GET_ROOT_DSE_CONFIG_ENTRY.get(
        stackTraceToSingleLineString(e));
    throw new InitializationException(message, e);
@@ -3774,10 +3720,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
          }
        }
@@ -3799,10 +3742,7 @@
        catch (Exception e)
        {
          // This should never happen.
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
      }
    }
@@ -4636,10 +4576,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
      }
    }
@@ -5367,10 +5304,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
  }
@@ -5404,10 +5338,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
@@ -7580,10 +7511,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
@@ -7609,10 +7537,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
@@ -7663,10 +7588,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
@@ -7692,10 +7614,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
@@ -7747,10 +7666,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
@@ -7776,10 +7692,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
@@ -7831,10 +7744,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
@@ -7860,10 +7770,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
@@ -7970,10 +7877,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
    directoryServer.connectionHandlers.clear();
@@ -8024,10 +7928,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
@@ -8054,10 +7955,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
          }
        }
      }
@@ -8074,10 +7972,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
@@ -8092,10 +7987,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
@@ -8146,10 +8038,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
@@ -8186,10 +8075,7 @@
        }
        catch (Exception e2)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e2);
          }
          logger.traceException(e2);
          message = WARN_SHUTDOWN_CANNOT_RELEASE_SHARED_BACKEND_LOCK.
              get(backend.getBackendID(), stackTraceToSingleLineString(e2));
@@ -8199,10 +8085,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
@@ -8224,9 +8107,7 @@
            logError(message);
        }
    } catch (Exception e) {
        if (debugEnabled()) {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
    }
    // Deregister all workflows.
@@ -8921,10 +8802,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      // This could theoretically happen if an alert needs to be sent before the
      // configuration is initialized.  In that case, just return an empty DN.
@@ -9209,10 +9087,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CANNOT_ACQUIRE_EXCLUSIVE_SERVER_LOCK.get(lockFile,
                                  stackTraceToSingleLineString(e));
@@ -9383,10 +9258,7 @@
    }
    catch (InitializationException ie)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ie);
      }
      logger.traceException(ie);
      LocalizableMessage message = ERR_DSCORE_CANNOT_BOOTSTRAP.get(ie.getMessage());
      System.err.println(message);
@@ -9406,20 +9278,14 @@
    }
    catch (InitializationException ie)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ie);
      }
      logger.traceException(ie);
      LocalizableMessage message = ERR_DSCORE_CANNOT_START.get(ie.getMessage());
      shutDown(theDirectoryServer.getClass().getName(), message);
    }
    catch (ConfigException ce)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ce);
      }
      logger.traceException(ce);
      LocalizableMessage message = ERR_DSCORE_CANNOT_START.get(ce.getMessage() +
      (ce.getCause() != null ? " " + ce.getCause().getLocalizedMessage() : ""));
opendj3-server-dev/src/server/org/opends/server/core/DirectoryServerShutdownHook.java
@@ -22,14 +22,14 @@
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.core;
import org.opends.server.api.DirectoryThread;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.CoreMessages.*;
/**
 * This class defines a shutdown hook that will be invoked automatically when
@@ -40,10 +40,7 @@
public class DirectoryServerShutdownHook
       extends DirectoryThread
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The fully-qualified name of this class.
@@ -70,7 +67,7 @@
   */
  public void run()
  {
    TRACER.debugInfo(
    logger.trace(
        "Directory Server shutdown hook has been invoked.");
    DirectoryServer.shutDown(CLASS_NAME,
opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java
@@ -50,9 +50,8 @@
import org.opends.server.admin.std.meta.EntryCacheCfgDefn;
import org.opends.server.api.EntryCache;
import org.opends.server.config.ConfigException;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
import org.forgerock.i18n.LocalizableMessageBuilder;
@@ -64,7 +63,6 @@
import org.opends.server.monitors.EntryCacheMonitorProvider;
import org.opends.server.types.DN;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.messages.ConfigMessages.*;
@@ -83,10 +81,7 @@
          ConfigurationAddListener    <EntryCacheCfg>,
          ConfigurationDeleteListener <EntryCacheCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // The default entry cache.
  private DefaultEntryCache _defaultEntryCache = null;
@@ -132,10 +127,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_ENTRYCACHE_CANNOT_INSTALL_DEFAULT_CACHE.get(
          stackTraceToSingleLineString(e));
@@ -179,10 +171,7 @@
      DN configEntryDN = DN.valueOf(ConfigConstants.DN_ENTRY_CACHE_BASE);
      entryCacheBase   = DirectoryServer.getConfigEntry(configEntryDN);
    } catch (Exception e) {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      logError(WARN_CONFIG_ENTRYCACHE_NO_CONFIG_ENTRY.get());
      return;
@@ -679,9 +668,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      if (!initialize) {
        if (e instanceof InitializationException) {
opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationBasis.java
@@ -28,7 +28,6 @@
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.loggers.AccessLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import java.util.ArrayList;
@@ -38,8 +37,7 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ExtendedOperationHandler;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PostOperationExtendedOperation;
@@ -59,10 +57,7 @@
                  PostOperationExtendedOperation,
                  PostResponseExtendedOperation
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = DebugLogger.getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /** The value for the request associated with this extended operation. */
  private ByteString requestValue;
@@ -431,10 +426,7 @@
    }
    catch(CanceledOperationException coe)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, coe);
      }
      logger.traceException(coe);
      setResultCode(ResultCode.CANCELED);
      cancelResult = new CancelResult(ResultCode.CANCELED, null);
opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationConfigManager.java
@@ -44,14 +44,12 @@
import org.opends.server.admin.std.meta.ExtendedOperationHandlerCfgDefn;
import org.opends.server.api.ExtendedOperationHandler;
import org.opends.server.config.ConfigException;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
@@ -70,10 +68,7 @@
     ConfigurationAddListener<ExtendedOperationHandlerCfg>,
     ConfigurationDeleteListener<ExtendedOperationHandlerCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -208,18 +203,12 @@
          handlers.put(dn, handler);
        } catch (ConfigException e) {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          messages.add(e.getMessageObject());
          resultCode = DirectoryServer.getServerErrorResultCode();
        } catch (Exception e) {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          messages.add(ERR_CONFIG_EXTOP_INITIALIZATION_FAILED.get(
                  String.valueOf(configuration.getJavaClass()),
@@ -294,20 +283,14 @@
      }
      catch (ConfigException e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        messages.add(e.getMessageObject());
        resultCode = DirectoryServer.getServerErrorResultCode();
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        messages.add(ERR_CONFIG_EXTOP_INITIALIZATION_FAILED.get(
                String.valueOf(configuration.getJavaClass()),
@@ -362,10 +345,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_EXTOP_INVALID_CLASS.
          get(String.valueOf(className), String.valueOf(config.dn()),
@@ -412,10 +392,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      unacceptableReasons.add(ERR_CONFIG_EXTOP_INVALID_CLASS.get(className,
                              String.valueOf(config.dn()),
opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java
@@ -49,7 +49,7 @@
import org.opends.server.api.plugin.PluginResult.PostOperation;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
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.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPControl;
@@ -60,7 +60,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.loggers.debug.DebugLogger.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -82,10 +81,7 @@
                  ConfigurationDeleteListener<GroupImplementationCfg>,
                  BackendInitializationListener
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
@@ -600,10 +596,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        continue;
      }
@@ -619,10 +612,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          continue;
        }
@@ -642,10 +632,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          // FIXME -- Is there anything that we need to do here?
          continue;
@@ -664,10 +651,7 @@
            }
            catch (DirectoryException e)
            {
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
              // Nothing specific to do, as it's already logged.
            }
          }
@@ -862,10 +846,7 @@
        {
          // Should not happen but if it does all we
          // can do here is debug log it and continue.
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, de);
          }
          logger.traceException(de);
          continue;
        }
        group.setGroupDN(groupDN);
@@ -1035,10 +1016,7 @@
      }
      catch (DirectoryException e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
  }
opendj3-server-dev/src/server/org/opends/server/core/IdleTimeLimitThread.java
@@ -33,12 +33,9 @@
import org.opends.server.api.ConnectionHandler;
import org.opends.server.api.DirectoryThread;
import org.opends.server.api.ServerShutdownListener;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.DisconnectReason;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.ErrorLogger;
import static org.opends.messages.CoreMessages.*;
@@ -57,7 +54,7 @@
  /**
   * The debug log tracer for this object.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -106,10 +103,7 @@
            catch (InterruptedException e)
            {
              // Server shutdown monitor may interrupt slow threads.
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
              shutdownRequested = true;
              break;
            }
@@ -129,9 +123,9 @@
              {
                if (idleTime >= idleTimeLimit)
                {
                  if (debugEnabled())
                  if (logger.isTraceEnabled())
                  {
                    TRACER.debugInfo("Terminating client connection " +
                    logger.trace("Terminating client connection " +
                                     c.getConnectionID() +
                                     " due to the idle time limit");
                  }
@@ -143,10 +137,7 @@
                  }
                  catch (Exception e)
                  {
                    if (debugEnabled())
                    {
                      TRACER.debugCaught(DebugLogLevel.ERROR, e);
                    }
                    logger.traceException(e);
                    LocalizableMessage message = ERR_IDLETIME_DISCONNECT_ERROR.get(
                            c.getConnectionID(),
@@ -170,10 +161,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message =
            ERR_IDLETIME_UNEXPECTED_ERROR.get(stackTraceToSingleLineString(e));
opendj3-server-dev/src/server/org/opends/server/core/LockFileManager.java
@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Portions Copyright 2013 ForgeRock AS
 *      Portions Copyright 2013-2014 ForgeRock AS
 */
package org.opends.server.core;
@@ -34,11 +34,9 @@
import java.util.Map;
import org.opends.server.api.Backend;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -49,11 +47,7 @@
 */
public class LockFileManager
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /** A map between the filenames and the lock files for exclusive locks. */
  private static Map<String, FileLock> exclusiveLocks =
@@ -122,10 +116,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        failureReason.append(
                ERR_FILELOCKER_LOCK_SHARED_FAILED_CREATE.get(lockFile,
@@ -144,10 +135,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        failureReason.append(ERR_FILELOCKER_LOCK_SHARED_FAILED_OPEN.get(
                lockFile, getExceptionMessage(e)));
@@ -164,10 +152,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        failureReason.append(
                ERR_FILELOCKER_LOCK_SHARED_FAILED_LOCK.get(
@@ -245,10 +230,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        failureReason.append(
                ERR_FILELOCKER_LOCK_EXCLUSIVE_FAILED_CREATE.get(lockFile,
                                        getExceptionMessage(e)));
@@ -266,10 +248,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        failureReason.append(ERR_FILELOCKER_LOCK_EXCLUSIVE_FAILED_OPEN.get(
                lockFile, getExceptionMessage(e)));
@@ -286,10 +265,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        failureReason.append(
                ERR_FILELOCKER_LOCK_EXCLUSIVE_FAILED_LOCK.get(lockFile,
@@ -350,10 +326,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          failureReason.append(
                  ERR_FILELOCKER_UNLOCK_EXCLUSIVE_FAILED_RELEASE.get(lockFile,
@@ -367,10 +340,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          // Even though we couldn't close the channel for some reason, this
          // should still be OK because we released the lock above.
@@ -398,10 +368,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            failureReason.append(ERR_FILELOCKER_UNLOCK_SHARED_FAILED_RELEASE
                    .get(lockFile, getExceptionMessage(e)));
@@ -414,10 +381,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            // Even though we couldn't close the channel for some reason, this
            // should still be OK because we released the lock above.
opendj3-server-dev/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java
@@ -38,12 +38,10 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.ResultCode;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.loggers.RetentionPolicy;
import org.opends.server.config.ConfigException;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -64,10 +62,7 @@
    ConfigurationDeleteListener<LogRetentionPolicyCfg>,
    ConfigurationChangeListener<LogRetentionPolicyCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
@@ -138,17 +133,11 @@
      DirectoryServer.registerRetentionPolicy(config.dn(), RetentionPolicy);
    }
    catch (ConfigException e) {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      messages.add(e.getMessageObject());
      resultCode = DirectoryServer.getServerErrorResultCode();
    } catch (Exception e) {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      messages.add(ERR_CONFIG_RETENTION_POLICY_CANNOT_CREATE_POLICY.get(
              String.valueOf(config.dn().toString()),
opendj3-server-dev/src/server/org/opends/server/core/LogRotationPolicyConfigManager.java
@@ -39,11 +39,9 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.ResultCode;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.config.ConfigException;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -64,10 +62,7 @@
    ConfigurationDeleteListener<LogRotationPolicyCfg>,
    ConfigurationChangeListener<LogRotationPolicyCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
@@ -138,17 +133,11 @@
      DirectoryServer.registerRotationPolicy(config.dn(), rotationPolicy);
    }
    catch (ConfigException e) {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      messages.add(e.getMessageObject());
      resultCode = DirectoryServer.getServerErrorResultCode();
    } catch (Exception e) {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      messages.add(ERR_CONFIG_ROTATION_POLICY_CANNOT_CREATE_POLICY.get(
              String.valueOf(config.dn().toString()),
opendj3-server-dev/src/server/org/opends/server/core/ModifyDNOperationBasis.java
@@ -28,16 +28,13 @@
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.loggers.AccessLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import java.util.ArrayList;
import java.util.List;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.core.networkgroups.NetworkGroup;
import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PostResponseModifyDNOperation;
@@ -54,11 +51,7 @@
                  PreParseModifyDNOperation,
                  PostResponseModifyDNOperation
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = DebugLogger.getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /** Indicates whether to delete the old RDN value from the entry. */
  private boolean deleteOldRDN;
@@ -237,10 +230,7 @@
    }
    catch (DirectoryException de)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, de);
      }
      logger.traceException(de);
      setResultCode(de.getResultCode());
      appendErrorMessage(de.getMessageObject());
    }
@@ -283,10 +273,7 @@
    }
    catch (DirectoryException de)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, de);
      }
      logger.traceException(de);
      setResultCode(de.getResultCode());
      appendErrorMessage(de.getMessageObject());
@@ -355,10 +342,7 @@
      }
      catch (DirectoryException de)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, de);
        }
        logger.traceException(de);
        setResultCode(de.getResultCode());
        appendErrorMessage(de.getMessageObject());
@@ -559,10 +543,7 @@
    }
    catch(CanceledOperationException coe)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, coe);
      }
      logger.traceException(coe);
      setResultCode(ResultCode.CANCELED);
      cancelResult = new CancelResult(ResultCode.CANCELED, null);
opendj3-server-dev/src/server/org/opends/server/core/ModifyOperationBasis.java
@@ -28,16 +28,13 @@
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.loggers.AccessLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import java.util.ArrayList;
import java.util.List;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.core.networkgroups.NetworkGroup;
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.ldap.LDAPAttribute;
import org.opends.server.protocols.ldap.LDAPModification;
import org.opends.server.protocols.ldap.LDAPResultCode;
@@ -56,11 +53,7 @@
       PreParseModifyOperation,
       PostResponseModifyOperation
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = DebugLogger.getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /** The raw, unprocessed entry DN as included by the client request. */
  private ByteString rawEntryDN;
@@ -187,10 +180,7 @@
        entryDN = DN.decode(rawEntryDN);
      }
      catch (DirectoryException de) {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, de);
        }
        logger.traceException(de);
        setResultCode(de.getResultCode());
        appendErrorMessage(de.getMessageObject());
@@ -274,10 +264,7 @@
      }
      catch (LDAPException le)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, le);
        }
        logger.traceException(le);
        setResultCode(ResultCode.valueOf(le.getResultCode()));
        appendErrorMessage(le.getMessageObject());
        modifications = null;
@@ -454,10 +441,7 @@
    }
    catch(CanceledOperationException coe)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, coe);
      }
      logger.traceException(coe);
      setResultCode(ResultCode.CANCELED);
      cancelResult = new CancelResult(ResultCode.CANCELED, null);
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
@@ -30,8 +30,6 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.debug.DebugLogger.getTracer;
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
import java.lang.reflect.InvocationTargetException;
@@ -52,7 +50,7 @@
import org.opends.server.api.AuthenticationPolicyFactory;
import org.opends.server.api.SubentryChangeListener;
import org.opends.server.config.ConfigException;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
@@ -67,10 +65,7 @@
    ConfigurationAddListener<AuthenticationPolicyCfg>,
    ConfigurationDeleteListener<AuthenticationPolicyCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -377,9 +372,9 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugError("Could not create password policy subentry "
          logger.trace("Could not create password policy subentry "
              + "DN %s: %s", entry.getName().toString(),
              stackTraceToSingleLineString(e));
        }
@@ -423,9 +418,9 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugError("Could not create password policy subentry "
          logger.trace("Could not create password policy subentry "
              + "DN %s: %s", newEntry.getName().toString(),
              stackTraceToSingleLineString(e));
        }
@@ -456,9 +451,9 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugError("Could not create password policy subentry "
          logger.trace("Could not create password policy subentry "
              + "DN %s: %s", newEntry.getName().toString(),
              stackTraceToSingleLineString(e));
        }
@@ -502,10 +497,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(
          String.valueOf(policyConfiguration.dn()),
@@ -542,10 +534,7 @@
        }
      }
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(
          String.valueOf(policyConfiguration.dn()),
@@ -603,10 +592,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      unacceptableReasons.add(ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(
          String.valueOf(policyConfiguration.dn()),
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java
@@ -30,8 +30,6 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.debug.DebugLogger.getTracer;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.getExceptionMessage;
@@ -47,7 +45,7 @@
import org.opends.server.admin.std.server.PasswordPolicyCfg;
import org.opends.server.api.*;
import org.opends.server.config.ConfigException;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
@@ -65,10 +63,7 @@
public final class PasswordPolicyFactory implements
    AuthenticationPolicyFactory<PasswordPolicyCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -78,10 +73,7 @@
  private static final class PasswordPolicyImpl extends PasswordPolicy
      implements ConfigurationChangeListener<PasswordPolicyCfg>
  {
    /**
     * The tracer object for the debug logger.
     */
    private static final DebugTracer TRACER = getTracer();
    private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
    // Current configuration.
    private PasswordPolicyCfg configuration;
@@ -374,10 +366,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PWPOLICY_CANNOT_DETERMINE_REQUIRE_CHANGE_BY_TIME
            .get(String.valueOf(configEntryDN), getExceptionMessage(e));
@@ -395,10 +384,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message = ERR_PWPOLICY_INVALID_LAST_LOGIN_TIME_FORMAT.get(
              String.valueOf(configEntryDN), String.valueOf(formatString));
@@ -420,10 +406,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            LocalizableMessage message =
              ERR_PWPOLICY_INVALID_PREVIOUS_LAST_LOGIN_TIME_FORMAT
@@ -1224,20 +1207,14 @@
    }
    catch (final ConfigException ce)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ce);
      }
      logger.traceException(ce);
      unacceptableReasons.add(ce.getMessageObject());
      return false;
    }
    catch (final InitializationException ie)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ie);
      }
      logger.traceException(ie);
      unacceptableReasons.add(ie.getMessageObject());
      return false;
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java
@@ -36,7 +36,7 @@
import org.opends.server.admin.std.meta.PasswordPolicyCfgDefn;
import org.opends.server.api.*;
import org.opends.server.loggers.ErrorLogger;
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.ldap.LDAPAttribute;
import org.opends.server.schema.AuthPasswordSyntax;
@@ -46,7 +46,6 @@
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -58,10 +57,7 @@
 */
public final class PasswordPolicyState extends AuthenticationPolicyState
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -185,18 +181,18 @@
    if (stringValue == null)
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning null because attribute %s does not " +
        logger.trace("Returning null because attribute %s does not " +
            "exist in user entry %s",
            attributeType.getNameOrOID(), userDNString);
      }
    }
    else
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning value %s for user %s",
        logger.trace("Returning value %s for user %s",
            stringValue, userDNString);
      }
    }
@@ -238,11 +234,11 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            if (logger.isTraceEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
              logger.traceException(e);
              TRACER.debugWarning("Unable to decode value %s for attribute %s" +
              logger.trace("Unable to decode value %s for attribute %s" +
                  "in user entry %s: %s",
                  v.getValue().toString(), attributeType.getNameOrOID(),
                  userDNString, stackTraceToSingleLineString(e));
@@ -260,9 +256,9 @@
    if (timeValues.isEmpty())
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning an empty list because attribute %s " +
        logger.trace("Returning an empty list because attribute %s " +
            "does not exist in user entry %s",
            attributeType.getNameOrOID(), userDNString);
      }
@@ -336,9 +332,9 @@
        {
          passwordChangedTime = 0;
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugWarning(
            logger.trace(
                "Could not determine password changed time for " + "user %s.",
                userDNString);
          }
@@ -415,9 +411,9 @@
   */
  public void setPasswordChangedTime(long passwordChangedTime)
  {
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Setting password changed time for user %s to " +
      logger.trace("Setting password changed time for user %s to " +
          "current time of %d", userDNString, currentTime);
    }
@@ -444,9 +440,9 @@
   */
  public void clearPasswordChangedTime()
  {
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Clearing password changed time for user %s",
      logger.trace("Clearing password changed time for user %s",
          userDNString);
    }
@@ -487,9 +483,9 @@
   */
  public void setDisabled(boolean isDisabled)
  {
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Updating user %s to set the disabled flag to %b",
      logger.trace("Updating user %s to set the disabled flag to %b",
          userDNString, isDisabled);
    }
@@ -529,9 +525,9 @@
  {
    if (isAccountExpired != ConditionResult.UNDEFINED)
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning stored result of %b for user %s",
        logger.trace("Returning stored result of %b for user %s",
            (isAccountExpired == ConditionResult.TRUE), userDNString);
      }
@@ -548,15 +544,12 @@
     }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      isAccountExpired = ConditionResult.TRUE;
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
          TRACER.debugWarning("User %s is considered to have an expired " +
          logger.trace("User %s is considered to have an expired " +
               "account because an error occurred while attempting to make " +
               "the determination: %s.",
              userDNString, stackTraceToSingleLineString(e));
@@ -569,9 +562,9 @@
    {
      // The user does have an expiration time, but it hasn't arrived yet.
      isAccountExpired = ConditionResult.FALSE;
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("The account for user %s is not expired because " +
        logger.trace("The account for user %s is not expired because " +
            "the expiration time has not yet arrived.", userDNString);
      }
    }
@@ -579,9 +572,9 @@
    {
      // The user does have an expiration time, and it is in the past.
      isAccountExpired = ConditionResult.TRUE;
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("The account for user %s is expired because the " +
        logger.trace("The account for user %s is expired because the " +
            "expiration time in that account has passed.", userDNString);
      }
    }
@@ -590,9 +583,9 @@
      // The user doesn't have an expiration time in their entry, so it
      // can't be expired.
      isAccountExpired = ConditionResult.FALSE;
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("The account for user %s is not expired because " +
        logger.trace("The account for user %s is not expired because " +
            "there is no expiration time in the user's entry.",
            userDNString);
      }
@@ -637,9 +630,9 @@
    {
      String timeStr = GeneralizedTimeSyntax.format(accountExpirationTime);
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Setting account expiration time for user %s to %s",
        logger.trace("Setting account expiration time for user %s to %s",
            userDNString, timeStr);
      }
@@ -660,9 +653,9 @@
   */
  public void clearAccountExpirationTime()
  {
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Clearing account expiration time for user %s",
      logger.trace("Clearing account expiration time for user %s",
          userDNString);
    }
@@ -693,9 +686,9 @@
  {
    if (authFailureTimes != null)
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning stored auth failure time list of %d " +
        logger.trace("Returning stored auth failure time list of %d " +
            "elements for user %s",
            authFailureTimes.size(), userDNString);
      }
@@ -717,14 +710,11 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugWarning("Error while processing auth failure times " +
        logger.trace("Error while processing auth failure times " +
             "for user %s: %s",
                     userDNString, stackTraceToSingleLineString(e));
      }
@@ -739,9 +729,9 @@
    if (authFailureTimes.isEmpty())
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning an empty auth failure time list for " +
        logger.trace("Returning an empty auth failure time list for " +
            "user %s because the attribute is absent from the entry.",
            userDNString);
      }
@@ -762,9 +752,9 @@
        long l = iterator.next();
        if (l < expirationTime)
        {
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugInfo("Removing expired auth failure time %d for " +
            logger.trace("Removing expired auth failure time %d for " +
                "user %s", l, userDNString);
          }
@@ -790,9 +780,9 @@
      }
    }
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Returning auth failure time list of %d elements " +
      logger.trace("Returning auth failure time list of %d elements " +
          "for user %s", authFailureTimes.size(), userDNString);
    }
@@ -813,9 +803,9 @@
      return;
    }
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Updating authentication failure times for user %s",
      logger.trace("Updating authentication failure times for user %s",
          userDNString);
    }
@@ -859,9 +849,9 @@
    if ((lockoutCount > 0) && (lockoutCount <= authFailureTimes.size()))
    {
      setFailureLockedTime(highestFailureTime);
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Locking user account %s due to too many failures.",
        logger.trace("Locking user account %s due to too many failures.",
            userDNString);
      }
    }
@@ -911,9 +901,9 @@
    if ((lockoutCount > 0) && (lockoutCount <= authFailureTimes.size()))
    {
      setFailureLockedTime(highestFailureTime);
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Locking user account %s due to too many failures.",
        logger.trace("Locking user account %s due to too many failures.",
            userDNString);
      }
    }
@@ -927,9 +917,9 @@
   */
  private void clearAuthFailureTimes()
  {
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Clearing authentication failure times for user %s",
      logger.trace("Clearing authentication failure times for user %s",
          userDNString);
    }
@@ -981,15 +971,12 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      failureLockedTime = currentTime;
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugWarning("Returning current time for user %s because an " +
        logger.trace("Returning current time for user %s because an " +
            "error occurred: %s",
                     userDNString, stackTraceToSingleLineString(e));
      }
@@ -1039,9 +1026,9 @@
   */
  private void clearFailureLockedTime()
  {
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Clearing failure lockout time for user %s.",
      logger.trace("Clearing failure lockout time for user %s.",
          userDNString);
    }
@@ -1089,9 +1076,9 @@
    final int maxFailures = passwordPolicy.getLockoutFailureCount();
    if (maxFailures <= 0)
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning false for user %s because lockout due " +
        logger.trace("Returning false for user %s because lockout due " +
            "to failures is not enabled.", userDNString);
      }
@@ -1117,9 +1104,9 @@
      // failure times might have accumulated to trigger a lockout.
      if (getAuthFailureTimes().size() < maxFailures)
      {
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugInfo("Returning false for user %s because there is " +
          logger.trace("Returning false for user %s because there is " +
              "no locked time.", userDNString);
        }
@@ -1129,9 +1116,9 @@
      // The account isn't locked but should be, so do so now.
      setFailureLockedTime(currentTime);// FIXME: set to max(failureTimes)?
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Locking user %s because there were enough " +
        logger.trace("Locking user %s because there were enough " +
            "existing failures even though there was no account locked time.",
            userDNString);
      }
@@ -1147,9 +1134,9 @@
      {
        secondsUntilUnlock = (int) ((unlockTime - currentTime) / 1000);
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugInfo("Returning true for user %s because there is a " +
          logger.trace("Returning true for user %s because there is a " +
              "locked time and the lockout duration has not been reached.",
              userDNString);
        }
@@ -1160,9 +1147,9 @@
      // The lockout in the entry has expired...
      clearFailureLockout();
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning false for user %s " +
        logger.trace("Returning false for user %s " +
            "because the existing lockout has expired.", userDNString);
      }
@@ -1170,9 +1157,9 @@
      return false;
    }
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Returning true for user %s " +
      logger.trace("Returning true for user %s " +
          "because there is a locked time and no lockout duration.",
          userDNString);
    }
@@ -1227,9 +1214,9 @@
  {
    if (lastLoginTime != Long.MIN_VALUE)
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning stored last login time of %d for " +
        logger.trace("Returning stored last login time of %d for " +
            "user %s.", lastLoginTime, userDNString);
      }
@@ -1244,9 +1231,9 @@
    if ((type == null) || (format == null))
    {
      lastLoginTime = -1;
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning -1 for user %s because no last login " +
        logger.trace("Returning -1 for user %s because no last login " +
            "time will be maintained.", userDNString);
      }
@@ -1275,9 +1262,9 @@
          }
          lastLoginTime = dateFormat.parse(valueString).getTime();
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugInfo("Returning last login time of %d for user %s" +
            logger.trace("Returning last login time of %d for user %s" +
                "decoded using current last login time format.",
                lastLoginTime, userDNString);
          }
@@ -1286,10 +1273,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          // This could mean that the last login time was encoded using a
          // previous format.
@@ -1304,9 +1288,9 @@
              }
              lastLoginTime = dateFormat.parse(valueString).getTime();
              if (debugEnabled())
              if (logger.isTraceEnabled())
              {
                TRACER.debugInfo("Returning last login time of %d for " +
                logger.trace("Returning last login time of %d for " +
                    "user %s decoded using previous last login time format " +
                    "of %s.", lastLoginTime, userDNString, f);
              }
@@ -1315,17 +1299,14 @@
            }
            catch (Exception e2)
            {
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
            }
          }
          assert lastLoginTime == -1;
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
              TRACER.debugWarning("Returning -1 for user %s because the " +
              logger.trace("Returning -1 for user %s because the " +
                  "last login time value %s could not be parsed using any " +
                  "known format.", userDNString, valueString);
          }
@@ -1336,9 +1317,9 @@
    }
    assert lastLoginTime == -1;
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Returning %d for user %s because no last " +
      logger.trace("Returning %d for user %s because no last " +
          "login time value exists.", lastLoginTime, userDNString);
    }
@@ -1389,14 +1370,11 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugWarning("Unable to set last login time for user %s " +
        logger.trace("Unable to set last login time for user %s " +
            "because an error occurred: %s",
                     userDNString, stackTraceToSingleLineString(e));
      }
@@ -1408,9 +1386,9 @@
    String existingTimestamp = getValue(type);
    if ((existingTimestamp != null) && timestamp.equals(existingTimestamp))
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Not updating last login time for user %s " +
        logger.trace("Not updating last login time for user %s " +
            "because the new value matches the existing value.",
            userDNString);
      }
@@ -1422,9 +1400,9 @@
    Attribute a = Attributes.create(type, timestamp);
    modifications.add(new Modification(ModificationType.REPLACE, a, true));
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Updated the last login time for user %s to %s",
      logger.trace("Updated the last login time for user %s to %s",
          userDNString, timestamp);
    }
  }
@@ -1437,9 +1415,9 @@
   */
  public void clearLastLoginTime()
  {
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Clearing last login time for user %s", userDNString);
      logger.trace("Clearing last login time for user %s", userDNString);
    }
    lastLoginTime = -1;
@@ -1464,9 +1442,9 @@
  {
    if (isIdleLocked != ConditionResult.UNDEFINED)
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning stored result of %b for user %s",
        logger.trace("Returning stored result of %b for user %s",
            (isIdleLocked == ConditionResult.TRUE), userDNString);
      }
@@ -1479,9 +1457,9 @@
    {
      isIdleLocked = ConditionResult.FALSE;
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning false for user %s because no idle " +
        logger.trace("Returning false for user %s because no idle " +
            "lockout interval is defined.", userDNString);
      }
      return false;
@@ -1495,7 +1473,7 @@
    if (theLastLoginTime > lockTime || getPasswordChangedTime() > lockTime)
    {
      isIdleLocked = ConditionResult.FALSE;
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        StringBuilder reason = new StringBuilder();
        if(theLastLoginTime > lockTime)
@@ -1511,21 +1489,21 @@
          reason.append(
              "the password changed time is in an acceptable window");
        }
        TRACER.debugInfo("Returning false for user %s because %s.",
        logger.trace("Returning false for user %s because %s.",
            userDNString, reason.toString());
      }
    }
    else
    {
      isIdleLocked = ConditionResult.TRUE;
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        String reason = (theLastLoginTime < 0)
            ? "there is no last login time and the password " +
            "changed time is not in an acceptable window"
            : "neither last login time nor password " +
            "changed time are in an acceptable window";
        TRACER.debugInfo("Returning true for user %s because %s.",
        logger.trace("Returning true for user %s because %s.",
            userDNString, reason);
      }
    }
@@ -1546,9 +1524,9 @@
  {
    if(mustChangePassword != ConditionResult.UNDEFINED)
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning stored result of %b for user %s.",
        logger.trace("Returning stored result of %b for user %s.",
            (mustChangePassword == ConditionResult.TRUE), userDNString);
      }
@@ -1566,9 +1544,9 @@
               || passwordPolicy.isForceChangeOnReset())))
    {
      mustChangePassword = ConditionResult.FALSE;
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning false for user %s because neither " +
        logger.trace("Returning false for user %s because neither " +
            "force change on add nor force change on reset is enabled, " +
            "or users are not allowed to self-modify passwords.",
            userDNString);
@@ -1592,11 +1570,11 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
        logger.traceException(e);
        TRACER.debugWarning("Returning true for user %s because an error " +
        logger.trace("Returning true for user %s because an error " +
            "occurred: %s", userDNString, stackTraceToSingleLineString(e));
      }
@@ -1608,9 +1586,9 @@
    if(mustChangePassword == ConditionResult.UNDEFINED)
    {
      mustChangePassword = ConditionResult.FALSE;
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning %b for user since the attribute \"%s\"" +
        logger.trace("Returning %b for user since the attribute \"%s\"" +
            " is not present in the entry.",
            false, userDNString, OP_ATTR_PWPOLICY_RESET_REQUIRED);
      }
@@ -1618,9 +1596,9 @@
      return false;
    }
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Returning %b for user %s.",
      logger.trace("Returning %b for user %s.",
          (mustChangePassword == ConditionResult.TRUE), userDNString);
    }
@@ -1638,9 +1616,9 @@
*/
  public void setMustChangePassword(boolean mustChangePassword)
  {
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Updating user %s to set the reset flag to %b",
      logger.trace("Updating user %s to set the reset flag to %b",
          userDNString, mustChangePassword);
    }
@@ -1688,9 +1666,9 @@
    // attribute.
    if (passwordPolicy.getMaxPasswordResetAge() <= 0L)
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning false for user %s because there is no " +
        logger.trace("Returning false for user %s because there is no " +
            "maximum reset age.", userDNString);
      }
@@ -1699,9 +1677,9 @@
    if (! mustChangePassword())
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning false for user %s because the user's " +
        logger.trace("Returning false for user %s because the user's " +
            "password has not been reset.", userDNString);
      }
@@ -1712,9 +1690,9 @@
        (1000L * passwordPolicy.getMaxPasswordResetAge());
    boolean locked = (maxResetTime < currentTime);
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Returning %b for user %s after comparing the " +
      logger.trace("Returning %b for user %s after comparing the " +
          "current and max reset times.", locked, userDNString);
    }
@@ -1908,9 +1886,9 @@
      }
    }
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Returning password expiration time of %d for user " +
      logger.trace("Returning password expiration time of %d for user " +
          "%s.", passwordExpirationTime, userDNString);
    }
@@ -1954,9 +1932,9 @@
    if (minAge <= 0L)
    {
      // There is no minimum age, so the user isn't in it.
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning false because there is no minimum age.");
        logger.trace("Returning false because there is no minimum age.");
      }
      return false;
@@ -1964,9 +1942,9 @@
    else if ((getPasswordChangedTime() + (minAge*1000L)) < currentTime)
    {
      // It's been long enough since the user changed their password.
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning false because the minimum age has " +
        logger.trace("Returning false because the minimum age has " +
            "expired.");
      }
@@ -1975,9 +1953,9 @@
    else if (mustChangePassword())
    {
      // The user is in a must-change mode, so the minimum age doesn't apply.
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning false because the account is in a " +
        logger.trace("Returning false because the account is in a " +
            "must-change state.");
      }
@@ -1986,9 +1964,9 @@
    else
    {
      // The user is within the minimum age.
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning true.");
        logger.trace("Returning true.");
      }
      return true;
@@ -2100,9 +2078,9 @@
  {
    if (requiredChangeTime != Long.MIN_VALUE)
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning stored required change time of %d for " +
        logger.trace("Returning stored required change time of %d for " +
            "user %s", requiredChangeTime, userDNString);
      }
@@ -2118,15 +2096,12 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      requiredChangeTime = -1;
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugWarning("Returning %d for user %s because an error " +
        logger.trace("Returning %d for user %s because an error " +
            "occurred: %s", requiredChangeTime, userDNString,
                     stackTraceToSingleLineString(e));
      }
@@ -2134,9 +2109,9 @@
      return requiredChangeTime;
    }
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Returning required change time of %d for user %s",
      logger.trace("Returning required change time of %d for user %s",
          requiredChangeTime, userDNString);
    }
@@ -2169,9 +2144,9 @@
   */
  public void setRequiredChangeTime(long requiredChangeTime)
  {
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Updating required change time for user %s",
      logger.trace("Updating required change time for user %s",
          userDNString);
    }
@@ -2197,9 +2172,9 @@
   */
  public void clearRequiredChangeTime()
  {
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Clearing required change time for user %s",
      logger.trace("Clearing required change time for user %s",
          userDNString);
    }
@@ -2232,14 +2207,11 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugWarning("Unable to decode the warned time for user %s: " +
          logger.trace("Unable to decode the warned time for user %s: " +
              "%s", userDNString, stackTraceToSingleLineString(e));
        }
@@ -2248,9 +2220,9 @@
    }
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Returning a warned time of %d for user %s",
      logger.trace("Returning a warned time of %d for user %s",
          warnedTime, userDNString);
    }
@@ -2281,9 +2253,9 @@
    long warnTime = getWarnedTime();
    if (warnTime == warnedTime)
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Not updating warned time for user %s because " +
        logger.trace("Not updating warned time for user %s because " +
            "the warned time is the same as the specified time.",
            userDNString);
      }
@@ -2300,9 +2272,9 @@
    modifications.add(new Modification(ModificationType.REPLACE, a, true));
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Updated the warned time for user %s", userDNString);
      logger.trace("Updated the warned time for user %s", userDNString);
    }
  }
@@ -2313,9 +2285,9 @@
   */
  public void clearWarnedTime()
  {
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Clearing warned time for user %s", userDNString);
      logger.trace("Clearing warned time for user %s", userDNString);
    }
    if (getWarnedTime() < 0)
@@ -2329,9 +2301,9 @@
    Attribute a = Attributes.empty(type);
    modifications.add(new Modification(ModificationType.REPLACE, a, true));
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Cleared the warned time for user %s", userDNString);
      logger.trace("Cleared the warned time for user %s", userDNString);
    }
  }
@@ -2362,14 +2334,11 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugWarning("Error while processing grace login times " +
          logger.trace("Error while processing grace login times " +
               "for user %s: %s",
                       userDNString, stackTraceToSingleLineString(e));
        }
@@ -2382,9 +2351,9 @@
    }
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Returning grace login times for user %s",
      logger.trace("Returning grace login times for user %s",
          userDNString);
    }
@@ -2419,9 +2388,9 @@
   */
  public void updateGraceLoginTimes()
  {
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Updating grace login times for user %s",
      logger.trace("Updating grace login times for user %s",
          userDNString);
    }
@@ -2472,9 +2441,9 @@
      return;
    }
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Updating grace login times for user %s",
      logger.trace("Updating grace login times for user %s",
          userDNString);
    }
@@ -2501,9 +2470,9 @@
   */
  public void clearGraceLoginTimes()
  {
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Clearing grace login times for user %s",
      logger.trace("Clearing grace login times for user %s",
          userDNString);
    }
@@ -2577,9 +2546,9 @@
                    : DirectoryServer.getPasswordStorageScheme(schemeName);
          if (scheme == null)
          {
            if (debugEnabled())
            if (logger.isTraceEnabled())
            {
              TRACER.debugWarning("User entry %s contains a password with " +
              logger.trace("User entry %s contains a password with " +
                  "scheme %s that is not defined in the server.",
                                  userDNString, schemeName);
            }
@@ -2600,14 +2569,11 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugWarning("Cannot get clear password value foruser %s: " +
            logger.trace("Cannot get clear password value foruser %s: " +
                "%s", userDNString, e);
          }
        }
@@ -2629,9 +2595,9 @@
         userEntry.getAttribute(passwordPolicy.getPasswordAttribute());
    if ((attrList == null) || attrList.isEmpty())
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning false because user %s does not have " +
        logger.trace("Returning false because user %s does not have " +
            "any values for password attribute %s", userDNString,
            passwordPolicy.getPasswordAttribute().getNameOrOID());
      }
@@ -2670,9 +2636,9 @@
                     : DirectoryServer.getPasswordStorageScheme(schemeName);
          if (scheme == null)
          {
            if (debugEnabled())
            if (logger.isTraceEnabled())
            {
              TRACER.debugWarning("User entry %s contains a password with " +
              logger.trace("User entry %s contains a password with " +
                  "scheme %s that is not defined in the server.",
                                  userDNString, schemeName);
            }
@@ -2688,9 +2654,9 @@
              ByteString.valueOf(pwComponents[1].toString()));
          if (passwordMatches)
          {
            if (debugEnabled())
            if (logger.isTraceEnabled())
            {
              TRACER.debugInfo("Returning true for user %s because the " +
              logger.trace("Returning true for user %s because the " +
                  "provided password matches a value encoded with scheme %s",
                  userDNString, schemeName);
            }
@@ -2700,14 +2666,11 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugWarning("An error occurred while attempting to " +
            logger.trace("An error occurred while attempting to " +
                "process a password value for user %s: %s",
                     userDNString, stackTraceToSingleLineString(e));
          }
@@ -2716,9 +2679,9 @@
    }
    // If we've gotten here, then we couldn't find a match.
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Returning false because the provided password does " +
      logger.trace("Returning false because the provided password does " +
          "not match any of the stored password values for user %s",
          userDNString);
    }
@@ -2816,9 +2779,9 @@
      if (!validator.passwordIsAcceptable(newPassword, currentPasswords,
          operation, userEntry, invalidReason))
      {
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugInfo("The password provided for user %s failed "
          logger.trace("The password provided for user %s failed "
              + "validation: %s", userDNString, invalidReason.toString());
        }
        return false;
@@ -2840,9 +2803,9 @@
  {
    if (passwordPolicy.getDefaultPasswordStorageSchemes().isEmpty())
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Doing nothing for user %s because no " +
        logger.trace("Doing nothing for user %s because no " +
            "deprecated storage schemes have been defined.", userDNString);
      }
@@ -2854,9 +2817,9 @@
    List<Attribute> attrList = userEntry.getAttribute(type);
    if ((attrList == null) || attrList.isEmpty())
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Doing nothing for entry %s because no password " +
        logger.trace("Doing nothing for entry %s because no password " +
            "values were found.", userDNString);
      }
@@ -2904,9 +2867,9 @@
                    : DirectoryServer.getPasswordStorageScheme(schemeName);
          if (scheme == null)
          {
            if (debugEnabled())
            if (logger.isTraceEnabled())
            {
              TRACER.debugWarning("Skipping password value for user %s " +
              logger.trace("Skipping password value for user %s " +
                  "because the associated storage scheme %s is not " +
                  "configured for use.", userDNString, schemeName);
            }
@@ -2930,9 +2893,9 @@
            else if (passwordPolicy
                .isDeprecatedPasswordStorageScheme(schemeName))
            {
              if (debugEnabled())
              if (logger.isTraceEnabled())
              {
                TRACER.debugInfo("Marking password with scheme %s for " +
                logger.trace("Marking password with scheme %s for " +
                    "removal from user entry %s.", schemeName, userDNString);
              }
@@ -2946,11 +2909,11 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
            logger.traceException(e);
            TRACER.debugWarning("Skipping password value for user %s because " +
            logger.trace("Skipping password value for user %s because " +
                "an error occurred while attempting to decode it based on " +
                "the user password syntax: %s",
                userDNString, stackTraceToSingleLineString(e));
@@ -2961,9 +2924,9 @@
    if (removedValues.isEmpty())
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("User entry %s does not have any password values " +
        logger.trace("User entry %s does not have any password values " +
            "encoded using deprecated schemes.", userDNString);
      }
@@ -2990,14 +2953,11 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugWarning("Unable to encode password for user %s using " +
            logger.trace("Unable to encode password for user %s using " +
                 "default scheme %s: %s",
                         userDNString, s.getStorageSchemeName(),
                         stackTraceToSingleLineString(e));
@@ -3008,9 +2968,9 @@
    if (updatedValues.isEmpty())
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugWarning("Not updating user entry %s because removing " +
        logger.trace("Not updating user entry %s because removing " +
             "deprecated schemes would leave the user without a password.",
                     userDNString);
      }
@@ -3031,9 +2991,9 @@
      modifications.add(new Modification(ModificationType.ADD, a2, true));
    }
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Updating user entry %s to replace password values " +
      logger.trace("Updating user entry %s to replace password values " +
          "encoded with deprecated schemes with values encoded " +
          "with the default schemes.", userDNString);
    }
@@ -3070,9 +3030,9 @@
  {
    if (! maintainHistory())
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning false because password history " +
        logger.trace("Returning false because password history " +
            "checking is disabled.");
      }
@@ -3086,9 +3046,9 @@
    // passwords.  If so, then we'll consider it to be in the history.
    if (passwordMatches(password))
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Returning true because the provided password " +
        logger.trace("Returning true because the provided password " +
            "is currently in use.");
      }
@@ -3137,9 +3097,9 @@
    {
      if (historyValueMatches(password, v))
      {
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugInfo("Returning true because the password is in " +
          logger.trace("Returning true because the password is in " +
              "the history.");
        }
@@ -3149,9 +3109,9 @@
    // If we've gotten here, then the password isn't in the history.
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Returning false because the password isn't in the " +
      logger.trace("Returning false because the password isn't in the " +
          "history.");
    }
@@ -3186,9 +3146,9 @@
          int    hashPos = histStr.indexOf('#');
          if (hashPos <= 0)
          {
            if (debugEnabled())
            if (logger.isTraceEnabled())
            {
              TRACER.debugInfo("Found value " + histStr + " in the " +
              logger.trace("Found value " + histStr + " in the " +
                  "history with no timestamp.  Marking it " +
                  "for removal.");
            }
@@ -3209,11 +3169,11 @@
            }
            catch (Exception e)
            {
              if (debugEnabled())
              if (logger.isTraceEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
                logger.traceException(e);
                TRACER.debugInfo("Could not decode the timestamp in " +
                logger.trace("Could not decode the timestamp in " +
                    "history value " + histStr + " -- " + e +
                    ".  Marking it for removal.");
              }
@@ -3257,9 +3217,9 @@
      int    hashPos1 = histStr.indexOf('#');
      if (hashPos1 <= 0)
      {
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugInfo("Returning false because the password history " +
          logger.trace("Returning false because the password history " +
              "value didn't include any hash characters.");
        }
@@ -3269,9 +3229,9 @@
      int hashPos2 = histStr.indexOf('#', hashPos1+1);
      if (hashPos2 < 0)
      {
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugInfo("Returning false because the password history " +
          logger.trace("Returning false because the password history " +
              "value only had one hash character.");
        }
@@ -3290,9 +3250,9 @@
        if (scheme.authPasswordMatches(password, authPWComponents[1].toString(),
                                       authPWComponents[2].toString()))
        {
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugInfo("Returning true because the auth password " +
            logger.trace("Returning true because the auth password " +
                "history value matched.");
          }
@@ -3300,9 +3260,9 @@
        }
        else
        {
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugInfo("Returning false because the auth password " +
            logger.trace("Returning false because the auth password " +
                "history value did not match.");
          }
@@ -3319,9 +3279,9 @@
        if (scheme.passwordMatches(password,
            ByteString.valueOf(userPWComponents[1])))
        {
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugInfo("Returning true because the user password " +
            logger.trace("Returning true because the user password " +
                "history value matched.");
          }
@@ -3329,9 +3289,9 @@
        }
        else
        {
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugInfo("Returning false because the user password " +
            logger.trace("Returning false because the user password " +
                "history value did not match.");
          }
@@ -3340,9 +3300,9 @@
      }
      else
      {
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugInfo("Returning false because the syntax OID " +
          logger.trace("Returning false because the syntax OID " +
              syntaxOID + " didn't match for either the auth " +
              "or user password syntax.");
        }
@@ -3352,13 +3312,13 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
        logger.traceException(e);
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugInfo("Returning false because of an exception:  " +
          logger.trace("Returning false because of an exception:  " +
                           stackTraceToSingleLineString(e));
        }
      }
@@ -3404,9 +3364,9 @@
  {
    if (! maintainHistory())
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugInfo("Not doing anything because password history " +
        logger.trace("Not doing anything because password history " +
            "maintenance is disabled.");
      }
@@ -3440,9 +3400,9 @@
        iterator.remove();
        numToDelete--;
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugInfo("Removing history value " +
          logger.trace("Removing history value " +
              v.getValue().toString() + " to preserve the history count.");
        }
      }
@@ -3474,9 +3434,9 @@
          removeValues.add(v);
          iterator.remove();
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugInfo("Removing history value " +
            logger.trace("Removing history value " +
                v.getValue().toString() +
                " to preserve the history duration.");
          }
@@ -3510,9 +3470,9 @@
                        "#" + encodedPassword;
    Attribute newHistAttr = Attributes.create(historyType, newHistStr);
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Going to add history value " + newHistStr);
      logger.trace("Going to add history value " + newHistStr);
    }
@@ -3564,9 +3524,9 @@
   */
  public void clearPasswordHistory()
  {
    if (debugEnabled())
    if (logger.isTraceEnabled())
    {
      TRACER.debugInfo("Clearing password history for user %s", userDNString);
      logger.trace("Clearing password history for user %s", userDNString);
    }
    AttributeType type = DirectoryServer.getAttributeType(
@@ -3592,9 +3552,9 @@
    PasswordGenerator<?> generator = passwordPolicy.getPasswordGenerator();
    if (generator == null)
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugWarning("Unable to generate a new password for user " +
        logger.trace("Unable to generate a new password for user " +
            "%s because no password generator has been defined in the " +
            "associated password policy.", userDNString);
      }
opendj3-server-dev/src/server/org/opends/server/core/PersistentSearch.java
@@ -28,8 +28,6 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -37,11 +35,10 @@
import org.opends.server.controls.EntryChangeNotificationControl;
import org.opends.server.controls.PersistentSearchChangeType;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.CancelResult;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
import org.opends.server.types.ResultCode;
@@ -102,11 +99,7 @@
     */
    void persistentSearchCancelled(PersistentSearch psearch);
  }
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -133,10 +126,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
      }
    }
@@ -306,7 +296,7 @@
    // Make sure that the entry matches the target filter.
    try
    {
      TRACER.debugInfo(this + " " + entry + " +filter="
      logger.trace(this + " " + entry + " +filter="
          + filter.matchesEntry(entry));
      if (!filter.matchesEntry(entry))
@@ -316,10 +306,7 @@
    }
    catch (DirectoryException de)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, de);
      }
      logger.traceException(de);
      // FIXME -- Do we need to do anything here?
@@ -347,10 +334,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      cancel();
@@ -360,10 +344,7 @@
      }
      catch (Exception e2)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e2);
        }
        logger.traceException(e2);
      }
    }
  }
@@ -430,10 +411,7 @@
    }
    catch (DirectoryException de)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, de);
      }
      logger.traceException(de);
      // FIXME -- Do we need to do anything here?
@@ -461,10 +439,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      cancel();
@@ -474,10 +449,7 @@
      }
      catch (Exception e2)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e2);
        }
        logger.traceException(e2);
      }
    }
  }
@@ -563,10 +535,7 @@
    }
    catch (DirectoryException de)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, de);
      }
      logger.traceException(de);
      // FIXME -- Do we need to do anything here?
@@ -594,10 +563,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      cancel();
@@ -607,10 +573,7 @@
      }
      catch (Exception e2)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e2);
        }
        logger.traceException(e2);
      }
    }
  }
@@ -701,10 +664,7 @@
    }
    catch (DirectoryException de)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, de);
      }
      logger.traceException(de);
      // FIXME -- Do we need to do anything here?
@@ -732,10 +692,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      cancel();
@@ -745,10 +702,7 @@
      }
      catch (Exception e2)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e2);
        }
        logger.traceException(e2);
      }
    }
  }
opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java
@@ -47,14 +47,13 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.api.plugin.*;
import org.opends.server.config.ConfigException;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.opends.server.types.operation.*;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.PluginMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
@@ -71,10 +70,7 @@
                  ConfigurationDeleteListener<PluginCfg>,
                  ConfigurationChangeListener<PluginCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // Arrays for holding the plugins of each type.
  private DirectoryServerPlugin[] startupPlugins;
@@ -509,10 +505,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
      }
@@ -1462,10 +1455,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_STARTUP_PLUGIN_EXCEPTION.get(
                String.valueOf(p.getPluginEntryDN()),
@@ -1520,10 +1510,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_SHUTDOWN_PLUGIN_EXCEPTION.
            get(String.valueOf(p.getPluginEntryDN()),
@@ -1556,10 +1543,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_CONNECT_PLUGIN_EXCEPTION.
            get(String.valueOf(p.getPluginEntryDN()),
@@ -1630,10 +1614,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage msg = ERR_PLUGIN_POST_DISCONNECT_PLUGIN_EXCEPTION.
            get(String.valueOf(p.getPluginEntryDN()),
@@ -1693,10 +1674,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_LDIF_IMPORT_PLUGIN_EXCEPTION.
            get(String.valueOf(p.getPluginEntryDN()),
@@ -1793,10 +1771,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_LDIF_EXPORT_PLUGIN_EXCEPTION.
            get(String.valueOf(p.getPluginEntryDN()),
@@ -1889,10 +1864,7 @@
  private PluginResult.PreParse handlePreParseException(
      Exception e, PreParseOperation operation, DirectoryServerPlugin plugin)
  {
    if (debugEnabled())
    {
      TRACER.debugCaught(DebugLogLevel.ERROR, e);
    }
    logger.traceException(e);
    LocalizableMessage message =
        ERR_PLUGIN_PRE_PARSE_PLUGIN_EXCEPTION.get(operation.getOperationType()
@@ -2691,10 +2663,7 @@
      int i, DirectoryServerPlugin[] plugins, PreOperationOperation operation,
      DirectoryServerPlugin plugin)
  {
    if (debugEnabled())
    {
      TRACER.debugCaught(DebugLogLevel.ERROR, e);
    }
    logger.traceException(e);
    LocalizableMessage message =
        ERR_PLUGIN_PRE_OPERATION_PLUGIN_EXCEPTION.get(operation
@@ -3018,10 +2987,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
            get(abandonOperation.getOperationType().getOperationName(),
@@ -3106,10 +3072,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
            get(addOperation.getOperationType().getOperationName(),
@@ -3192,10 +3155,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
            get(bindOperation.getOperationType().getOperationName(),
@@ -3279,10 +3239,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
            get(compareOperation.getOperationType().getOperationName(),
@@ -3367,10 +3324,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
            get(deleteOperation.getOperationType().getOperationName(),
@@ -3455,10 +3409,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
            get(extendedOperation.getOperationType().getOperationName(),
@@ -3543,10 +3494,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
            get(modifyOperation.getOperationType().getOperationName(),
@@ -3630,10 +3578,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
            get(modifyDNOperation.getOperationType().getOperationName(),
@@ -3718,10 +3663,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
            get(searchOperation.getOperationType().getOperationName(),
@@ -3806,10 +3748,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
            get(unbindOperation.getOperationType().getOperationName(),
@@ -3885,10 +3824,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
            get(addOperation.getOperationType().getOperationName(),
@@ -3952,10 +3888,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
            get(bindOperation.getOperationType().getOperationName(),
@@ -4020,10 +3953,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
            get(compareOperation.getOperationType().getOperationName(),
@@ -4089,10 +4019,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
            get(deleteOperation.getOperationType().getOperationName(),
@@ -4157,10 +4084,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
            get(extendedOperation.getOperationType().getOperationName(),
@@ -4226,10 +4150,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
            get(modifyOperation.getOperationType().getOperationName(),
@@ -4295,10 +4216,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
            get(modifyDNOperation.getOperationType().getOperationName(),
@@ -4364,10 +4282,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
            get(searchOperation.getOperationType().getOperationName(),
@@ -4423,10 +4338,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_SYNCHRONIZATION_PLUGIN_EXCEPTION.
            get(addOperation.getOperationType().getOperationName(),
@@ -4458,10 +4370,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_SYNCHRONIZATION_PLUGIN_EXCEPTION.
            get(deleteOperation.getOperationType().getOperationName(),
@@ -4494,10 +4403,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_SYNCHRONIZATION_PLUGIN_EXCEPTION.
            get(modifyOperation.getOperationType().getOperationName(),
@@ -4530,10 +4436,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_POST_SYNCHRONIZATION_PLUGIN_EXCEPTION.
            get(modifyDNOperation.getOperationType().getOperationName(),
@@ -4578,10 +4481,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_SEARCH_ENTRY_PLUGIN_EXCEPTION.
            get(String.valueOf(p.getPluginEntryDN()),
@@ -4656,10 +4556,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_SEARCH_REFERENCE_PLUGIN_EXCEPTION.
            get(String.valueOf(p.getPluginEntryDN()),
@@ -4740,10 +4637,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message =
            ERR_PLUGIN_SUBORDINATE_MODIFY_DN_PLUGIN_EXCEPTION.get(
@@ -4816,10 +4710,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message =
            ERR_PLUGIN_SUBORDINATE_DELETE_PLUGIN_EXCEPTION.get(
@@ -4887,10 +4778,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_PLUGIN_INTERMEDIATE_RESPONSE_PLUGIN_EXCEPTION.
            get(String.valueOf(p.getPluginEntryDN()),
opendj3-server-dev/src/server/org/opends/server/core/SchemaConfigManager.java
@@ -35,7 +35,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.config.ConfigException;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.schema.*;
import org.opends.server.types.*;
import org.opends.server.util.LDIFReader;
@@ -44,7 +44,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.loggers.debug.DebugLogger.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -60,10 +59,7 @@
 */
public class SchemaConfigManager
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /** The schema that has been parsed from the server configuration. */
  private Schema schema;
@@ -262,19 +258,13 @@
    }
    catch (InitializationException ie)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ie);
      }
      logger.traceException(ie);
      throw ie;
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_SCHEMA_CANNOT_LIST_FILES.get(
          schemaInstanceDirPath, getExceptionMessage(e));
@@ -376,10 +366,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_OPEN_FILE.get(
              schemaFile, schemaDirPath, getExceptionMessage(e));
@@ -411,10 +398,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_READ_LDIF_ENTRY.get(
              schemaFile, schemaDirPath, getExceptionMessage(e));
@@ -444,10 +428,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = WARN_CONFIG_SCHEMA_UNPARSEABLE_EXTRA_DATA_IN_FILE.get(
          schemaFile, schemaDirPath, getExceptionMessage(e));
@@ -511,10 +492,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      ldapSyntax = new LDAPSyntaxDescriptionSyntax();
      ldapSyntax.initializeSyntax(null);
@@ -549,10 +527,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      attrTypeSyntax = new AttributeTypeSyntax();
      attrTypeSyntax.initializeSyntax(null);
@@ -587,10 +562,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      ocSyntax = new ObjectClassSyntax();
      ocSyntax.initializeSyntax(null);
@@ -625,10 +597,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      nfSyntax = new NameFormSyntax();
      nfSyntax.initializeSyntax(null);
@@ -663,10 +632,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      dcrSyntax = new DITContentRuleSyntax();
      dcrSyntax.initializeSyntax(null);
@@ -702,10 +668,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      dsrSyntax = new DITStructureRuleSyntax();
      dsrSyntax.initializeSyntax(null);
@@ -741,10 +704,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      mruSyntax = new MatchingRuleUseSyntax();
      mruSyntax.initializeSyntax(null);
@@ -798,10 +758,7 @@
          }
          catch (DirectoryException de)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, de);
            }
            logger.traceException(de);
            LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_PARSE_LDAP_SYNTAX.get(
                    schemaFile,
@@ -819,10 +776,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_PARSE_LDAP_SYNTAX.get(
                    schemaFile,
@@ -849,10 +803,7 @@
          }
          catch (DirectoryException de)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, de);
            }
            logger.traceException(de);
            LocalizableMessage message = WARN_CONFIG_SCHEMA_CONFLICTING_LDAP_SYNTAX.get(
                schemaFile, de.getMessageObject());
@@ -865,10 +816,7 @@
            catch (Exception e)
            {
              // This should never happen.
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
            }
          }
        }
@@ -898,10 +846,7 @@
          }
          catch (DirectoryException de)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, de);
            }
            logger.traceException(de);
            LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_PARSE_ATTR_TYPE.get(
                    schemaFile, de.getMessageObject());
@@ -918,10 +863,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_PARSE_ATTR_TYPE.get(
                    schemaFile, v.getValue().toString() + ":  " +
@@ -946,10 +888,7 @@
          }
          catch (DirectoryException de)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, de);
            }
            logger.traceException(de);
            LocalizableMessage message = WARN_CONFIG_SCHEMA_CONFLICTING_ATTR_TYPE.get(
                schemaFile, de.getMessageObject());
@@ -962,10 +901,7 @@
            catch (Exception e)
            {
              // This should never happen.
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
            }
          }
        }
@@ -995,10 +931,7 @@
          }
          catch (DirectoryException de)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, de);
            }
            logger.traceException(de);
            LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_PARSE_OC.get(
                    schemaFile,
@@ -1016,10 +949,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_PARSE_OC.get(
                    schemaFile,
@@ -1045,10 +975,7 @@
          }
          catch (DirectoryException de)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, de);
            }
            logger.traceException(de);
            LocalizableMessage message = WARN_CONFIG_SCHEMA_CONFLICTING_OC.get(
                schemaFile, de.getMessageObject());
@@ -1061,10 +988,7 @@
            catch (Exception e)
            {
              // This should never happen.
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
            }
          }
        }
@@ -1093,10 +1017,7 @@
          }
          catch (DirectoryException de)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, de);
            }
            logger.traceException(de);
            LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_PARSE_NAME_FORM.get(
                    schemaFile, de.getMessageObject());
@@ -1112,10 +1033,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_PARSE_NAME_FORM.get(
                    schemaFile,  v.getValue().toString() + ":  " +
@@ -1141,10 +1059,7 @@
          }
          catch (DirectoryException de)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, de);
            }
            logger.traceException(de);
            LocalizableMessage message = WARN_CONFIG_SCHEMA_CONFLICTING_NAME_FORM.get(
                schemaFile, de.getMessageObject());
@@ -1157,10 +1072,7 @@
            catch (Exception e)
            {
              // This should never happen.
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
            }
          }
        }
@@ -1190,10 +1102,7 @@
          }
          catch (DirectoryException de)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, de);
            }
            logger.traceException(de);
            LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_PARSE_DCR.get(
                    schemaFile, de.getMessageObject());
@@ -1210,10 +1119,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_PARSE_DCR.get(
                    schemaFile,v.getValue().toString() + ":  " +
@@ -1239,10 +1145,7 @@
          }
          catch (DirectoryException de)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, de);
            }
            logger.traceException(de);
            LocalizableMessage message = WARN_CONFIG_SCHEMA_CONFLICTING_DCR.get(
                schemaFile, de.getMessageObject());
@@ -1255,10 +1158,7 @@
            catch (Exception e)
            {
              // This should never happen.
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
            }
          }
        }
@@ -1288,10 +1188,7 @@
          }
          catch (DirectoryException de)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, de);
            }
            logger.traceException(de);
            LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_PARSE_DSR.get(
                    schemaFile, de.getMessageObject());
@@ -1308,10 +1205,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_PARSE_DSR.get(
                    schemaFile, v.getValue().toString() + ":  " +
@@ -1337,10 +1231,7 @@
          }
          catch (DirectoryException de)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, de);
            }
            logger.traceException(de);
            LocalizableMessage message = WARN_CONFIG_SCHEMA_CONFLICTING_DSR.get(
                schemaFile, de.getMessageObject());
@@ -1353,10 +1244,7 @@
            catch (Exception e)
            {
              // This should never happen.
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
            }
          }
        }
@@ -1386,10 +1274,7 @@
          }
          catch (DirectoryException de)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, de);
            }
            logger.traceException(de);
            LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_PARSE_MRU.get(
                    schemaFile, de.getMessageObject());
@@ -1406,10 +1291,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_PARSE_MRU.get(
                    schemaFile,
@@ -1436,10 +1318,7 @@
          }
          catch (DirectoryException de)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, de);
            }
            logger.traceException(de);
            LocalizableMessage message = WARN_CONFIG_SCHEMA_CONFLICTING_MRU.get(
                schemaFile, de.getMessageObject());
@@ -1452,10 +1331,7 @@
            catch (Exception e)
            {
              // This should never happen.
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
            }
          }
        }
opendj3-server-dev/src/server/org/opends/server/core/SearchOperationBasis.java
@@ -36,8 +36,7 @@
import org.opends.server.controls.AccountUsableResponseControl;
import org.opends.server.controls.MatchedValuesControl;
import org.opends.server.core.networkgroups.NetworkGroup;
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.ldap.LDAPFilter;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
@@ -49,7 +48,6 @@
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.loggers.AccessLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -65,10 +63,7 @@
                  SearchReferenceSearchOperation,
                  SearchOperation
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = DebugLogger.getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Indicates whether a search result done response has been sent to the
@@ -362,10 +357,7 @@
    }
    catch (DirectoryException de)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, de);
      }
      logger.traceException(de);
      setResultCode(de.getResultCode());
      appendErrorMessage(de.getMessageObject());
@@ -510,10 +502,7 @@
    }
    catch (DirectoryException de)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, de);
      }
      logger.traceException(de);
      setResultCode(de.getResultCode());
      appendErrorMessage(de.getMessageObject());
@@ -687,10 +676,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
      }
    }
@@ -827,10 +813,7 @@
      }
      catch (DirectoryException de)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, de);
        }
        logger.traceException(de);
        setResponseData(de);
        return false;
@@ -917,10 +900,7 @@
      }
      catch (DirectoryException de)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, de);
        }
        logger.traceException(de);
        setResponseData(de);
        return false;
@@ -1302,10 +1282,7 @@
    }
    catch(CanceledOperationException coe)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, coe);
      }
      logger.traceException(coe);
      setResultCode(ResultCode.CANCELED);
      cancelResult = new CancelResult(ResultCode.CANCELED, null);
@@ -1403,9 +1380,9 @@
    // raised long before this method is invoked.
    if (depth >= MAX_NESTED_FILTER_DEPTH)
    {
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugError("Exceeded maximum filter depth");
        logger.trace("Exceeded maximum filter depth");
      }
      return false;
    }
opendj3-server-dev/src/server/org/opends/server/core/SubentryManager.java
@@ -43,7 +43,7 @@
import org.opends.server.api.plugin.PluginResult.PreOperation;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.controls.SubentriesControl;
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.internal.InternalSearchOperation;
import org.opends.server.types.*;
@@ -63,7 +63,6 @@
            LocalBackendSearchOperation;
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.config.ConfigConstants.*;
@@ -83,10 +82,7 @@
public class SubentryManager extends InternalDirectoryServerPlugin
        implements BackendInitializationListener
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // A mapping between the DNs and applicable subentries.
  private HashMap<DN,List<SubEntry>> dn2SubEntry;
@@ -331,10 +327,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
    for (DN baseDN : backend.getBaseDNs())
@@ -348,10 +341,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        // FIXME -- Is there anything that we need to do here?
        continue;
@@ -372,10 +362,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        // FIXME -- Is there anything that we need to do here?
        continue;
@@ -399,19 +386,13 @@
              }
              catch (Exception e)
              {
                if (debugEnabled())
                {
                  TRACER.debugCaught(DebugLogLevel.ERROR, e);
                }
                logger.traceException(e);
              }
            }
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
            // FIXME -- Handle this.
            continue;
@@ -671,10 +652,7 @@
              }
              catch (Exception e)
              {
                if (debugEnabled())
                {
                  TRACER.debugCaught(DebugLogLevel.ERROR, e);
                }
                logger.traceException(e);
              }
            }
          }
@@ -709,10 +687,7 @@
              }
              catch (Exception e)
              {
                if (debugEnabled())
                {
                  TRACER.debugCaught(DebugLogLevel.ERROR, e);
                }
                logger.traceException(e);
              }
            }
          }
@@ -750,19 +725,13 @@
            }
            catch (Exception e)
            {
              if (debugEnabled())
              {
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
              }
              logger.traceException(e);
            }
          }
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          // FIXME -- Handle this.
        }
@@ -793,10 +762,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
          }
        }
      }
@@ -828,10 +794,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          // FIXME -- Handle this.
        }
@@ -850,10 +813,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
          }
        }
      }
@@ -893,10 +853,7 @@
        catch (Exception e)
        {
          // Shouldnt happen.
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
        // Notify change listeners.
@@ -910,10 +867,7 @@
          }
          catch (Exception e)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }
            logger.traceException(e);
          }
        }
      }
@@ -953,10 +907,7 @@
        }
        catch (DirectoryException de)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, de);
          }
          logger.traceException(de);
          return PluginResult.PreOperation.stopProcessing(
                  de.getResultCode(), de.getMessageObject());
@@ -1008,10 +959,7 @@
          }
          catch (DirectoryException de)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, de);
            }
            logger.traceException(de);
            return PluginResult.PreOperation.stopProcessing(
                    de.getResultCode(), de.getMessageObject());
@@ -1059,10 +1007,7 @@
        }
        catch (DirectoryException de)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, de);
          }
          logger.traceException(de);
          return PluginResult.PreOperation.stopProcessing(
                  de.getResultCode(), de.getMessageObject());
@@ -1124,10 +1069,7 @@
        catch (Exception e)
        {
          // Shouldnt happen.
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
        }
        for (SubentryChangeListener changeListener :
                changeListeners)
@@ -1139,10 +1081,7 @@
          }
          catch (DirectoryException de)
          {
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, de);
            }
            logger.traceException(de);
            return PluginResult.PreOperation.stopProcessing(
                    de.getResultCode(), de.getMessageObject());
opendj3-server-dev/src/server/org/opends/server/core/SubentryPasswordPolicy.java
@@ -31,7 +31,6 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.schema.SchemaConstants.*;
import java.util.*;
@@ -42,7 +41,7 @@
import org.opends.server.api.PasswordGenerator;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.api.PasswordValidator;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
@@ -58,10 +57,7 @@
 */
public final class SubentryPasswordPolicy extends PasswordPolicy
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // Password Policy Subentry draft attributes.
  private static final String PWD_OC_POLICY = "pwdpolicy";
@@ -142,10 +138,9 @@
    {
      // This should not happen -- The server doesn't
      // have a pwdPolicy objectclass defined.
      if (debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER
            .debugWarning("No %s objectclass is defined in the server schema.",
        logger.trace("No %s objectclass is defined in the server schema.",
                PWD_OC_POLICY);
      }
      for (String ocName : objectClasses.values())
opendj3-server-dev/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java
@@ -29,8 +29,7 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
@@ -52,7 +51,6 @@
import org.opends.server.config.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
@@ -70,10 +68,7 @@
       ConfigurationAddListener<SynchronizationProviderCfg>,
       ConfigurationDeleteListener<SynchronizationProviderCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -197,19 +192,16 @@
        }
        catch (ConfigException e)
        {
          if (debugEnabled())
          if (logger.isTraceEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
            logger.traceException(e);
            messages.add(e.getMessageObject());
            resultCode = DirectoryServer.getServerErrorResultCode();
          }
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          messages.add(ERR_CONFIG_SYNCH_ERROR_INITIALIZING_PROVIDER.get(
                  String.valueOf(configuration.getJavaClass()),
@@ -304,19 +296,16 @@
      }
      catch (ConfigException e)
      {
        if (debugEnabled())
        if (logger.isTraceEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
          logger.traceException(e);
          messages.add(e.getMessageObject());
          resultCode = DirectoryServer.getServerErrorResultCode();
        }
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        messages.add(ERR_CONFIG_SYNCH_ERROR_INITIALIZING_PROVIDER.get(
                String.valueOf(configuration.getJavaClass()),
opendj3-server-dev/src/server/org/opends/server/core/UnbindOperationBasis.java
@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Portions copyright 2013 ForgeRock AS
 *      Portions Copyright 2013-2014 ForgeRock AS
 */
package org.opends.server.core;
@@ -32,8 +32,7 @@
import java.util.List;
import org.opends.server.api.ClientConnection;
import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.opends.server.types.operation.PostOperationUnbindOperation;
import org.opends.server.types.operation.PreParseUnbindOperation;
@@ -48,11 +47,7 @@
                  PreParseUnbindOperation,
                  PostOperationUnbindOperation
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = DebugLogger.getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Creates a new unbind operation with the provided information.
opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java
@@ -43,10 +43,9 @@
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.config.ConfigException;
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
/**
@@ -61,10 +60,7 @@
                  ConfigurationAddListener<VirtualAttributeCfg>,
                  ConfigurationDeleteListener<VirtualAttributeCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * A mapping between the DNs of the config entries and the associated virtual
@@ -219,10 +215,7 @@
      }
      catch (DirectoryException de)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, de);
        }
        logger.traceException(de);
        LocalizableMessage message = ERR_CONFIG_VATTR_INVALID_SEARCH_FILTER.get(
                filterString,
opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroup.java
@@ -31,7 +31,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.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
import static org.forgerock.util.Reject.*;
@@ -65,12 +64,11 @@
import org.opends.server.core.Workflow;
import org.opends.server.core.WorkflowImpl;
import org.opends.server.core.WorkflowTopologyNode;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.types.AuthenticationType;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
@@ -302,11 +300,7 @@
  // A lock to protect concurrent access to the registeredNetworkGroups.
  private static Object registeredNetworkGroupsLock = new Object();
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -761,10 +755,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      unacceptableReasons
          .add(ERR_CONFIG_NETWORK_GROUP_POLICY_CANNOT_INITIALIZE.get(
@@ -1625,10 +1616,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message =
          ERR_CONFIG_NETWORK_GROUP_POLICY_CANNOT_INITIALIZE.get(String
@@ -1668,10 +1656,7 @@
        }
      }
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message =
          ERR_CONFIG_NETWORK_GROUP_POLICY_CANNOT_INITIALIZE.get(String
opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupConfigManager.java
@@ -29,8 +29,6 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@@ -44,10 +42,9 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
import org.opends.server.util.StaticUtils;
@@ -67,10 +64,7 @@
    ConfigurationDeleteListener<NetworkGroupCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // A mapping between the DNs of the config entries and the associated
  // network groups.
@@ -113,20 +107,14 @@
      }
      catch (InitializationException e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        messages.add(e.getMessageObject());
        resultCode = DirectoryServer.getServerErrorResultCode();
      }
      catch (ConfigException e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        messages.add(e.getMessageObject());
        resultCode = DirectoryServer.getServerErrorResultCode();
@@ -169,20 +157,14 @@
      }
      catch (InitializationException e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        messages.add(e.getMessageObject());
        resultCode = DirectoryServer.getServerErrorResultCode();
      }
      catch (ConfigException e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        messages.add(e.getMessageObject());
        resultCode = DirectoryServer.getServerErrorResultCode();
opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
@@ -63,8 +63,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.AddOperation;
import org.opends.server.core.ModifyOperation;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.util.StaticUtils.*;
import org.forgerock.util.Reject;
import org.opends.server.util.SelectableCertificateKeyManager;
@@ -111,10 +110,7 @@
public class CryptoManagerImpl
        implements ConfigurationChangeListener<CryptoManagerCfg>, CryptoManager
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // Various schema element references.
  private static AttributeType attrKeyID;
@@ -269,9 +265,7 @@
             DN.valueOf("cn=Servers"));
      }
      catch (DirectoryException ex) {
        if (debugEnabled()) {
          TRACER.debugCaught(DebugLogLevel.ERROR, ex);
        }
        logger.traceException(ex);
        throw new InitializationException(ex.getMessageObject());
      }
@@ -315,9 +309,7 @@
        MessageDigest.getInstance(requestedDigestAlgorithm);
      }
      catch (Exception ex) {
        if (debugEnabled()) {
          TRACER.debugCaught(DebugLogLevel.ERROR, ex);
        }
        logger.traceException(ex);
        unacceptableReasons.add(
             ERR_CRYPTOMGR_CANNOT_GET_REQUESTED_DIGEST.get(
                  requestedDigestAlgorithm, getExceptionMessage(ex)));
@@ -347,9 +339,7 @@
                  requestedCipherTransformationKeyLengthBits);
        }
        catch (Exception ex) {
          if (debugEnabled()) {
            TRACER.debugCaught(DebugLogLevel.ERROR, ex);
          }
          logger.traceException(ex);
          unacceptableReasons.add(
             ERR_CRYPTOMGR_CANNOT_GET_REQUESTED_ENCRYPTION_CIPHER.get(
                     requestedCipherTransformation, getExceptionMessage(ex)));
@@ -373,9 +363,7 @@
             requestedMACAlgorithmKeyLengthBits);
      }
      catch (Exception ex) {
        if (debugEnabled()) {
          TRACER.debugCaught(DebugLogLevel.ERROR, ex);
        }
        logger.traceException(ex);
        unacceptableReasons.add(
                ERR_CRYPTOMGR_CANNOT_GET_REQUESTED_MAC_ENGINE.get(
                        requestedMACAlgorithm, getExceptionMessage(ex)));
@@ -421,9 +409,7 @@
                  keyID, certificate, macKey);
        }
        catch (Exception ex) {
          if (debugEnabled()) {
            TRACER.debugCaught(DebugLogLevel.ERROR, ex);
          }
          logger.traceException(ex);
          unacceptableReasons.add(
                  ERR_CRYPTOMGR_CANNOT_GET_PREFERRED_KEY_WRAPPING_CIPHER.get(
                          getExceptionMessage(ex)));
@@ -568,9 +554,7 @@
      }
    }
    catch (DirectoryException ex) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, ex);
      }
      logger.traceException(ex);
      throw new CryptoManagerException(
            ERR_CRYPTOMGR_FAILED_TO_RETRIEVE_INSTANCE_CERTIFICATE.get(
                    entryDN.toString(), getExceptionMessage(ex)), ex);
@@ -625,9 +609,7 @@
      md = MessageDigest.getInstance(mdAlgorithmName);
    }
    catch (NoSuchAlgorithmException ex) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, ex);
      }
      logger.traceException(ex);
      throw new CryptoManagerException(
          ERR_CRYPTOMGR_FAILED_TO_COMPUTE_INSTANCE_KEY_IDENTIFIER.get(
                  getExceptionMessage(ex)), ex);
@@ -710,9 +692,7 @@
        }
      }
    } catch (DirectoryException ex) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, ex);
      }
      logger.traceException(ex);
      throw new CryptoManagerException(
              ERR_CRYPTOMGR_FAILED_TO_PUBLISH_INSTANCE_KEY_ENTRY.get(
                      getExceptionMessage(ex)), ex);
@@ -777,9 +757,7 @@
      }
    }
    catch (DirectoryException ex) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, ex);
      }
      logger.traceException(ex);
      throw new CryptoManagerException(
            ERR_CRYPTOMGR_FAILED_TO_RETRIEVE_ADS_TRUSTSTORE_CERTS.get(
                    instanceKeysDN.toString(),
@@ -879,9 +857,7 @@
      wrappedKeyElement = StaticUtils.bytesToHexNoSpace(wrappedKey);
    }
    catch (GeneralSecurityException ex) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, ex);
      }
      logger.traceException(ex);
      throw new CryptoManagerException(
           ERR_CRYPTOMGR_FAILED_TO_ENCODE_SYMMETRIC_KEY_ATTRIBUTE.get(
                   getExceptionMessage(ex)), ex);
@@ -942,9 +918,7 @@
              = StaticUtils.hexStringToByteArray(elements[3]);
    }
    catch (ParseException ex) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, ex);
      }
      logger.traceException(ex);
      throw new CryptoManagerException(
              ERR_CRYPTOMGR_DECODE_SYMMETRIC_KEY_ATTRIBUTE_SYNTAX.get(
                      symmetricKeyAttribute, fieldName,
@@ -965,9 +939,7 @@
    }
    catch (IdentifiedException ex) {
      // ConfigException, DirectoryException
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, ex);
      }
      logger.traceException(ex);
      throw new CryptoManagerException(
          ERR_CRYPTOMGR_DECODE_SYMMETRIC_KEY_ATTRIBUTE_NO_PRIVATE.get(
                  getExceptionMessage(ex)), ex);
@@ -982,9 +954,7 @@
      secretKey = (SecretKey)unwrapper.unwrap(wrappedKeyCipherTextElement,
              wrappedKeyAlgorithmElement, Cipher.SECRET_KEY);
    } catch(GeneralSecurityException ex) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, ex);
      }
      logger.traceException(ex);
      throw new CryptoManagerException(
            ERR_CRYPTOMGR_DECODE_SYMMETRIC_KEY_ATTRIBUTE_DECIPHER.get(
                    getExceptionMessage(ex)), ex);
@@ -1238,9 +1208,7 @@
    }
    catch (DirectoryException ex)
    {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, ex);
      }
      logger.traceException(ex);
      throw new CryptoManagerException(
              ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_OTHER.get(
                      entry.getName().toString(), ex.getMessage()), ex);
@@ -1344,9 +1312,7 @@
    }
    catch (DirectoryException ex)
    {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, ex);
      }
      logger.traceException(ex);
      throw new CryptoManagerException(
              ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_OTHER.get(
                      entry.getName().toString(), ex.getMessage()), ex);
@@ -1405,9 +1371,7 @@
        fValue = UUID.fromString(keyEntryID);
      }
      catch (IllegalArgumentException ex) {
        if (debugEnabled()) {
          TRACER.debugCaught(DebugLogLevel.ERROR, ex);
        }
        logger.traceException(ex);
        throw new CryptoManagerException(
                ERR_CRYPTOMGR_INVALID_KEY_IDENTIFIER_SYNTAX.get(
                        keyEntryID, getExceptionMessage(ex)), ex);
@@ -2163,9 +2127,7 @@
    }
    catch (GeneralSecurityException ex) {
      // NoSuchAlgorithmException, NoSuchPaddingException
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, ex);
      }
      logger.traceException(ex);
      throw new CryptoManagerException(
           ERR_CRYPTOMGR_GET_CIPHER_INVALID_CIPHER_TRANSFORMATION.get(
                   keyEntry.getType(), getExceptionMessage(ex)), ex);
@@ -2190,9 +2152,7 @@
    }
    catch (GeneralSecurityException ex) {
      // InvalidKeyException, InvalidAlgorithmParameterException
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, ex);
      }
      logger.traceException(ex);
      throw new CryptoManagerException(
              ERR_CRYPTOMGR_GET_CIPHER_CANNOT_INITIALIZE.get(
                      getExceptionMessage(ex)), ex);
@@ -2594,9 +2554,7 @@
      mac = Mac.getInstance(keyEntry.getType());
    }
    catch (NoSuchAlgorithmException ex){
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, ex);
      }
      logger.traceException(ex);
      throw new CryptoManagerException(
              ERR_CRYPTOMGR_GET_MAC_ENGINE_INVALID_MAC_ALGORITHM.get(
                      keyEntry.getType(), getExceptionMessage(ex)),
@@ -2607,9 +2565,7 @@
      mac.init(keyEntry.getSecretKey());
    }
    catch (InvalidKeyException ex) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, ex);
      }
      logger.traceException(ex);
      throw new CryptoManagerException(
           ERR_CRYPTOMGR_GET_MAC_ENGINE_CANNOT_INITIALIZE.get(
                   getExceptionMessage(ex)), ex);
@@ -2821,9 +2777,7 @@
      }
    }
    catch (IOException ex) {
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, ex);
      }
      logger.traceException(ex);
      throw new CryptoManagerException(
             ERR_CRYPTOMGR_GET_CIPHER_STREAM_PROLOGUE_WRITE_ERROR.get(
                     getExceptionMessage(ex)), ex);
@@ -2846,9 +2800,7 @@
    }
    catch (Exception ex) {
      // IndexOutOfBoundsException, ArrayStoreException, ...
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, ex);
      }
      logger.traceException(ex);
      throw new CryptoManagerException(
              ERR_CRYPTOMGR_DECRYPT_FAILED_TO_READ_PROLOGUE_VERSION.get(
                      ex.getMessage()), ex);
@@ -2873,9 +2825,7 @@
    }
    catch (Exception ex) {
      // IndexOutOfBoundsException, ArrayStoreException, ...
      if (debugEnabled()) {
        TRACER.debugCaught(DebugLogLevel.ERROR, ex);
      }
      logger.traceException(ex);
      throw new CryptoManagerException(
           ERR_CRYPTOMGR_DECRYPT_FAILED_TO_READ_KEY_IDENTIFIER.get(
                   ex.getMessage()), ex);
@@ -2896,9 +2846,7 @@
      }
      catch (Exception ex) {
        // IndexOutOfBoundsException, ArrayStoreException, ...
        if (debugEnabled()) {
          TRACER.debugCaught(DebugLogLevel.ERROR, ex);
        }
        logger.traceException(ex);
        throw new CryptoManagerException(
               ERR_CRYPTOMGR_DECRYPT_FAILED_TO_READ_IV.get(), ex);
      }
@@ -3062,10 +3010,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message =
           ERR_CRYPTOMGR_SSL_CONTEXT_CANNOT_INITIALIZE.get(
opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java
@@ -30,9 +30,8 @@
import org.opends.server.api.Backend;
import org.opends.server.api.BackendInitializationListener;
import org.opends.server.api.ChangeNotificationListener;
import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.debug.DebugLogger.getTracer;
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;
@@ -56,7 +55,6 @@
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.AddOperation;
import static org.opends.messages.CoreMessages.*;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.admin.ads.ADSContext;
import java.util.LinkedHashSet;
@@ -76,7 +74,7 @@
  /**
   * The debug log tracer for this object.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -229,10 +227,7 @@
      }
      catch (DirectoryException e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_TRUSTSTORESYNC_EXCEPTION.get(
             stackTraceToSingleLineString(e));
opendj3-server-dev/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java
@@ -35,8 +35,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ExtendedOperation;
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.asn1.ASN1;
import org.opends.server.protocols.asn1.ASN1Exception;
import org.opends.server.protocols.asn1.ASN1Reader;
@@ -58,10 +57,7 @@
     extends ExtendedOperationHandler<
                  GetSymmetricKeyExtendedOperationHandlerCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = DebugLogger.getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The BER type value for the symmetric key element of the operation value.
@@ -135,9 +131,9 @@
    }
    catch (ASN1Exception ae)
    {
      if (DebugLogger.debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ae);
        logger.traceException(ae);
      }
      LocalizableMessage message = ERR_GET_SYMMETRIC_KEY_ASN1_DECODE_EXCEPTION.get(
@@ -147,9 +143,9 @@
    }
    catch (Exception e)
    {
      if (DebugLogger.debugEnabled())
      if (logger.isTraceEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
        logger.traceException(e);
      }
      operation.setResultCode(ResultCode.PROTOCOL_ERROR);
opendj3-server-dev/src/server/org/opends/server/extensions/AESPasswordStorageScheme.java
@@ -33,7 +33,7 @@
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
@@ -43,7 +43,6 @@
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.extensions.ExtensionsConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
@@ -57,10 +56,7 @@
public class AESPasswordStorageScheme
       extends PasswordStorageScheme<AESPasswordStorageSchemeCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -125,10 +121,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage m = ERR_PWSCHEME_CANNOT_ENCRYPT.get(STORAGE_SCHEME_NAME_AES,
                                                  getExceptionMessage(e));
@@ -167,10 +160,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage m = ERR_PWSCHEME_CANNOT_ENCRYPT.get(STORAGE_SCHEME_NAME_AES,
                                                  getExceptionMessage(e));
@@ -204,10 +194,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      return false;
    }
@@ -241,10 +228,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage m = ERR_PWSCHEME_CANNOT_DECRYPT.get(STORAGE_SCHEME_NAME_AES,
                                                  getExceptionMessage(e));
opendj3-server-dev/src/server/org/opends/server/extensions/Base64PasswordStorageScheme.java
@@ -32,7 +32,7 @@
import org.opends.server.admin.std.server.Base64PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
@@ -40,7 +40,6 @@
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.extensions.ExtensionsConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
@@ -53,10 +52,7 @@
public class Base64PasswordStorageScheme
       extends PasswordStorageScheme<Base64PasswordStorageSchemeCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -164,10 +160,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD.get(
          storedPassword.toString(), String.valueOf(e));
opendj3-server-dev/src/server/org/opends/server/extensions/BlowfishPasswordStorageScheme.java
@@ -33,7 +33,7 @@
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
@@ -43,7 +43,6 @@
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.extensions.ExtensionsConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
@@ -57,10 +56,7 @@
public class BlowfishPasswordStorageScheme
       extends PasswordStorageScheme<BlowfishPasswordStorageSchemeCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -125,10 +121,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage m = ERR_PWSCHEME_CANNOT_ENCRYPT.get(STORAGE_SCHEME_NAME_BLOWFISH,
                                                  getExceptionMessage(e));
@@ -168,10 +161,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage m = ERR_PWSCHEME_CANNOT_ENCRYPT.get(STORAGE_SCHEME_NAME_BLOWFISH,
                                                  getExceptionMessage(e));
@@ -205,10 +195,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      return false;
    }
@@ -242,10 +229,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage m = ERR_PWSCHEME_CANNOT_DECRYPT.get(STORAGE_SCHEME_NAME_BLOWFISH,
                                                  getExceptionMessage(e));
opendj3-server-dev/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
@@ -45,11 +45,10 @@
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.PasswordPolicyState;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -71,10 +70,7 @@
       implements ConfigurationChangeListener<
                       CramMD5SASLMechanismHandlerCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  // An array filled with the inner pad byte.
  private byte[] iPad;
@@ -134,10 +130,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message =
          ERR_SASLCRAMMD5_CANNOT_GET_MESSAGE_DIGEST.get(getExceptionMessage(e));
@@ -278,10 +271,7 @@
    }
    catch (ParseException pe)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, pe);
      }
      logger.traceException(pe);
      bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
@@ -307,10 +297,7 @@
      }
      catch (DirectoryException de)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, de);
        }
        logger.traceException(de);
        bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
@@ -352,10 +339,7 @@
      }
      catch (DirectoryException de)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, de);
        }
        logger.traceException(de);
        bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
@@ -383,10 +367,7 @@
      }
      catch (DirectoryException de)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, de);
        }
        logger.traceException(de);
        bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
opendj3-server-dev/src/server/org/opends/server/extensions/CancelExtendedOperation.java
@@ -32,13 +32,12 @@
import org.opends.server.api.ExtendedOperationHandler;
import org.opends.server.config.ConfigException;
import org.opends.server.core.ExtendedOperation;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.asn1.ASN1;
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -52,10 +51,7 @@
public class CancelExtendedOperation
       extends ExtendedOperationHandler<CancelExtendedOperationHandlerCfg>
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * Create an instance of this cancel extended operation.  All initialization
@@ -105,10 +101,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      operation.setResultCode(ResultCode.PROTOCOL_ERROR);
opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
@@ -62,7 +62,7 @@
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.tools.LDIFModify;
import org.opends.server.types.*;
@@ -78,7 +78,6 @@
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.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -90,10 +89,7 @@
       extends ConfigHandler
       implements AlertGenerator
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -237,19 +233,13 @@
    }
    catch (InitializationException ie)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ie);
      }
      logger.traceException(ie);
      throw ie;
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_FILE_CANNOT_VERIFY_EXISTENCE.get(
                             f.getAbsolutePath(), String.valueOf(e));
@@ -313,10 +303,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_UNABLE_TO_APPLY_STARTUP_CHANGES.get(
          changesFile.getAbsolutePath(), String.valueOf(e));
@@ -337,10 +324,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_FILE_CANNOT_OPEN_FOR_READ.get(
                             f.getAbsolutePath(), String.valueOf(e));
@@ -356,10 +340,7 @@
    }
    catch (LDIFException le)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, le);
      }
      logger.traceException(le);
      close(reader);
@@ -369,10 +350,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      close(reader);
@@ -407,20 +385,14 @@
    }
    catch (InitializationException ie)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, ie);
      }
      logger.traceException(ie);
      close(reader);
      throw ie;
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      close(reader);
@@ -449,10 +421,7 @@
      }
      catch (LDIFException le)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, le);
        }
        logger.traceException(le);
        close(reader);
@@ -463,10 +432,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        close(reader);
@@ -535,10 +501,7 @@
      catch (Exception e)
      {
        // This should not happen.
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        close(reader);
@@ -585,19 +548,13 @@
      }
      catch (InitializationException ie)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, ie);
        }
        logger.traceException(ie);
        throw ie;
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message =
            ERR_CONFIG_CANNOT_DETERMINE_SERVER_ROOT.get(ENV_VAR_INSTALL_ROOT);
@@ -670,10 +627,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_CANNOT_REGISTER_AS_PRIVATE_SUFFIX.get(
          String.valueOf(configRootEntry.getDN()), getExceptionMessage(e));
@@ -935,10 +889,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
  }
@@ -1263,10 +1214,7 @@
      }
      catch (ConfigException ce)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, ce);
        }
        logger.traceException(ce);
        LocalizableMessage message = ERR_CONFIG_FILE_ADD_FAILED.
            get(String.valueOf(entryDN), String.valueOf(parentDN),
@@ -1423,10 +1371,7 @@
      }
      catch (ConfigException ce)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, ce);
        }
        logger.traceException(ce);
        LocalizableMessage message = ERR_CONFIG_FILE_DELETE_FAILED.
            get(String.valueOf(entryDN), String.valueOf(parentEntry.getDN()),
@@ -1882,10 +1827,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_CONFIG_MANUAL_CHANGES_LOST.get(
            configFile, stackTraceToSingleLineString(e));
@@ -1909,10 +1851,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_FILE_WRITE_CANNOT_EXPORT_NEW_CONFIG.get(
          String.valueOf(tempConfig), stackTraceToSingleLineString(e));
@@ -1933,10 +1872,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_FILE_WRITE_CANNOT_RENAME_NEW_CONFIG.
          get(String.valueOf(tempConfig), String.valueOf(configFile),
@@ -1995,10 +1931,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_CONFIG_FILE_CANNOT_CREATE_ARCHIVE_DIR.
            get(archiveDirectory.getAbsolutePath(),
@@ -2034,10 +1967,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_FILE_CANNOT_WRITE_CONFIG_ARCHIVE.get(
          stackTraceToSingleLineString(e));
@@ -2067,10 +1997,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_FILE_CANNOT_WRITE_CONFIG_ARCHIVE.get(
          stackTraceToSingleLineString(e));
@@ -2170,10 +2097,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          logError(ERR_STARTOK_CANNOT_WRITE.get(configFile, tempFilePath,
                                                getExceptionMessage(e)));
@@ -2182,10 +2106,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        logError(ERR_STARTOK_CANNOT_OPEN_FOR_WRITING.get(tempFilePath,
                      getExceptionMessage(e)));
@@ -2198,10 +2119,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      logError(ERR_STARTOK_CANNOT_OPEN_FOR_READING.get(configFile,
                                                       getExceptionMessage(e)));
@@ -2224,10 +2142,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
    File startOKFile = new File(startOKFilePath);
@@ -2240,10 +2155,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
@@ -2253,10 +2165,7 @@
      tempFile.renameTo(startOKFile);
    } catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      logError(ERR_STARTOK_CANNOT_RENAME.get(tempFilePath, startOKFilePath,
                                             getExceptionMessage(e)));
@@ -2274,10 +2183,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
  }
@@ -2350,10 +2256,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_LDIF_WRITE_ERROR.get(String.valueOf(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
@@ -2366,10 +2269,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_FILE_CLOSE_ERROR.get(String.valueOf(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
@@ -2401,10 +2301,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_FILE_WRITE_ERROR.get(
          configEntry.getDN().toString(), String.valueOf(e));
@@ -2520,10 +2417,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message = ERR_CONFIG_BACKUP_CANNOT_GET_MAC.get(
              macKeyID, stackTraceToSingleLineString(e));
@@ -2544,10 +2438,7 @@
        }
        catch (Exception e)
        {
          if (debugEnabled())
          {
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          logger.traceException(e);
          LocalizableMessage message = ERR_CONFIG_BACKUP_CANNOT_GET_DIGEST.get(
              digestAlgorithm, stackTraceToSingleLineString(e));
@@ -2596,10 +2487,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_BACKUP_CANNOT_CREATE_ARCHIVE_FILE.
          get(String.valueOf(filename), backupDirectory.getPath(),
@@ -2620,10 +2508,7 @@
      }
      catch (Exception e)
      {
        if (debugEnabled())
        {
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
        logger.traceException(e);
        LocalizableMessage message = ERR_CONFIG_BACKUP_CANNOT_GET_CIPHER.get(
            stackTraceToSingleLineString(e));
@@ -2663,10 +2548,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      message = ERR_CONFIG_BACKUP_CANNOT_DETERMINE_CONFIG_FILE_LOCATION.
          get(getExceptionMessage(e));
@@ -2714,10 +2596,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      StaticUtils.close(inputStream, zipStream);
@@ -2772,10 +2651,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      StaticUtils.close(inputStream, zipStream);
@@ -2794,10 +2670,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      message = ERR_CONFIG_BACKUP_CANNOT_CLOSE_ZIP_STREAM.get(
          filename, backupDirectory.getPath(), getExceptionMessage(e));
@@ -2837,10 +2710,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
      message = ERR_CONFIG_BACKUP_CANNOT_UPDATE_BACKUP_DESCRIPTOR.get(
          backupDirectory.getDescriptorPath(), stackTraceToSingleLineString(e));
@@ -3499,10 +3369,7 @@
    }
    catch (Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      logger.traceException(e);
    }
  }
}
Diff truncated after the above file
opendj3-server-dev/src/server/org/opends/server/extensions/DefaultEntryCache.java opendj3-server-dev/src/server/org/opends/server/extensions/DictionaryPasswordValidator.java opendj3-server-dev/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java opendj3-server-dev/src/server/org/opends/server/extensions/DiskSpaceMonitor.java opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java opendj3-server-dev/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java opendj3-server-dev/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java opendj3-server-dev/src/server/org/opends/server/extensions/FIFOEntryCache.java opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java opendj3-server-dev/src/server/org/opends/server/extensions/GetConnectionIDExtendedOperation.java opendj3-server-dev/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java opendj3-server-dev/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java opendj3-server-dev/src/server/org/opends/server/extensions/JMXAlertHandler.java opendj3-server-dev/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java opendj3-server-dev/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java opendj3-server-dev/src/server/org/opends/server/extensions/MemberVirtualAttributeProvider.java opendj3-server-dev/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java opendj3-server-dev/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkerThread.java opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java opendj3-server-dev/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java opendj3-server-dev/src/server/org/opends/server/extensions/RC4PasswordStorageScheme.java opendj3-server-dev/src/server/org/opends/server/extensions/RandomPasswordGenerator.java opendj3-server-dev/src/server/org/opends/server/extensions/SASLContext.java opendj3-server-dev/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java opendj3-server-dev/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java opendj3-server-dev/src/server/org/opends/server/extensions/SimpleStaticGroupMemberList.java opendj3-server-dev/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java opendj3-server-dev/src/server/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java opendj3-server-dev/src/server/org/opends/server/extensions/TLSByteChannel.java opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkQueue.java opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkerThread.java opendj3-server-dev/src/server/org/opends/server/extensions/TripleDESPasswordStorageScheme.java opendj3-server-dev/src/server/org/opends/server/extensions/VirtualStaticGroup.java opendj3-server-dev/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java opendj3-server-dev/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java opendj3-server-dev/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java opendj3-server-dev/src/server/org/opends/server/loggers/GZIPAction.java opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java opendj3-server-dev/src/server/org/opends/server/loggers/RotationActionThread.java opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java opendj3-server-dev/src/server/org/opends/server/loggers/TimeStampNaming.java opendj3-server-dev/src/server/org/opends/server/loggers/debug/DebugTracer.java opendj3-server-dev/src/server/org/opends/server/loggers/debug/TextDebugLogPublisher.java opendj3-server-dev/src/server/org/opends/server/loggers/debug/TraceSettings.java opendj3-server-dev/src/server/org/opends/server/monitors/BackendMonitor.java opendj3-server-dev/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java opendj3-server-dev/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java opendj3-server-dev/src/server/org/opends/server/monitors/VersionMonitorProvider.java opendj3-server-dev/src/server/org/opends/server/plugins/AttributeCleanupPlugin.java opendj3-server-dev/src/server/org/opends/server/plugins/LDAPADListPlugin.java opendj3-server-dev/src/server/org/opends/server/plugins/LastModPlugin.java opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfileStack.java opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfileStackFrame.java opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfilerThread.java opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReader.java opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1InputStreamReader.java opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1OutputStreamWriter.java opendj3-server-dev/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilter.java opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPClientConnection.java opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java opendj3-server-dev/src/server/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java opendj3-server-dev/src/server/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java opendj3-server-dev/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java opendj3-server-dev/src/server/org/opends/server/protocols/jmx/RmiConnector.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/AddResponseProtocolOp.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/BindRequestProtocolOp.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/BindResponseProtocolOp.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPFilter.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java opendj3-server-dev/src/server/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java opendj3-server-dev/src/server/org/opends/server/replication/common/FirstChangeNumberVirtualAttributeProvider.java opendj3-server-dev/src/server/org/opends/server/replication/common/LastChangeNumberVirtualAttributeProvider.java opendj3-server-dev/src/server/org/opends/server/replication/common/LastCookieVirtualProvider.java opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplayThread.java opendj3-server-dev/src/server/org/opends/server/replication/protocol/ErrorMsg.java opendj3-server-dev/src/server/org/opends/server/replication/protocol/HeartbeatThread.java opendj3-server-dev/src/server/org/opends/server/replication/protocol/Session.java opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerWriter.java opendj3-server-dev/src/server/org/opends/server/replication/server/LightweightServerHandler.java opendj3-server-dev/src/server/org/opends/server/replication/server/MessageHandler.java opendj3-server-dev/src/server/org/opends/server/replication/server/MonitoringPublisher.java opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationDomainMonitorData.java opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java opendj3-server-dev/src/server/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java opendj3-server-dev/src/server/org/opends/server/replication/server/SafeReadExpectedAcksInfo.java opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java opendj3-server-dev/src/server/org/opends/server/replication/server/ServerReader.java opendj3-server-dev/src/server/org/opends/server/replication/server/ServerWriter.java opendj3-server-dev/src/server/org/opends/server/replication/server/StatusAnalyzer.java opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ChangeNumberIndexer.java opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBCursor.java opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEUtils.java opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java opendj3-server-dev/src/server/org/opends/server/replication/service/CTHeartbeatPublisherThread.java opendj3-server-dev/src/server/org/opends/server/replication/service/HeartbeatMonitor.java opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java opendj3-server-dev/src/server/org/opends/server/tasks/AddSchemaFileTask.java opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTargetTask.java opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTask.java opendj3-server-dev/src/server/org/opends/server/tasks/PurgeConflictsHistoricalTask.java opendj3-server-dev/src/server/org/opends/server/tasks/RebuildTask.java opendj3-server-dev/src/server/org/opends/server/tasks/RestoreTask.java opendj3-server-dev/src/server/org/opends/server/tasks/SetGenerationIdTask.java opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java opendj3-server-dev/src/server/org/opends/server/tools/ConsoleDebugLogPublisher.java opendj3-server-dev/src/server/org/opends/server/tools/DBTest.java opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java opendj3-server-dev/src/server/org/opends/server/tools/InstallDS.java opendj3-server-dev/src/server/org/opends/server/tools/InstallDSArgumentParser.java opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java opendj3-server-dev/src/server/org/opends/server/tools/LDAPConnection.java opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java opendj3-server-dev/src/server/org/opends/server/tools/LDAPReader.java opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java opendj3-server-dev/src/server/org/opends/server/tools/LDAPWriter.java opendj3-server-dev/src/server/org/opends/server/tools/SSLConnectionFactory.java opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/LocalPurgeHistorical.java opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java opendj3-server-dev/src/server/org/opends/server/tools/status/StatusCli.java opendj3-server-dev/src/server/org/opends/server/tools/upgrade/FileManager.java opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeCli.java opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeLog.java opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java opendj3-server-dev/src/server/org/opends/server/types/AbstractOperation.java opendj3-server-dev/src/server/org/opends/server/types/AttributeBuilder.java opendj3-server-dev/src/server/org/opends/server/types/AttributeType.java opendj3-server-dev/src/server/org/opends/server/types/AttributeValues.java opendj3-server-dev/src/server/org/opends/server/types/BackupDirectory.java opendj3-server-dev/src/server/org/opends/server/types/BackupInfo.java opendj3-server-dev/src/server/org/opends/server/types/ByteString.java opendj3-server-dev/src/server/org/opends/server/types/ByteStringBuilder.java opendj3-server-dev/src/server/org/opends/server/types/DITContentRule.java opendj3-server-dev/src/server/org/opends/server/types/DITStructureRule.java opendj3-server-dev/src/server/org/opends/server/types/DN.java opendj3-server-dev/src/server/org/opends/server/types/Entry.java opendj3-server-dev/src/server/org/opends/server/types/FilePermission.java opendj3-server-dev/src/server/org/opends/server/types/HostPort.java opendj3-server-dev/src/server/org/opends/server/types/InvokableMethod.java opendj3-server-dev/src/server/org/opends/server/types/LDAPURL.java opendj3-server-dev/src/server/org/opends/server/types/LDIFExportConfig.java opendj3-server-dev/src/server/org/opends/server/types/LDIFImportConfig.java opendj3-server-dev/src/server/org/opends/server/types/LockManager.java opendj3-server-dev/src/server/org/opends/server/types/MatchingRuleUse.java opendj3-server-dev/src/server/org/opends/server/types/NameForm.java opendj3-server-dev/src/server/org/opends/server/types/ObjectClass.java opendj3-server-dev/src/server/org/opends/server/types/RDN.java opendj3-server-dev/src/server/org/opends/server/types/RawAttribute.java opendj3-server-dev/src/server/org/opends/server/types/RawFilter.java opendj3-server-dev/src/server/org/opends/server/types/RawModification.java opendj3-server-dev/src/server/org/opends/server/types/Schema.java opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java opendj3-server-dev/src/server/org/opends/server/types/SortKey.java opendj3-server-dev/src/server/org/opends/server/types/VirtualAttributeRule.java opendj3-server-dev/src/server/org/opends/server/util/EMailMessage.java opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java opendj3-server-dev/src/server/org/opends/server/util/MultiOutputStream.java opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java opendj3-server-dev/src/server/org/opends/server/util/TimeThread.java opendj3-server-dev/src/server/org/opends/server/util/cli/ConsoleApplication.java opendj3-server-dev/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLWorkflowElement.java opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TopologyViewTest.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ComputeBestServerTest.java